Applied patch [ 652894 ] Checklistbox doesn't need owner draw
Updated wxUniv readme about setup[0].h git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -45,6 +45,9 @@ toolkit.
|
|||||||
2. Installing under Win32
|
2. Installing under Win32
|
||||||
-------------------------
|
-------------------------
|
||||||
|
|
||||||
|
If compiling from CVS, please copy include/wx/univ/setup0.h
|
||||||
|
to include/wx/univ/setup.h before following these steps.
|
||||||
|
|
||||||
a) Using Visual C++ 6.0
|
a) Using Visual C++ 6.0
|
||||||
|
|
||||||
Simply open the src/wxUniv.dsw file in DevStudio and build it.
|
Simply open the src/wxUniv.dsw file in DevStudio and build it.
|
||||||
@@ -79,6 +82,9 @@ change for wxUniversal is that you must add "--enable-universal" switch to
|
|||||||
the configure command line and for wxX11 even this is unnecessary, i.e. it
|
the configure command line and for wxX11 even this is unnecessary, i.e. it
|
||||||
is enabled by default.
|
is enabled by default.
|
||||||
|
|
||||||
|
If compiling from CVS, please copy include/wx/univ/setup0.h
|
||||||
|
to include/wx/univ/setup.h before configuring.
|
||||||
|
|
||||||
4. Running wxUniv programs
|
4. Running wxUniv programs
|
||||||
--------------------------
|
--------------------------
|
||||||
|
|
||||||
|
@@ -519,7 +519,7 @@
|
|||||||
#define wxUSE_BMPBUTTON 1 // wxBitmapButton
|
#define wxUSE_BMPBUTTON 1 // wxBitmapButton
|
||||||
#define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl
|
#define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl
|
||||||
#define wxUSE_CHECKBOX 1 // wxCheckBox
|
#define wxUSE_CHECKBOX 1 // wxCheckBox
|
||||||
#define wxUSE_CHECKLISTBOX 1 // wxCheckListBox (requires wxUSE_OWNER_DRAWN)
|
#define wxUSE_CHECKLISTBOX 1 // wxCheckListBox
|
||||||
#define wxUSE_CHOICE 1 // wxChoice
|
#define wxUSE_CHOICE 1 // wxChoice
|
||||||
#define wxUSE_COMBOBOX 1 // wxComboBox
|
#define wxUSE_COMBOBOX 1 // wxComboBox
|
||||||
#define wxUSE_GAUGE 1 // wxGauge
|
#define wxUSE_GAUGE 1 // wxGauge
|
||||||
@@ -1112,13 +1112,12 @@
|
|||||||
#define wxUSE_RICHEDIT2 0
|
#define wxUSE_RICHEDIT2 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Set this to 1 to enable support for the owner-drawn menu and listboxes. This
|
// Set this to 1 to enable support for the owner-drawn menu and listboxes.
|
||||||
// is required by wxUSE_CHECKLISTBOX.
|
|
||||||
//
|
//
|
||||||
// Default is 1.
|
// Default is 1.
|
||||||
//
|
//
|
||||||
// Recommended setting: 1, set to 0 for a small library size reduction
|
// Recommended setting: 1, set to 0 for a small library size reduction
|
||||||
#define wxUSE_OWNER_DRAWN 0 //? error 'MSWOnDraw' is not a member of 'wxControl'
|
#define wxUSE_OWNER_DRAWN 0
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -1184,11 +1183,6 @@
|
|||||||
#define wxUSE_NATIVE_STATUSBAR 0
|
#define wxUSE_NATIVE_STATUSBAR 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !wxUSE_OWNER_DRAWN
|
|
||||||
#undef wxUSE_CHECKLISTBOX
|
|
||||||
#define wxUSE_CHECKLISTBOX 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Salford C++ doesn't like some of the memory operator definitions
|
// Salford C++ doesn't like some of the memory operator definitions
|
||||||
#ifdef __SALFORDC__
|
#ifdef __SALFORDC__
|
||||||
#undef wxUSE_MEMORY_TRACING
|
#undef wxUSE_MEMORY_TRACING
|
||||||
|
Reference in New Issue
Block a user