fix wxBitmapComboBox Gtk-CRITICAL assertion `GTK_IS_ENTRY (entry)' failed

[wxWidgets.git] / include / wx / config.h

diff --git a/include/wx/config.h b/include/wx/config.h
index ddbbbe2f47f508ce4a45387a4ca9cadd00810efd..54e821d918bf3b9b331cf1d469702a7f44814f7b 100644 (file)
--- a/include/wx/config.h
+++ b/include/wx/config.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        config.h
+// Name:        wx/config.h

 // Purpose:     wxConfig base header
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxConfig base header
 // Author:      Julian Smart
 // Modified by:


@@ -12,27 +12,27 @@
 #ifndef _WX_CONFIG_H_BASE_
 #define _WX_CONFIG_H_BASE_
 
 #ifndef _WX_CONFIG_H_BASE_
 #define _WX_CONFIG_H_BASE_
 

-#include "wx/defs.h"

 #include "wx/confbase.h"
 
 #include "wx/confbase.h"
 

+#if wxUSE_CONFIG
+

 // ----------------------------------------------------------------------------
 // define the native wxConfigBase implementation
 // ----------------------------------------------------------------------------
 
 // under Windows we prefer to use the native implementation but can be forced
 // to use the file-based one
 // ----------------------------------------------------------------------------
 // define the native wxConfigBase implementation
 // ----------------------------------------------------------------------------
 
 // under Windows we prefer to use the native implementation but can be forced
 // to use the file-based one

-#if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
+#if defined(__WINDOWS__) && wxUSE_CONFIG_NATIVE

     #include "wx/msw/regconf.h"
     #define wxConfig  wxRegConfig
 #elif defined(__WXOS2__) && wxUSE_CONFIG_NATIVE
     #include "wx/os2/iniconf.h"
     #define wxConfig wxIniConfig
     #include "wx/msw/regconf.h"
     #define wxConfig  wxRegConfig
 #elif defined(__WXOS2__) && wxUSE_CONFIG_NATIVE
     #include "wx/os2/iniconf.h"
     #define wxConfig wxIniConfig

-#elif defined(__WXPALMOS__) && wxUSE_CONFIG_NATIVE
-    #include "wx/palmos/prefconf.h"
-    #define wxConfig wxPrefConfig

 #else // either we're under Unix or wish to always use config files
     #include "wx/fileconf.h"
     #define wxConfig wxFileConfig
 #endif
 
 #else // either we're under Unix or wish to always use config files
     #include "wx/fileconf.h"
     #define wxConfig wxFileConfig
 #endif
 

+#endif // wxUSE_CONFIG
+

 #endif // _WX_CONFIG_H_BASE_
 #endif // _WX_CONFIG_H_BASE_