wxUSE_BUTTONBAR removed.

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

diff --git a/include/wx/settings.h b/include/wx/settings.h
index 8d5467212f6885099c992ebc2fa9337925190d8d..4ed8c4c64ad0fdde97a43557be72f59c92984feb 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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -28,7 +28,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


@@ -131,13 +134,14 @@ enum wxSystemFeature
 };
 
 // values for different screen designs
 };
 
 // values for different screen designs

-enum wxSystemScreen
+enum wxSystemScreenType

 {
     wxSYS_SCREEN_NONE = 0,  //   not yet defined
 {
     wxSYS_SCREEN_NONE = 0,  //   not yet defined

-    wxSYS_SCREEN_DESKTOP,   //   >= 800x600
-    wxSYS_SCREEN_SMALL,     //   >= 640x480
+
+    wxSYS_SCREEN_TINY,      //   <

     wxSYS_SCREEN_PDA,       //   >= 320x240
     wxSYS_SCREEN_PDA,       //   >= 320x240

-    wxSYS_SCREEN_TINY       //   <
+    wxSYS_SCREEN_SMALL,     //   >= 640x480
+    wxSYS_SCREEN_DESKTOP    //   >= 800x600

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


@@ -183,13 +187,13 @@ public:
 
     // Get system screen design (desktop, pda, ..) used for
     // laying out various dialogs.
 
     // Get system screen design (desktop, pda, ..) used for
     // laying out various dialogs.

-    static wxSystemScreen GetScreen();
+    static wxSystemScreenType GetScreenType();

 
     // Override default.
 
     // Override default.

-    static void SetScreen( wxSystemScreen screen );
+    static void SetScreenType( wxSystemScreenType screen );

 
     // Value
 
     // Value

-    static wxSystemScreen ms_screen;
+    static wxSystemScreenType ms_screen;

 
 
     // the backwards compatible versions of wxSystemSettingsNative functions,
 
 
     // the backwards compatible versions of wxSystemSettingsNative functions,