nicer version compilation fix for wxUSE_WCHAR_T=0 (why should we duplicate definition...

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

diff --git a/include/wx/settings.h b/include/wx/settings.h
index a3f1901ba8ce156ffa9dfdf5bba605d3c0fa6af7..7858b6d68f93a4c47d08a30e4c5d940782622adf 100644 (file)
--- a/include/wx/settings.h
+++ b/include/wx/settings.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __SETTINGSH_BASE__
-#define __SETTINGSH_BASE__
+#ifndef _WX_SETTINGS_H_BASE_
+#define _WX_SETTINGS_H_BASE_

 
 #define wxSYS_WHITE_BRUSH         0
 #define wxSYS_LTGRAY_BRUSH        1
 
 #define wxSYS_WHITE_BRUSH         0
 #define wxSYS_LTGRAY_BRUSH        1


@@ -58,6 +58,8 @@
 #define wxSYS_COLOUR_INFOTEXT          23
 #define wxSYS_COLOUR_INFOBK            24
 
 #define wxSYS_COLOUR_INFOTEXT          23
 #define wxSYS_COLOUR_INFOBK            24
 

+#define wxSYS_COLOUR_LISTBOX           25
+

 #define wxSYS_COLOUR_DESKTOP           wxSYS_COLOUR_BACKGROUND
 #define wxSYS_COLOUR_3DFACE            wxSYS_COLOUR_BTNFACE
 #define wxSYS_COLOUR_3DSHADOW          wxSYS_COLOUR_BTNSHADOW
 #define wxSYS_COLOUR_DESKTOP           wxSYS_COLOUR_BACKGROUND
 #define wxSYS_COLOUR_3DFACE            wxSYS_COLOUR_BTNFACE
 #define wxSYS_COLOUR_3DSHADOW          wxSYS_COLOUR_BTNSHADOW


@@ -104,14 +106,24 @@
 #define wxSYS_SHOW_SOUNDS             36
 #define wxSYS_SWAP_BUTTONS            37
 
 #define wxSYS_SHOW_SOUNDS             36
 #define wxSYS_SWAP_BUTTONS            37
 

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

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

-#elif defined(__MOTIF__)
-#include "wx/xt/settings.h"
-#elif defined(__GTK__)
+#elif defined(__WXMOTIF__)
+#include "wx/motif/settings.h"
+#elif defined(__WXGTK__)

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

+#elif defined(__WXMGL__)
+#include "wx/mgl/settings.h"
+#elif defined(__WXQT__)
+#include "wx/qt/settings.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/settings.h"
+#elif defined(__WXPM__)
+#include "wx/os2/settings.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/settings.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __SETTINGSH_BASE__
+    // _WX_SETTINGS_H_BASE_