Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added zillions of #if wxUSE_XXX

Browse Source 
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:
Robert Roebling
1999-06-14 23:04:05 +00:00
parent 9f50f9f1a1
commit dcf924a345
119 changed files with 845 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/string.h
View File

@@ -198,7 +198,6 @@ class WXDLLEXPORT wxMBConv
#endif
};
WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc;
#define wxConv_libc wxConvLibc
#define wxANOTHER_MBCONV(type) \
class type : public wxMBConv { \
@@ -208,14 +207,11 @@ class type : public wxMBConv { \
}
WXDLLEXPORT_DATA(extern wxANOTHER_MBCONV(wxMBConvFile)) wxConvFile;
#define wxConv_file wxConvFile
WXDLLEXPORT_DATA(extern wxANOTHER_MBCONV(wxMBConvUTF7)) wxConvUTF7;
WXDLLEXPORT_DATA(extern wxANOTHER_MBCONV(wxMBConvUTF8)) wxConvUTF8;
#define wxConv_UTF8 wxConvUTF8
#if defined(__WXGTK12__)
#ifdef __WXGTK12__
WXDLLEXPORT_DATA(extern wxANOTHER_MBCONV(wxMBConvGdk)) wxConvGdk;
#define wxConv_gdk wxConvGdk
#endif // GTK > 1.0
#endif
class wxCharacterSet;
class WXDLLEXPORT wxCSConv : public wxMBConv
@@ -260,10 +256,7 @@ public:
const char* cWX2MB(const char *psz) const { return psz; }
};
WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc, wxConvFile;
#define wxConv_libc wxConvLibc
#define wxConv_file wxConvFile
WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
#define wxConv_current wxConvCurrent
#define wxFNCONV(name) name
#define FNSTRINGCAST WXSTRINGCAST
#endif//wxUSE_WCHAR_T