Added zillions of #if wxUSE_XXX
Removed cmndlgs usage of wxSizer and constraints Changed occurences of wxConv_xxx to wxConvXxxx and changed some wxConvLibc to wxConvCurrent Added Unicode tests to typetests (not finished) Compile fix for wxString in Unicode mode - we have to use the "experimental" printf then, I guess. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -517,7 +517,7 @@ const wxMB2WXbuf wxLocale::GetString(const wxChar *szOrigString,
|
||||
return szDomain;
|
||||
|
||||
const char *pszTrans = NULL;
|
||||
const wxWX2MBbuf szOrgString = wxConv_libc.cWX2MB(szOrigString);
|
||||
const wxWX2MBbuf szOrgString = wxConvCurrent->cWX2MB(szOrigString);
|
||||
|
||||
wxMsgCatalog *pMsgCat;
|
||||
if ( szDomain != NULL ) {
|
||||
@@ -564,7 +564,7 @@ const wxMB2WXbuf wxLocale::GetString(const wxChar *szOrigString,
|
||||
return (wxMB2WXbuf)(szOrigString);
|
||||
}
|
||||
else
|
||||
return (wxMB2WXbuf)(wxConv_libc.cMB2WX(pszTrans));
|
||||
return (wxMB2WXbuf)(wxConvCurrent->cMB2WX(pszTrans));
|
||||
}
|
||||
|
||||
// find catalog by name in a linked list, return NULL if !found
|
||||
|
Reference in New Issue
Block a user