Native wxControl::DoGetBestSize() implementation

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

diff --git a/src/motif/settings.cpp b/src/motif/settings.cpp
index e8d4c9b01b2221b8565c2a62f86735bf094e1f4e..054bc38821852ae325e1d90801616403db9d7a17 100644 (file)
--- a/src/motif/settings.cpp
+++ b/src/motif/settings.cpp
@@ -13,10 +13,13 @@
 // 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.
 
 // 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
 
 #pragma implementation "settings.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/settings.h"
 #include "wx/gdicmn.h"
 #include "wx/app.h"
 #include "wx/settings.h"
 #include "wx/gdicmn.h"
 #include "wx/app.h"


@@ -30,6 +33,8 @@
 #pragma message enable nosimpint
 #endif
 
 #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.
 // 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.


@@ -179,8 +184,13 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
 // Get a system metric, e.g. scrollbar size
 int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
 {
 // Get a system metric, e.g. scrollbar size
 int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
 {

+    int return_value = 0;
+

     switch ( index)
     {
     switch ( index)
     {

+        case wxSYS_HSCROLL_Y:
+        case wxSYS_VSCROLL_X:
+            return 15;

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


@@ -220,11 +230,13 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
         case wxSYS_WINDOWMIN_X:
             // TODO
         case wxSYS_WINDOWMIN_Y:
         case wxSYS_WINDOWMIN_X:
             // TODO
         case wxSYS_WINDOWMIN_Y:

-            // TODO
+            break;

         case wxSYS_SCREEN_X:
         case wxSYS_SCREEN_X:

-            // TODO
+            return_value = DisplayWidth( wxGlobalDisplay(), 0 );
+            break;

         case wxSYS_SCREEN_Y:
         case wxSYS_SCREEN_Y:

-            // TODO
+            return_value = DisplayHeight( wxGlobalDisplay(), 0 );
+            break;

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


@@ -233,10 +245,6 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
             // TODO
         case wxSYS_SMALLICON_Y:
             // TODO
             // 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:
         case wxSYS_VSCROLL_ARROW_X:
             // TODO
         case wxSYS_VSCROLL_ARROW_Y:


@@ -259,7 +267,7 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
             ;
     }
 
             ;
     }
 

-    return 0;
+    return return_value;

 }
 
 bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
 }
 
 bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)