Conditional compilation fix.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/widgets/listbox.cpp b/samples/widgets/listbox.cpp
index b717ecb09782401c7819d8c77214d57d4d91e8b3..65ae57555e6953297a8a469e8a5aa1b43a98db16 100644 (file)
--- a/samples/widgets/listbox.cpp
+++ b/samples/widgets/listbox.cpp
@@ -24,6 +24,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_LISTBOX
+

 // for all others, include the necessary headers
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 // for all others, include the necessary headers
 #ifndef WX_PRECOMP
     #include "wx/log.h"


@@ -43,7 +45,7 @@
 #include "wx/checklst.h"
 
 #include "widgets.h"
 #include "wx/checklst.h"
 
 #include "widgets.h"

-#if 1
+

 #include "icons/listbox.xpm"
 
 // ----------------------------------------------------------------------------
 #include "icons/listbox.xpm"
 
 // ----------------------------------------------------------------------------


@@ -517,4 +519,4 @@ void ListboxWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))
     CreateLbox();
 }
 
     CreateLbox();
 }
 

-#endif
+#endif // wxUSE_LISTBOX

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index d6e48edde86098b1647e63b1fa9873589e6d3083..b5f7b1ed1a7390f1322c284f3aec613a67ffabb8 100644 (file)
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -28,7 +28,7 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#if wxUSE_OWNER_DRAWN
+#if wxUSE_CHECKLISTBOX && wxUSE_OWNER_DRAWN

 
 #ifndef WX_PRECOMP
     #include "wx/object.h"
 
 #ifndef WX_PRECOMP
     #include "wx/object.h"