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/trunk@18257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/univ/readme.txt b/docs/univ/readme.txt
index d2ceccc77d77d10d6e219d1d2dee630b0cb03c1b..ee7322c12972f03e48bcbcef855291d9a76f30d4 100644 (file)
--- a/docs/univ/readme.txt
+++ b/docs/univ/readme.txt
@@ -1,50 +1,53 @@
                               wxUniversal README
                               ==================
 
- Welcome to wxUniversal!
+Welcome to wxUniversal!
 
- Acknowledgements: wxUniversal wouldn't have been written without the
+Acknowledgements: wxUniversal wouldn't have been written without the
 generous support of SciTech Software. Many thanks to Kendall Bennett and
 Tom Ryan!
 
 0. Introduction
 ---------------
 
- wxUniversal is a port of wxWindows which implements the various GUI controls
+wxUniversal is a port of wxWindows which implements the various GUI controls
 by drawing them itself (using low level wxWindows classes). Please see
 
                      http://www.wxwindows.org/wxuniv.htm
 
 for more details about it.
 
- The advantage of wxUniversal is that you have precise control over the
+The advantage of wxUniversal is that you have precise control over the
 controls' appearance (it is not always possible to change all aspects of the
 native controls) and the theme support: the same program may be changed to
 look completely differently without changing a single line of its code but
 just changing the theme.
 
- Another advantage is that it makes writing ports of wxWindows for other
+Another advantage is that it makes writing ports of wxWindows for other
 platforms (such as OS/2, BeOS or QNX) much simpler, so it is of special
 interest to people interested in porting wxWindows to another platform.
 
- However, wxUniversal doesn't have a 100% native look and feel unlike the
+However, wxUniversal doesn't have a 100% native look and feel unlike the
 other wxWindows ports - this is the price to pay for the extra flexibility.
 
 1. Requirements and supported platforms
 ---------------------------------------
 
- wxUniversal is used together with another wxWindows port which provides the
+wxUniversal is used together with another wxWindows port which provides the
 "low level classes" mentioned above. Currently it can be built with wxMSW,
 wxGTK or wxX11. In any case, you should download the sources for the
 appropriate toolkit in addition to wxUniversal - in fact, you should download
 them first and then unpack wxUniversal in the same directory.
 
- The requirements for wxUniversal are the same as for the underlying low level
+The requirements for wxUniversal are the same as for the underlying low level
 toolkit.
 
 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
 
    Simply open the src/wxUniv.dsw file in DevStudio and build it.
@@ -63,7 +66,7 @@ c) Other compilers
    to build using the wxUniversal widgets. Use 'SET WXTHEME=GTK' [or  WIN32 or METAL]
    to test the existing themes
 
-   Unfortunately we don't have makefiles for any other compilers yet.
+Unfortunately we don't have makefiles for any other compilers yet.
 Please contact us if you would like to help us with creating one for the
 compiler you use.
 
@@ -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
 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
 --------------------------
 
@@ -98,15 +104,15 @@ at once by setting the environment variable WXTHEME to the theme name.
 5. Documentation and support
 ----------------------------
 
- Please note that wxUniversal is not as mature as the other wxWindows ports
+Please note that wxUniversal is not as mature as the other wxWindows ports
 and is currently officially in alpha stage. In particular, it is not really
 intended for the end users but rather for developers at the current stage and
 this is why we don't provide any binaries for it.
 
- There is no separate documentation for wxUniversal, please refer to wxWindows
+There is no separate documentation for wxUniversal, please refer to wxWindows
 documentation instead.
 
- Support for wxUniversal is available from the same places as for wxWindows
+Support for wxUniversal is available from the same places as for wxWindows
 itself, namely:
 
 * Usenet newsgroup comp.soft-sys.wxwindows

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index 3e8c9868fea288315101b7e636480fb8a740eacd..e1135cbb11466a7886286c20da649a8bdff09f3f 100644 (file)
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -519,7 +519,7 @@
 #define wxUSE_BMPBUTTON    1    // wxBitmapButton
 #define wxUSE_CALENDARCTRL 1    // wxCalendarCtrl
 #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_COMBOBOX     1    // wxComboBox
 #define wxUSE_GAUGE        1    // wxGauge
@@ -1112,13 +1112,12 @@
     #define wxUSE_RICHEDIT2 0
 #endif
 
-// Set this to 1 to enable support for the owner-drawn menu and listboxes. This
-// is required by wxUSE_CHECKLISTBOX.
+// Set this to 1 to enable support for the owner-drawn menu and listboxes.
 //
 // Default is 1.
 //
 // 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
 
@@ -1184,11 +1183,6 @@
     #define wxUSE_NATIVE_STATUSBAR 0
 #endif
 
-#if !wxUSE_OWNER_DRAWN
-    #undef wxUSE_CHECKLISTBOX
-    #define wxUSE_CHECKLISTBOX 0
-#endif
-
 // Salford C++ doesn't like some of the memory operator definitions
 #ifdef __SALFORDC__
     #undef  wxUSE_MEMORY_TRACING