Docstring tweaks

[wxWidgets.git] / src / motif / settings.cpp

diff --git a/src/motif/settings.cpp b/src/motif/settings.cpp
index a29bffc9b2918781d82abc8b0967ecf3f94ca3ff..25bcfddc025af3d49cb15346b2fa898feef6271b 100644 (file)
--- a/src/motif/settings.cpp
+++ b/src/motif/settings.cpp
@@ -13,15 +13,38 @@
 // per-user file, which can be edited using a Windows-control-panel clone.
 // Also they should be documented better. Some are very MS Windows-ish.
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "settings.h"
 #endif
 
 #include "wx/settings.h"
 #include "wx/gdicmn.h"
+#include "wx/app.h"
+
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
+#include <Xm/Xm.h>
+#include <Xm/PushB.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
+
+#include "wx/x11/privx.h"
+
+// To correctly read the resources from the database, we create a
+// sample widget. This has the application shell as the parent and
+// so will be destroyed when the applicaion is closed.
+static Widget but_setting_wid = NULL;
 
 wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
 {
+  if (NULL == but_setting_wid && wxTheApp && wxTheApp->GetTopLevelWidget())
+  {
+    but_setting_wid = XtVaCreateWidget("settings_button", xmPushButtonWidgetClass,
+                                        (Widget)wxTheApp->GetTopLevelWidget(), NULL);
+  }
+
   switch (index)
   {
     case wxSYS_COLOUR_WINDOW:
@@ -34,6 +57,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
     case wxSYS_COLOUR_ACTIVECAPTION:
     case wxSYS_COLOUR_INACTIVECAPTION:
     case wxSYS_COLOUR_MENU:
+    case wxSYS_COLOUR_MENUBAR:
     case wxSYS_COLOUR_WINDOWFRAME:
     case wxSYS_COLOUR_ACTIVEBORDER:
     case wxSYS_COLOUR_INACTIVEBORDER:
@@ -41,7 +65,18 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
       //    case wxSYS_COLOUR_3DFACE:           // Same as wxSYS_COLOUR_BTNFACE
     case wxSYS_COLOUR_GRAYTEXT:
     {
-        return wxColour("LIGHT GREY");
+        if (but_setting_wid)
+        {
+            XColor bg;
+            XtVaGetValues(but_setting_wid,
+                        XtVaTypedArg, XmNbackground, XtRColor, &bg, sizeof(bg),
+                        NULL);
+            return wxColor(bg.red >> 8, bg.green >> 8, bg.blue >> 8);
+        }
+        else
+        {
+            return wxColour("LIGHT GREY");
+        }
     }
     case wxSYS_COLOUR_BTNSHADOW:
       //    case wxSYS_COLOUR_3DSHADOW:         // Same as wxSYS_COLOUR_BTNSHADOW
@@ -73,7 +108,18 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
     case wxSYS_COLOUR_BTNTEXT:
     case wxSYS_COLOUR_INFOTEXT:
     {
-        return *wxBLACK;
+        if (but_setting_wid)
+        {
+            XColor fg;
+            XtVaGetValues(but_setting_wid,
+                        XtVaTypedArg, XmNforeground, XtRColor, &fg, sizeof(fg),
+                        NULL);
+            return wxColor(fg.red >> 8, fg.green >> 8, fg.blue >> 8);
+        }
+        else
+        {
+            return *wxBLACK;
+        }
     }
     case wxSYS_COLOUR_HIGHLIGHTTEXT:
     {
@@ -82,14 +128,24 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
     case wxSYS_COLOUR_INFOBK:
     case wxSYS_COLOUR_APPWORKSPACE:
     {
-        return wxColour("LIGHT GREY");
+        if (but_setting_wid)
+        {
+            XColor bg;
+            XtVaGetValues(but_setting_wid,
+                        XtVaTypedArg, XmNbackground, XtRColor, &bg, sizeof(bg),
+                        NULL);
+            return wxColor(bg.red >> 8, bg.green >> 8, bg.blue >> 8);
+        }
+        else
+        {
+            return wxColour("LIGHT GREY");
+        }
     }
 
     case wxSYS_COLOUR_HOTLIGHT:
     case wxSYS_COLOUR_GRADIENTACTIVECAPTION:
     case wxSYS_COLOUR_GRADIENTINACTIVECAPTION:
     case wxSYS_COLOUR_MENUHILIGHT:
-    case wxSYS_COLOUR_MENUBAR:
         // TODO
         return wxColour("LIGHT GREY");
 
@@ -125,8 +181,13 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
 // Get a system metric, e.g. scrollbar size
 int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
 {
+    int return_value = 0;
+
     switch ( index)
     {
+        case wxSYS_HSCROLL_Y:
+        case wxSYS_VSCROLL_X:
+            return 15;
         case wxSYS_MOUSE_BUTTONS:
             // TODO
         case wxSYS_BORDER_X:
@@ -166,11 +227,13 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
         case wxSYS_WINDOWMIN_X:
             // TODO
         case wxSYS_WINDOWMIN_Y:
-            // TODO
+            break;
         case wxSYS_SCREEN_X:
-            // TODO
+            return_value = DisplayWidth( wxGlobalDisplay(), 0 );
+            break;
         case wxSYS_SCREEN_Y:
-            // TODO
+            return_value = DisplayHeight( wxGlobalDisplay(), 0 );
+            break;
         case wxSYS_FRAMESIZE_X:
             // TODO
         case wxSYS_FRAMESIZE_Y:
@@ -179,10 +242,6 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
             // TODO
         case wxSYS_SMALLICON_Y:
             // TODO
-        case wxSYS_HSCROLL_Y:
-            // TODO
-        case wxSYS_VSCROLL_X:
-            // TODO
         case wxSYS_VSCROLL_ARROW_X:
             // TODO
         case wxSYS_VSCROLL_ARROW_Y:
@@ -205,7 +264,7 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
             ;
     }
 
-    return 0;
+    return return_value;
 }
 
 bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)