X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d451c5bd117cd7e7dcf3f1516049141093e46f0..a8cb1a4947bbbf5e18ce52448f4c3bb4cff4daee:/src/os2/settings.cpp

diff --git a/src/os2/settings.cpp b/src/os2/settings.cpp
index 5918387a3f..6bad06933b 100644
--- a/src/os2/settings.cpp
+++ b/src/os2/settings.cpp
@@ -166,7 +166,6 @@ wxColour wxSystemSettingsNative::GetColour(
         case wxSYS_COLOUR_LISTBOX:
         case wxSYS_COLOUR_CAPTIONTEXT:
             return(*wxWHITE);
-            break;
 
         case wxSYS_COLOUR_WINDOWTEXT:
         case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
@@ -249,9 +248,8 @@ wxFont wxSystemSettingsNative::GetFont(
 }
 
 // Get a system metric, e.g. scrollbar size
-int wxSystemSettingsNative::GetMetric(
-  wxSystemMetric                    index
-)
+int wxSystemSettingsNative::GetMetric( wxSystemMetric index,
+                                       wxWindow*      WXUNUSED(win) )
 {
     switch ( index)
     {
@@ -275,12 +273,12 @@ int wxSystemSettingsNative::GetMetric(
         // TODO case wxSYS_ICONSPACING_Y:
         // TODO case wxSYS_WINDOWMIN_X:
         // TODO case wxSYS_WINDOWMIN_Y:
-        
+
         case wxSYS_SCREEN_X:
             return ::WinQuerySysValue(HWND_DESKTOP,SV_CXSCREEN);
         case wxSYS_SCREEN_Y:
             return ::WinQuerySysValue(HWND_DESKTOP,SV_CYSCREEN);
-            
+
         // TODO case wxSYS_FRAMESIZE_X:
         // TODO case wxSYS_FRAMESIZE_Y:
         // TODO case wxSYS_SMALLICON_X:
@@ -296,27 +294,20 @@ int wxSystemSettingsNative::GetMetric(
         // TODO case wxSYS_PENWINDOWS_PRESENT:
         // TODO case wxSYS_SHOW_SOUNDS:
         // TODO case wxSYS_SWAP_BUTTONS:
-            
-        default:
-            return -1;  // unsupported metric
     }
-    return 0;
+    return -1;  // unsupported metric
 }
 
-bool wxSystemSettingsNative::HasFeature(
-  wxSystemFeature                   index
-)
+bool wxSystemSettingsNative::HasFeature( wxSystemFeature index )
 {
     switch (index)
     {
         case wxSYS_CAN_ICONIZE_FRAME:
-            return TRUE;
+            return true;
 
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
-            return FALSE;
-
-        default:
-            return FALSE;
+            return false;
     }
-    return FALSE;
+
+    return false;
 }