fixed incorrect GetTextExtent for wxTELETYPE font

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

diff --git a/src/os2/settings.cpp b/src/os2/settings.cpp
index c47c24d5c4f8096e5ce23def836306fb3418e6b0..f7394528e158b630564951de36aeb6b5bda732de 100644 (file)
--- a/src/os2/settings.cpp
+++ b/src/os2/settings.cpp
@@ -44,7 +44,6 @@ wxColour wxSystemSettings::GetSystemColour(
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );
-            return vCol;
             break;
 
         case wxSYS_COLOUR_WINDOWFRAME:
@@ -56,7 +55,6 @@ wxColour wxSystemSettings::GetSystemColour(
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );
-            return vCol;
             break;
 
         case wxSYS_COLOUR_MENUTEXT:
@@ -79,7 +77,6 @@ wxColour wxSystemSettings::GetSystemColour(
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );
-            return vCol;
             break;
 
         case wxSYS_COLOUR_BTNSHADOW:
@@ -91,7 +88,6 @@ wxColour wxSystemSettings::GetSystemColour(
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );
-            return vCol;
             break;
 
         case wxSYS_COLOUR_BTNHIGHLIGHT:
@@ -103,7 +99,6 @@ wxColour wxSystemSettings::GetSystemColour(
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );
-            return vCol;
             break;
 
         //
@@ -118,7 +113,7 @@ wxColour wxSystemSettings::GetSystemColour(
         case wxSYS_COLOUR_INACTIVECAPTIONTEXT:
         case wxSYS_COLOUR_BTNTEXT:
         case wxSYS_COLOUR_INFOTEXT:
-            return(*wxBLACK);
+            vCol = (*wxBLACK);
             break;
 
         //
@@ -128,7 +123,7 @@ wxColour wxSystemSettings::GetSystemColour(
         case wxSYS_COLOUR_ACTIVECAPTION:
         case wxSYS_COLOUR_ACTIVEBORDER:
         case wxSYS_COLOUR_HIGHLIGHT:
-            return(*wxBLUE);
+            vCol = (*wxBLUE);
             break;
 
         case wxSYS_COLOUR_SCROLLBAR:
@@ -142,7 +137,7 @@ wxColour wxSystemSettings::GetSystemColour(
         case wxSYS_COLOUR_3DDKSHADOW:
         case wxSYS_COLOUR_3DLIGHT:
         case wxSYS_COLOUR_INFOBK:
-            return(*wxLIGHT_GREY);
+            vCol = (*wxLIGHT_GREY);
             break;
 
         default:
@@ -154,7 +149,6 @@ wxColour wxSystemSettings::GetSystemColour(
                      ,GetGValue(vRef)
                      ,GetBValue(vRef)
                     );
-            return vCol;
             break;
     }
     return(vCol);
@@ -187,8 +181,10 @@ wxFont wxSystemSettings::GetSystemFont(int index)
             break;
         }
     }
+    if(wxSWISS_FONT)
+         return *wxSWISS_FONT;
 
-    return *wxSWISS_FONT;
+    return wxNullFont;
 }
 
 // Get a system metric, e.g. scrollbar size