make wxTmemchr() return (and take) char* instead of void* in ANSI build too

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

diff --git a/include/wx/settings.h b/include/wx/settings.h
index 1d3248d2c8012ce2117a18f0fcaa7d4e6630462c..8b467f51cea923700ec5c52b34c96f62ad924104 100644 (file)
--- a/include/wx/settings.h
+++ b/include/wx/settings.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -15,6 +15,8 @@
 #include "wx/colour.h"
 #include "wx/font.h"
 
 #include "wx/colour.h"
 #include "wx/font.h"
 

+class WXDLLIMPEXP_FWD_CORE wxWindow;
+

 // possible values for wxSystemSettings::GetFont() parameter
 //
 // NB: wxMSW assumes that they have the same values as the parameters of
 // possible values for wxSystemSettings::GetFont() parameter
 //
 // NB: wxMSW assumes that they have the same values as the parameters of


@@ -28,7 +30,10 @@ enum wxSystemFont
     wxSYS_DEVICE_DEFAULT_FONT,
     wxSYS_DEFAULT_PALETTE,
     wxSYS_SYSTEM_FIXED_FONT,
     wxSYS_DEVICE_DEFAULT_FONT,
     wxSYS_DEFAULT_PALETTE,
     wxSYS_SYSTEM_FIXED_FONT,

-    wxSYS_DEFAULT_GUI_FONT
+    wxSYS_DEFAULT_GUI_FONT,
+
+    // this was just a temporary aberration, do not use it any more
+    wxSYS_ICONTITLE_FONT = wxSYS_DEFAULT_GUI_FONT

 };
 
 // possible values for wxSystemSettings::GetColour() parameter
 };
 
 // possible values for wxSystemSettings::GetColour() parameter


@@ -78,7 +83,7 @@ enum wxSystemColour
     wxSYS_COLOUR_MAX
 };
 
     wxSYS_COLOUR_MAX
 };
 

-// possible values for wxSystemSettings::GetMetric() parameter
+// possible values for wxSystemSettings::GetMetric() index parameter

 //
 // NB: update the conversion table in msw/settings.cpp if you change the values
 //     of the elements of this enum
 //
 // NB: update the conversion table in msw/settings.cpp if you change the values
 //     of the elements of this enum


@@ -127,7 +132,19 @@ enum wxSystemMetric
 enum wxSystemFeature
 {
     wxSYS_CAN_DRAW_FRAME_DECORATIONS = 1,
 enum wxSystemFeature
 {
     wxSYS_CAN_DRAW_FRAME_DECORATIONS = 1,

-    wxSYS_CAN_ICONIZE_FRAME
+    wxSYS_CAN_ICONIZE_FRAME,
+    wxSYS_TABLET_PRESENT
+};
+
+// values for different screen designs
+enum wxSystemScreenType
+{
+    wxSYS_SCREEN_NONE = 0,  //   not yet defined
+
+    wxSYS_SCREEN_TINY,      //   <
+    wxSYS_SCREEN_PDA,       //   >= 320x240
+    wxSYS_SCREEN_SMALL,     //   >= 640x480
+    wxSYS_SCREEN_DESKTOP    //   >= 800x600

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -151,7 +168,7 @@ public:
     static wxFont GetFont(wxSystemFont index);
 
     // get a system-dependent metric
     static wxFont GetFont(wxSystemFont index);
 
     // get a system-dependent metric

-    static int GetMetric(wxSystemMetric index);
+    static int GetMetric(wxSystemMetric index, wxWindow * win = NULL);

 
     // return true if the port has certain feature
     static bool HasFeature(wxSystemFeature index);
 
     // return true if the port has certain feature
     static bool HasFeature(wxSystemFeature index);


@@ -161,25 +178,26 @@ public:
 // include the declaration of the real platform-dependent class
 // ----------------------------------------------------------------------------
 
 // include the declaration of the real platform-dependent class
 // ----------------------------------------------------------------------------
 

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

 {
 public:
 #ifdef __WXUNIVERSAL__
     // in wxUniversal we want to use the theme standard colours instead of the
 {
 public:
 #ifdef __WXUNIVERSAL__
     // in wxUniversal we want to use the theme standard colours instead of the

-    // system ones, otherwuse wxSystemSettings is just the same as
+    // system ones, otherwise wxSystemSettings is just the same as

     // wxSystemSettingsNative
     static wxColour GetColour(wxSystemColour index);
 #endif // __WXUNIVERSAL__
 
     // wxSystemSettingsNative
     static wxColour GetColour(wxSystemColour index);
 #endif // __WXUNIVERSAL__
 

+    // Get system screen design (desktop, pda, ..) used for
+    // laying out various dialogs.
+    static wxSystemScreenType GetScreenType();
+
+    // Override default.
+    static void SetScreenType( wxSystemScreenType screen );
+
+    // Value
+    static wxSystemScreenType ms_screen;

 
 

-    // the backwards compatible versions of wxSystemSettingsNative functions,
-    // don't use these methods in the new code!
-    static wxColour GetSystemColour(int index)
-        { return GetColour((wxSystemColour)index); }
-    static wxFont GetSystemFont(int index)
-        { return GetFont((wxSystemFont)index); }
-    static int GetSystemMetric(int index)
-        { return GetMetric((wxSystemMetric)index); }

 };
 
 #endif
 };
 
 #endif