eVC3 warning fix.

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

diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp
index 3b72e222511412d3f43eed3d71759794e675b255..b4436ce624703893b8b7516b92d475db9d9cbbc8 100644 (file)
--- a/src/msw/settings.cpp
+++ b/src/msw/settings.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -87,7 +87,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule)
 
 bool wxSystemSettingsModule::OnInit()
 {
 
 bool wxSystemSettingsModule::OnInit()
 {

-    return TRUE;
+    return true;

 }
 
 void wxSystemSettingsModule::OnExit()
 }
 
 void wxSystemSettingsModule::OnExit()


@@ -110,7 +110,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
     // is no invalid colour value we use hasCol as the real indicator of
     // whether colSys was initialized or not
     COLORREF colSys = 0;
     // is no invalid colour value we use hasCol as the real indicator of
     // whether colSys was initialized or not
     COLORREF colSys = 0;

-    bool hasCol = FALSE;
+    bool hasCol = false;

 
     // the default colours for the entries after BTNHIGHLIGHT
     static const COLORREF s_defaultSysColors[] =
 
     // the default colours for the entries after BTNHIGHLIGHT
     static const COLORREF s_defaultSysColors[] =


@@ -146,7 +146,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         if ( verMaj < 4 )
         {
             // NT 3.5
         if ( verMaj < 4 )
         {
             // NT 3.5

-            useDefault = TRUE;
+            useDefault = true;

         }
         else if ( verMaj == 4 )
         {
         }
         else if ( verMaj == 4 )
         {


@@ -161,17 +161,17 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
         else // >= 5.1
         {
             // 5.1 is Windows XP
         else // >= 5.1
         {
             // 5.1 is Windows XP

-            useDefault = FALSE;
-                       // Determine if we are using flat menus, only then allow wxSYS_COLOUR_MENUBAR
-                       if ( index == wxSYS_COLOUR_MENUBAR )
-                       {
-                               BOOL isFlat ;
-                               if ( SystemParametersInfo( SPI_GETFLATMENU , 0 ,&isFlat, 0 ) )
-                               {
-                                       if ( !isFlat )
-                                               index = wxSYS_COLOUR_MENU ;
-                               }
-                       }
+            useDefault = false;
+            // Determine if we are using flat menus, only then allow wxSYS_COLOUR_MENUBAR
+            if ( index == wxSYS_COLOUR_MENUBAR )
+            {
+                BOOL isFlat ;
+                if ( SystemParametersInfo( SPI_GETFLATMENU , 0 ,&isFlat, 0 ) )
+                {
+                    if ( !isFlat )
+                        index = wxSYS_COLOUR_MENU ;
+                }
+            }

        }
 
         if ( useDefault )
        }
 
         if ( useDefault )


@@ -192,7 +192,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index)
                               _T("forgot tp update the default colours array") );
 
                 colSys = s_defaultSysColors[n];
                               _T("forgot tp update the default colours array") );
 
                 colSys = s_defaultSysColors[n];

-                hasCol = TRUE;
+                hasCol = true;

             }
         }
     }
             }
         }
     }


@@ -260,7 +260,7 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
 
     return *gs_fontDefault;
 #else // !__WXWINCE__
 
     return *gs_fontDefault;
 #else // !__WXWINCE__

-    // wxWindow ctor calls GetSystemFont(wxSYS_DEFAULT_GUI_FONT) so we're
+    // wxWindow ctor calls GetFont(wxSYS_DEFAULT_GUI_FONT) so we're

     // called fairly often -- this is why we cache this particular font
     const bool isDefaultRequested = index == wxSYS_DEFAULT_GUI_FONT;
     if ( isDefaultRequested )
     // called fairly often -- this is why we cache this particular font
     const bool isDefaultRequested = index == wxSYS_DEFAULT_GUI_FONT;
     if ( isDefaultRequested )


@@ -390,7 +390,7 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
     if ( indexMSW == -1 )
     {
         // not supported under current system
     if ( indexMSW == -1 )
     {
         // not supported under current system

-        return 0;
+        return -1;

     }
 
     int rc = ::GetSystemMetrics(indexMSW);
     }
 
     int rc = ::GetSystemMetrics(indexMSW);


@@ -410,12 +410,12 @@ 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:
             wxFAIL_MSG( _T("unknown system feature") );
 
 
         default:
             wxFAIL_MSG( _T("unknown system feature") );
 

-            return FALSE;
+            return false;

     }
 }
 
     }
 }