--enable-debug shouldn't be in COMMON_CONFIGURE_OPTIONS, it's used for dbg packages...

[wxWidgets.git] / src / generic / choicbkg.cpp

diff --git a/src/generic/choicbkg.cpp b/src/generic/choicbkg.cpp
index e701dffdb8e0a94d46b98d7e27d11739feb3b437..445d0f575ae443b171ac1c283a55bc775fba098c 100644 (file)
--- a/src/generic/choicbkg.cpp
+++ b/src/generic/choicbkg.cpp
@@ -26,11 +26,15 @@
 
 #if wxUSE_CHOICEBOOK
 
 
 #if wxUSE_CHOICEBOOK
 

-#include "wx/choice.h"

 #include "wx/choicebk.h"
 #include "wx/choicebk.h"

+
+#ifndef WX_PRECOMP
+    #include "wx/settings.h"
+    #include "wx/choice.h"
+    #include "wx/sizer.h"
+#endif
+

 #include "wx/imaglist.h"
 #include "wx/imaglist.h"

-#include "wx/settings.h"
-#include "wx/sizer.h"

 
 // ----------------------------------------------------------------------------
 // various wxWidgets macros
 
 // ----------------------------------------------------------------------------
 // various wxWidgets macros


@@ -46,8 +50,10 @@
 IMPLEMENT_DYNAMIC_CLASS(wxChoicebook, wxBookCtrlBase)
 IMPLEMENT_DYNAMIC_CLASS(wxChoicebookEvent, wxNotifyEvent)
 
 IMPLEMENT_DYNAMIC_CLASS(wxChoicebook, wxBookCtrlBase)
 IMPLEMENT_DYNAMIC_CLASS(wxChoicebookEvent, wxNotifyEvent)
 

+#if !WXWIN_COMPATIBILITY_EVENT_TYPES

 const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING = wxNewEventType();
 const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED = wxNewEventType();
 const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING = wxNewEventType();
 const wxEventType wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED = wxNewEventType();

+#endif

 const int wxID_CHOICEBOOKCHOICE = wxNewId();
 
 BEGIN_EVENT_TABLE(wxChoicebook, wxBookCtrlBase)
 const int wxID_CHOICEBOOKCHOICE = wxNewId();
 
 BEGIN_EVENT_TABLE(wxChoicebook, wxBookCtrlBase)