fix for opening files with VC++ 8 (closes bug 994337)

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

diff --git a/src/motif/settings.cpp b/src/motif/settings.cpp
index 91f8fc631b76d223e3f22281c3ca98f929b4e97e..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.
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #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"
@@ -30,6 +33,8 @@
 #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.
@@ -179,6 +184,8 @@ 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:
@@ -223,11 +230,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:
@@ -258,7 +267,7 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
             ;
     }
 
-    return 0;
+    return return_value;
 }
 
 bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)