[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

diff --git a/src/motif/settings.cpp b/src/motif/settings.cpp
index b332b632c7acc3840a2c98cc106588a45d688aa4..03ab6e5a6e493d07c0e9c09cf2e6aa919f0d152f 100644 (file)
--- a/src/motif/settings.cpp
+++ b/src/motif/settings.cpp
@@ -17,6 +17,9 @@
 #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.


@@ -160,7 +165,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
     {
         case wxSYS_SYSTEM_FIXED_FONT:
         {
     {
         case wxSYS_SYSTEM_FIXED_FONT:
         {

-            return wxFont(12, wxMODERN, wxNORMAL, wxNORMAL, FALSE);
+            return wxFont(12, wxMODERN, wxNORMAL, wxNORMAL, false);

             break;
         }
         case wxSYS_DEVICE_DEFAULT_FONT:
             break;
         }
         case wxSYS_DEVICE_DEFAULT_FONT:


@@ -168,7 +173,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
         case wxSYS_DEFAULT_GUI_FONT:
         default:
         {
         case wxSYS_DEFAULT_GUI_FONT:
         default:
         {

-            return wxFont(12, wxSWISS, wxNORMAL, wxNORMAL, FALSE);
+            return wxFont(12, wxSWISS, wxNORMAL, wxNORMAL, false);

             break;
         }
     }
             break;
         }
     }


@@ -177,88 +182,62 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
 }
 
 // Get a system metric, e.g. scrollbar size
 }
 
 // Get a system metric, e.g. scrollbar size

-int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
+int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(win))

 {
 {

+    int return_value = 0;
+

     switch ( index)
     {
         case wxSYS_HSCROLL_Y:
         case wxSYS_VSCROLL_X:
             return 15;
     switch ( index)
     {
         case wxSYS_HSCROLL_Y:
         case wxSYS_VSCROLL_X:
             return 15;

-        case wxSYS_MOUSE_BUTTONS:
-            // TODO
-        case wxSYS_BORDER_X:
-            // TODO
-        case wxSYS_BORDER_Y:
-            // TODO
-        case wxSYS_CURSOR_X:
-            // TODO
-        case wxSYS_CURSOR_Y:
-            // TODO
-        case wxSYS_DCLICK_X:
-            // TODO
-        case wxSYS_DCLICK_Y:
-            // TODO
-        case wxSYS_DRAG_X:
-            // TODO
-        case wxSYS_DRAG_Y:
-            // TODO
-        case wxSYS_EDGE_X:
-            // TODO
-        case wxSYS_EDGE_Y:
-            // TODO
-        case wxSYS_HSCROLL_ARROW_X:
-            // TODO
-        case wxSYS_HSCROLL_ARROW_Y:
-            // TODO
-        case wxSYS_HTHUMB_X:
-            // TODO
-        case wxSYS_ICON_X:
-            // TODO
-        case wxSYS_ICON_Y:
-            // TODO
-        case wxSYS_ICONSPACING_X:
-            // TODO
-        case wxSYS_ICONSPACING_Y:
-            // TODO
-        case wxSYS_WINDOWMIN_X:
-            // TODO
-        case wxSYS_WINDOWMIN_Y:
-            // TODO
+            

         case wxSYS_SCREEN_X:
         case wxSYS_SCREEN_X:

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

         case wxSYS_SCREEN_Y:
         case wxSYS_SCREEN_Y:

-            // TODO
-        case wxSYS_FRAMESIZE_X:
-            // TODO
-        case wxSYS_FRAMESIZE_Y:
-            // TODO
-        case wxSYS_SMALLICON_X:
-            // TODO
-        case wxSYS_SMALLICON_Y:
-            // TODO
-        case wxSYS_VSCROLL_ARROW_X:
-            // TODO
-        case wxSYS_VSCROLL_ARROW_Y:
-            // TODO
-        case wxSYS_VTHUMB_Y:
-            // TODO
-        case wxSYS_CAPTION_Y:
-            // TODO
-        case wxSYS_MENU_Y:
-            // TODO
-        case wxSYS_NETWORK_PRESENT:
-            // TODO
-        case wxSYS_PENWINDOWS_PRESENT:
-            // TODO
-        case wxSYS_SHOW_SOUNDS:
-            // TODO
-        case wxSYS_SWAP_BUTTONS:
-            // TODO
+            return_value = DisplayHeight( wxGlobalDisplay(), 0 );
+            break;
+
+        // TODO case wxSYS_MOUSE_BUTTONS:
+        // TODO case wxSYS_BORDER_X:
+        // TODO case wxSYS_BORDER_Y:
+        // TODO case wxSYS_CURSOR_X:
+        // TODO case wxSYS_CURSOR_Y:
+        // TODO case wxSYS_DCLICK_X:
+        // TODO case wxSYS_DCLICK_Y:
+        // TODO case wxSYS_DRAG_X:
+        // TODO case wxSYS_DRAG_Y:
+        // TODO case wxSYS_EDGE_X:
+        // TODO case wxSYS_EDGE_Y:
+        // TODO case wxSYS_HSCROLL_ARROW_X:
+        // TODO case wxSYS_HSCROLL_ARROW_Y:
+        // TODO case wxSYS_HTHUMB_X:
+        // TODO case wxSYS_ICON_X:
+        // TODO case wxSYS_ICON_Y:
+        // TODO case wxSYS_ICONSPACING_X:
+        // TODO case wxSYS_ICONSPACING_Y:
+        // TODO case wxSYS_WINDOWMIN_X:
+        // TODO case wxSYS_WINDOWMIN_Y:
+        // TODO case wxSYS_FRAMESIZE_X:
+        // TODO case wxSYS_FRAMESIZE_Y:
+        // TODO case wxSYS_SMALLICON_X:
+        // TODO case wxSYS_SMALLICON_Y:
+        // TODO case wxSYS_VSCROLL_ARROW_X:
+        // TODO case wxSYS_VSCROLL_ARROW_Y:
+        // TODO case wxSYS_VTHUMB_Y:
+        // TODO case wxSYS_CAPTION_Y:
+        // TODO case wxSYS_MENU_Y:
+        // TODO case wxSYS_NETWORK_PRESENT:
+        // TODO case wxSYS_PENWINDOWS_PRESENT:
+        // TODO case wxSYS_SHOW_SOUNDS:
+        // TODO case wxSYS_SWAP_BUTTONS:
+

         default:
         default:

-            ;
+            return_value = -1; // unsuported metric

     }
 
     }
 

-    return 0;
+    return return_value;

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


@@ -267,9 +246,9 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
     {
         case wxSYS_CAN_ICONIZE_FRAME:
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
     {
         case wxSYS_CAN_ICONIZE_FRAME:
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:

-            return TRUE;
+            return true;

 
         default:
 
         default:

-            return FALSE;
+            return false;

     }
 }
     }
 }