wxSystemSettings class API face lift: better names for its methods (wxMOTIF)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/motif/settings.h b/include/wx/motif/settings.h
deleted file mode 100644 (file)
index 03c367e..0000000
--- a/include/wx/motif/settings.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        settings.h
-// Purpose:     wxSystemSettings class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SETTINGS_H_
-#define _WX_SETTINGS_H_
-
-#ifdef __GNUG__
-#pragma interface "settings.h"
-#endif
-
-#include "wx/setup.h"
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/colour.h"
-#include "wx/font.h"
-
-
-class WXDLLEXPORT wxSystemSettings: public wxObject
-{
-public:
-    inline wxSystemSettings() {}
-
-    // Get a system colour
-    static wxColour    GetSystemColour(int index);
-
-    // Get a system font
-    static wxFont      GetSystemFont(int index);
-
-    // Get a system metric, e.g. scrollbar size
-    static int         GetSystemMetric(int index);
-
-    // Return true if the port has certain feature
-    static bool        GetCapability(int index);
-
-};
-
-#endif
-    // _WX_SETTINGS_H_

diff --git a/include/wx/settings.h b/include/wx/settings.h
index 7c4b902885db4c565b8215580074112f69d6da08..00deb9977cddb3075f76117ba847366b84261db3 100644 (file)
--- a/include/wx/settings.h
+++ b/include/wx/settings.h
@@ -165,22 +165,10 @@ public:
 // include the declaration of the real platform-dependent class
 // ----------------------------------------------------------------------------
 
 // include the declaration of the real platform-dependent class
 // ----------------------------------------------------------------------------
 

-#if defined(__WXMSW__)
-    #define wxHAS_SS_NATIVE
-#elif defined(__WXMOTIF__)
-    #include "wx/motif/settings.h"
-#elif defined(__WXGTK__)
-    #define wxHAS_SS_NATIVE
-#elif defined(__WXMGL__)
-    #define wxHAS_SS_NATIVE
-#elif defined(__WXMAC__)
-    #define wxHAS_SS_NATIVE
-#elif defined(__WXPM__)
+// TODO: this should go away once wxOS2 has been updated to use wxSSNative
+#if defined(__WXPM__)

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

-#endif
-
-// TODO: this should go away once all ports are updated to use wxSSNative
-#ifdef wxHAS_SS_NATIVE
+#else

 
 class wxSystemSettings : public wxSystemSettingsNative
 {
 
 class wxSystemSettings : public wxSystemSettingsNative
 {


@@ -193,7 +181,7 @@ public:
 #endif // __WXUNIVERSAL__
 };
 
 #endif // __WXUNIVERSAL__
 };
 

-#endif // wxHAS_SS_NATIVE
+#endif // ! __WXPM__

 
 #endif
     // _WX_SETTINGS_H_BASE_
 
 #endif
     // _WX_SETTINGS_H_BASE_

diff --git a/src/motif/settings.cpp b/src/motif/settings.cpp
index b75b68efc92fbc451f76d1b094bdf59688695eb1..5d64ffcd062217664379ee7b1e067cc4aecd3687 100644 (file)
--- a/src/motif/settings.cpp
+++ b/src/motif/settings.cpp
@@ -20,7 +20,7 @@
 #include "wx/settings.h"
 #include "wx/gdicmn.h"
 
 #include "wx/settings.h"
 #include "wx/gdicmn.h"
 

-wxColour wxSystemSettings::GetSystemColour(int index)
+wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)

 {
   switch (index)
   {
 {
   switch (index)
   {


@@ -57,8 +57,8 @@ wxColour wxSystemSettings::GetSystemColour(int index)
         return *wxBLUE;
     }
     case wxSYS_COLOUR_BTNHIGHLIGHT:
         return *wxBLUE;
     }
     case wxSYS_COLOUR_BTNHIGHLIGHT:

-       case wxSYS_COLOUR_LISTBOX:
-      //    case wxSYS_COLOUR_3DHIGHLIGHT:      // Same as wxSYS_COLOUR_BTNHIGHLIGHT
+    case wxSYS_COLOUR_LISTBOX:
+       //    case wxSYS_COLOUR_3DHIGHLIGHT:      // Same as wxSYS_COLOUR_BTNHIGHLIGHT

     {
         return *wxWHITE;
     }
     {
         return *wxWHITE;
     }


@@ -70,6 +70,7 @@ wxColour wxSystemSettings::GetSystemColour(int index)
     case wxSYS_COLOUR_WINDOWTEXT:
     case wxSYS_COLOUR_CAPTIONTEXT:
     case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
     case wxSYS_COLOUR_WINDOWTEXT:
     case wxSYS_COLOUR_CAPTIONTEXT:
     case wxSYS_COLOUR_INACTIVECAPTIONTEXT:

+    case wxSYS_COLOUR_BTNTEXT:

     case wxSYS_COLOUR_INFOTEXT:
     {
         return *wxBLACK;
     case wxSYS_COLOUR_INFOTEXT:
     {
         return *wxBLACK;


@@ -88,7 +89,7 @@ wxColour wxSystemSettings::GetSystemColour(int index)
   return *wxWHITE;
 }
 
   return *wxWHITE;
 }
 

-wxFont wxSystemSettings::GetSystemFont(int index)
+wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)

 {
     switch (index)
     {
 {
     switch (index)
     {


@@ -111,133 +112,134 @@ wxFont wxSystemSettings::GetSystemFont(int index)
 }
 
 // Get a system metric, e.g. scrollbar size
 }
 
 // Get a system metric, e.g. scrollbar size

-int wxSystemSettings::GetSystemMetric(int index)
+int wxSystemSettingsNative::GetMetric(wxSystemMetric index)

 {
        switch ( index)
        {
         case wxSYS_MOUSE_BUTTONS:
             // TODO
 {
        switch ( index)
        {
         case wxSYS_MOUSE_BUTTONS:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_BORDER_X:
             // TODO
         case wxSYS_BORDER_X:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_BORDER_Y:
             // TODO
         case wxSYS_BORDER_Y:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_CURSOR_X:
             // TODO
         case wxSYS_CURSOR_X:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_CURSOR_Y:
             // TODO
         case wxSYS_CURSOR_Y:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_DCLICK_X:
             // TODO
         case wxSYS_DCLICK_X:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_DCLICK_Y:
             // TODO
         case wxSYS_DCLICK_Y:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_DRAG_X:
             // TODO
         case wxSYS_DRAG_X:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_DRAG_Y:
             // TODO
         case wxSYS_DRAG_Y:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_EDGE_X:
             // TODO
         case wxSYS_EDGE_X:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_EDGE_Y:
             // TODO
         case wxSYS_EDGE_Y:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_HSCROLL_ARROW_X:
             // TODO
         case wxSYS_HSCROLL_ARROW_X:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_HSCROLL_ARROW_Y:
             // TODO
         case wxSYS_HSCROLL_ARROW_Y:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_HTHUMB_X:
             // TODO
         case wxSYS_HTHUMB_X:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_ICON_X:
             // TODO
         case wxSYS_ICON_X:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_ICON_Y:
             // TODO
         case wxSYS_ICON_Y:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_ICONSPACING_X:
             // TODO
         case wxSYS_ICONSPACING_X:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_ICONSPACING_Y:
             // TODO
         case wxSYS_ICONSPACING_Y:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_WINDOWMIN_X:
             // TODO
         case wxSYS_WINDOWMIN_X:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_WINDOWMIN_Y:
             // TODO
         case wxSYS_WINDOWMIN_Y:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_SCREEN_X:
             // TODO
         case wxSYS_SCREEN_X:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_SCREEN_Y:
             // TODO
         case wxSYS_SCREEN_Y:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_FRAMESIZE_X:
             // TODO
         case wxSYS_FRAMESIZE_X:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_FRAMESIZE_Y:
             // TODO
         case wxSYS_FRAMESIZE_Y:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_SMALLICON_X:
             // TODO
         case wxSYS_SMALLICON_X:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_SMALLICON_Y:
             // TODO
         case wxSYS_SMALLICON_Y:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_HSCROLL_Y:
             // TODO
         case wxSYS_HSCROLL_Y:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_VSCROLL_X:
             // TODO
         case wxSYS_VSCROLL_X:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_VSCROLL_ARROW_X:
             // TODO
         case wxSYS_VSCROLL_ARROW_X:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_VSCROLL_ARROW_Y:
             // TODO
         case wxSYS_VSCROLL_ARROW_Y:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_VTHUMB_Y:
             // TODO
         case wxSYS_VTHUMB_Y:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_CAPTION_Y:
             // TODO
         case wxSYS_CAPTION_Y:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_MENU_Y:
             // TODO
         case wxSYS_MENU_Y:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_NETWORK_PRESENT:
             // TODO
         case wxSYS_NETWORK_PRESENT:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_PENWINDOWS_PRESENT:
             // TODO
         case wxSYS_PENWINDOWS_PRESENT:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_SHOW_SOUNDS:
             // TODO
         case wxSYS_SHOW_SOUNDS:
             // TODO

-                       return 0;
+            return 0;

         case wxSYS_SWAP_BUTTONS:
             // TODO
         case wxSYS_SWAP_BUTTONS:
             // TODO

-                       return 0;
-               default:
-                       return 0;
-       }
+            return 0;
+        default:
+            return 0;
+    }

 }
 
 }
 

-bool wxSystemSettings::GetCapability(int index)
+bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)

 {
     switch (index)
     {
         case wxSYS_CAN_ICONIZE_FRAME: 
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
 {
     switch (index)
     {
         case wxSYS_CAN_ICONIZE_FRAME: 
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:

-            return TRUE; break;
+            return TRUE;
+            

         default:
             return FALSE;
     }
         default:
             return FALSE;
     }