mask fixes for non-core graphics case (this build uses CopyDeepMask for painting...

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

diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp
index 76868a7369355bdec0401de67e25b837be9c1abe..060e5bf51aa0afd13d3b85622e95763505ddfcbc 100644 (file)
--- a/src/mgl/settings.cpp
+++ b/src/mgl/settings.cpp
@@ -1,16 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        settings.h
+// Name:        src/mgl/settings.cpp

 // Author:      Vaclav Slavik, Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Author:      Vaclav Slavik, Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "settings.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -33,7 +28,7 @@ static wxFont *gs_fontDefault = NULL;
 class wxSystemSettingsModule : public wxModule
 {
 public:
 class wxSystemSettingsModule : public wxModule
 {
 public:

-    virtual bool OnInit() { return TRUE; }
+    virtual bool OnInit() { return true; }

     virtual void OnExit()
     {
         delete gs_fontDefault;
     virtual void OnExit()
     {
         delete gs_fontDefault;


@@ -70,18 +65,18 @@ wxFont wxSystemSettingsNative::GetFont(wxSystemFont index)
         case wxSYS_DEFAULT_GUI_FONT:
         {
             if ( !gs_fontDefault )
         case wxSYS_DEFAULT_GUI_FONT:
         {
             if ( !gs_fontDefault )

-                gs_fontDefault = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL, FALSE, "Arial");
+                gs_fontDefault = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL, false, "Arial");

             return *gs_fontDefault;
         }
             return *gs_fontDefault;
         }

-        default:
-            return wxNullFont;

     }
     }

+
+    return wxNullFont;

 }
 
 }
 

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

 {
     int val;
 {
     int val;

-    
+

     switch (index)
     {
         case wxSYS_SCREEN_X:
     switch (index)
     {
         case wxSYS_SCREEN_X:


@@ -92,23 +87,21 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index)
             return val;
         case wxSYS_VSCROLL_X:
         case wxSYS_HSCROLL_Y:
             return val;
         case wxSYS_VSCROLL_X:
         case wxSYS_HSCROLL_Y:

-            return 15; 
-            break;
-        default:
-            wxCHECK_MSG(index, 0, wxT("wxSystemSettings::GetMetric not fully implemented"));
-            return 0;
+            return 15;

     }
     }

+
+    return -1;  // unsupported metric

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

-        case wxSYS_CAN_ICONIZE_FRAME: 
-            return FALSE; break;
+        case wxSYS_CAN_ICONIZE_FRAME:
+            return false;

         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:

-            return FALSE; break;
-        default:
-            return FALSE;
+            return false;

     }
     }

+
+    return false;

 }
 }