PyCrust updates

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

diff --git a/include/wx/settings.h b/include/wx/settings.h
index 46dac734b58f624b30c9c762be7b87a0b4991e43..00deb9977cddb3075f76117ba847366b84261db3 100644 (file)
--- a/include/wx/settings.h
+++ b/include/wx/settings.h
@@ -165,22 +165,10 @@ public:
 // include the declaration of the real platform-dependent class
 // ----------------------------------------------------------------------------
 
 // include the declaration of the real platform-dependent class
 // ----------------------------------------------------------------------------
 

-#if defined(__WXMSW__)
-    #define wxHAS_SS_NATIVE
-#elif defined(__WXMOTIF__)
-    #include "wx/motif/settings.h"
-#elif defined(__WXGTK__)
-    #include "wx/gtk/settings.h"
-#elif defined(__WXMGL__)
-    #include "wx/mgl/settings.h"
-#elif defined(__WXMAC__)
-    #include "wx/mac/settings.h"
-#elif defined(__WXPM__)
+// TODO: this should go away once wxOS2 has been updated to use wxSSNative
+#if defined(__WXPM__)

     #include "wx/os2/settings.h"
     #include "wx/os2/settings.h"

-#endif
-
-// TODO: this should go away once all ports are updated to use wxSSNative
-#ifdef wxHAS_SS_NATIVE
+#else

 
 class wxSystemSettings : public wxSystemSettingsNative
 {
 
 class wxSystemSettings : public wxSystemSettingsNative
 {


@@ -193,7 +181,7 @@ public:
 #endif // __WXUNIVERSAL__
 };
 
 #endif // __WXUNIVERSAL__
 };
 

-#endif // wxHAS_SS_NATIVE
+#endif // ! __WXPM__

 
 #endif
     // _WX_SETTINGS_H_BASE_
 
 #endif
     // _WX_SETTINGS_H_BASE_