Reset previous sort column in generic wxDataViewColumn::SetSortOrder().

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

diff --git a/include/wx/settings.h b/include/wx/settings.h
index 24cee957a2385d3a211139a6e3f9921ce2fea4e1..d9c2dd40490d35aa7d9675c16a3eb79b1380226f 100644 (file)
--- a/include/wx/settings.h
+++ b/include/wx/settings.h
@@ -15,7 +15,7 @@
 #include "wx/colour.h"
 #include "wx/font.h"
 
 #include "wx/colour.h"
 #include "wx/font.h"
 

-class WXDLLEXPORT wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxWindow;

 
 // possible values for wxSystemSettings::GetFont() parameter
 //
 
 // possible values for wxSystemSettings::GetFont() parameter
 //


@@ -28,8 +28,15 @@ enum wxSystemFont
     wxSYS_ANSI_VAR_FONT,
     wxSYS_SYSTEM_FONT,
     wxSYS_DEVICE_DEFAULT_FONT,
     wxSYS_ANSI_VAR_FONT,
     wxSYS_SYSTEM_FONT,
     wxSYS_DEVICE_DEFAULT_FONT,

+
+    // don't use: this is here just to make the values of enum elements
+    // coincide with the corresponding MSW constants

     wxSYS_DEFAULT_PALETTE,
     wxSYS_DEFAULT_PALETTE,

+
+    // don't use: MSDN says that this is a stock object provided only
+    // for compatibility with 16-bit Windows versions earlier than 3.0!

     wxSYS_SYSTEM_FIXED_FONT,
     wxSYS_SYSTEM_FIXED_FONT,

+

     wxSYS_DEFAULT_GUI_FONT,
 
     // this was just a temporary aberration, do not use it any more
     wxSYS_DEFAULT_GUI_FONT,
 
     // this was just a temporary aberration, do not use it any more


@@ -43,8 +50,7 @@ enum wxSystemFont
 enum wxSystemColour
 {
     wxSYS_COLOUR_SCROLLBAR,
 enum wxSystemColour
 {
     wxSYS_COLOUR_SCROLLBAR,

-    wxSYS_COLOUR_BACKGROUND,
-    wxSYS_COLOUR_DESKTOP = wxSYS_COLOUR_BACKGROUND,
+    wxSYS_COLOUR_DESKTOP,

     wxSYS_COLOUR_ACTIVECAPTION,
     wxSYS_COLOUR_INACTIVECAPTION,
     wxSYS_COLOUR_MENU,
     wxSYS_COLOUR_ACTIVECAPTION,
     wxSYS_COLOUR_INACTIVECAPTION,
     wxSYS_COLOUR_MENU,


@@ -59,16 +65,11 @@ enum wxSystemColour
     wxSYS_COLOUR_HIGHLIGHT,
     wxSYS_COLOUR_HIGHLIGHTTEXT,
     wxSYS_COLOUR_BTNFACE,
     wxSYS_COLOUR_HIGHLIGHT,
     wxSYS_COLOUR_HIGHLIGHTTEXT,
     wxSYS_COLOUR_BTNFACE,

-    wxSYS_COLOUR_3DFACE = wxSYS_COLOUR_BTNFACE,

     wxSYS_COLOUR_BTNSHADOW,
     wxSYS_COLOUR_BTNSHADOW,

-    wxSYS_COLOUR_3DSHADOW = wxSYS_COLOUR_BTNSHADOW,

     wxSYS_COLOUR_GRAYTEXT,
     wxSYS_COLOUR_BTNTEXT,
     wxSYS_COLOUR_INACTIVECAPTIONTEXT,
     wxSYS_COLOUR_BTNHIGHLIGHT,
     wxSYS_COLOUR_GRAYTEXT,
     wxSYS_COLOUR_BTNTEXT,
     wxSYS_COLOUR_INACTIVECAPTIONTEXT,
     wxSYS_COLOUR_BTNHIGHLIGHT,

-    wxSYS_COLOUR_BTNHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
-    wxSYS_COLOUR_3DHIGHLIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
-    wxSYS_COLOUR_3DHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,

     wxSYS_COLOUR_3DDKSHADOW,
     wxSYS_COLOUR_3DLIGHT,
     wxSYS_COLOUR_INFOTEXT,
     wxSYS_COLOUR_3DDKSHADOW,
     wxSYS_COLOUR_3DLIGHT,
     wxSYS_COLOUR_INFOTEXT,


@@ -79,8 +80,19 @@ enum wxSystemColour
     wxSYS_COLOUR_GRADIENTINACTIVECAPTION,
     wxSYS_COLOUR_MENUHILIGHT,
     wxSYS_COLOUR_MENUBAR,
     wxSYS_COLOUR_GRADIENTINACTIVECAPTION,
     wxSYS_COLOUR_MENUHILIGHT,
     wxSYS_COLOUR_MENUBAR,

+    wxSYS_COLOUR_LISTBOXTEXT,
+    wxSYS_COLOUR_LISTBOXHIGHLIGHTTEXT,

 
 

-    wxSYS_COLOUR_MAX
+    wxSYS_COLOUR_MAX,
+
+    // synonyms
+    wxSYS_COLOUR_BACKGROUND = wxSYS_COLOUR_DESKTOP,
+    wxSYS_COLOUR_3DFACE = wxSYS_COLOUR_BTNFACE,
+    wxSYS_COLOUR_3DSHADOW = wxSYS_COLOUR_BTNSHADOW,
+    wxSYS_COLOUR_BTNHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
+    wxSYS_COLOUR_3DHIGHLIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
+    wxSYS_COLOUR_3DHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
+    wxSYS_COLOUR_FRAMEBK = wxSYS_COLOUR_BTNFACE

 };
 
 // possible values for wxSystemSettings::GetMetric() index parameter
 };
 
 // possible values for wxSystemSettings::GetMetric() index parameter


@@ -125,14 +137,16 @@ enum wxSystemMetric
     wxSYS_NETWORK_PRESENT,
     wxSYS_PENWINDOWS_PRESENT,
     wxSYS_SHOW_SOUNDS,
     wxSYS_NETWORK_PRESENT,
     wxSYS_PENWINDOWS_PRESENT,
     wxSYS_SHOW_SOUNDS,

-    wxSYS_SWAP_BUTTONS
+    wxSYS_SWAP_BUTTONS,
+    wxSYS_DCLICK_MSEC

 };
 
 // possible values for wxSystemSettings::HasFeature() parameter
 enum wxSystemFeature
 {
     wxSYS_CAN_DRAW_FRAME_DECORATIONS = 1,
 };
 
 // possible values for wxSystemSettings::HasFeature() parameter
 enum wxSystemFeature
 {
     wxSYS_CAN_DRAW_FRAME_DECORATIONS = 1,

-    wxSYS_CAN_ICONIZE_FRAME
+    wxSYS_CAN_ICONIZE_FRAME,
+    wxSYS_TABLET_PRESENT

 };
 
 // values for different screen designs
 };
 
 // values for different screen designs


@@ -157,7 +171,7 @@ enum wxSystemScreenType
 // files (i.e. this is not a real base class as we can't override its virtual
 // functions because it doesn't have any)
 
 // files (i.e. this is not a real base class as we can't override its virtual
 // functions because it doesn't have any)
 

-class WXDLLEXPORT wxSystemSettingsNative
+class WXDLLIMPEXP_CORE wxSystemSettingsNative

 {
 public:
     // get a standard system colour
 {
 public:
     // get a standard system colour


@@ -177,7 +191,7 @@ public:
 // include the declaration of the real platform-dependent class
 // ----------------------------------------------------------------------------
 
 // include the declaration of the real platform-dependent class
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxSystemSettings : public wxSystemSettingsNative
+class WXDLLIMPEXP_CORE wxSystemSettings : public wxSystemSettingsNative

 {
 public:
 #ifdef __WXUNIVERSAL__
 {
 public:
 #ifdef __WXUNIVERSAL__


@@ -185,6 +199,10 @@ public:
     // system ones, otherwise wxSystemSettings is just the same as
     // wxSystemSettingsNative
     static wxColour GetColour(wxSystemColour index);
     // system ones, otherwise wxSystemSettings is just the same as
     // wxSystemSettingsNative
     static wxColour GetColour(wxSystemColour index);

+
+    // some metrics are toolkit-dependent and provided by wxUniv, some are
+    // lowlevel
+    static int GetMetric(wxSystemMetric index, wxWindow *win = NULL);

 #endif // __WXUNIVERSAL__
 
     // Get system screen design (desktop, pda, ..) used for
 #endif // __WXUNIVERSAL__
 
     // Get system screen design (desktop, pda, ..) used for


@@ -197,13 +215,6 @@ public:
     // Value
     static wxSystemScreenType ms_screen;
 
     // Value
     static wxSystemScreenType ms_screen;
 

-#if WXWIN_COMPATIBILITY_2_4
-    // the backwards compatible versions of wxSystemSettingsNative functions,
-    // don't use these methods in the new code!
-    wxDEPRECATED(static wxColour GetSystemColour(int index));
-    wxDEPRECATED(static wxFont GetSystemFont(int index));
-    wxDEPRECATED(static int GetSystemMetric(int index));
-#endif

 };
 
 #endif
 };
 
 #endif