Compile fix.

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

diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index c4ce9f63dae0d1fd1a6a792fbb33a0abfeb9b904..bb83358f10082ebd2d68a6d19ea08da0b8c290f8 100644 (file)
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -14,8 +14,6 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if wxUSE_COMBOBOX
-

 /*
  * wxComboBox style flags
  */
 /*
  * wxComboBox style flags
  */


@@ -25,6 +23,8 @@
 #define wxCB_DROPDOWN       0x0020
 #define wxCB_FILENAME       0x0040
 
 #define wxCB_DROPDOWN       0x0020
 #define wxCB_FILENAME       0x0040
 

+#if wxUSE_COMBOBOX
+

 extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[];
 
 // ----------------------------------------------------------------------------
 extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[];
 
 // ----------------------------------------------------------------------------

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index a7f05f679afed006baec1e027f89a933723f5465..ba57eaa3f57c21ff079aa4e3db007dc1080bfc01 100644 (file)
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -12,6 +12,7 @@
 #if wxUSE_CHOICE
 
 #include "wx/choice.h"
 #if wxUSE_CHOICE
 
 #include "wx/choice.h"

+#include "wx/combobox.h"

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