added wxEncodingToCodepage() and implemented it properly (using in32 API instead...

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

diff --git a/include/wx/settings.h b/include/wx/settings.h
index 0109917b1d70611f2556519a52c6c110ecfaad7d..901801991896e1cfec642dcff35359cc30e6a256 100644 (file)
--- a/include/wx/settings.h
+++ b/include/wx/settings.h
@@ -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,18 @@
 #define wxSYS_SHOW_SOUNDS             36
 #define wxSYS_SWAP_BUTTONS            37
 
 #define wxSYS_SHOW_SOUNDS             36
 #define wxSYS_SWAP_BUTTONS            37
 

+// Platform capabilities
+#define wxSYS_CAN_DRAW_FRAME_DECORATIONS  1
+#define wxSYS_CAN_ICONIZE_FRAME           2
+

 #if defined(__WXMSW__)
 #include "wx/msw/settings.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/settings.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/settings.h"
 #if defined(__WXMSW__)
 #include "wx/msw/settings.h"
 #elif defined(__WXMOTIF__)
 #include "wx/motif/settings.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/settings.h"

-#elif defined(__WXQT__)
-#include "wx/qt/settings.h"
+#elif defined(__WXMGL__)
+#include "wx/mgl/settings.h"

 #elif defined(__WXMAC__)
 #include "wx/mac/settings.h"
 #elif defined(__WXPM__)
 #elif defined(__WXMAC__)
 #include "wx/mac/settings.h"
 #elif defined(__WXPM__)