fixing osx_carbon

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

diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp
index c051f96414a38b0726b26f5e9fd6c22866312ff3..107eb14b12d7be41e2a6dc608cc8903c190b9ef1 100644 (file)
--- a/src/mgl/settings.cpp
+++ b/src/mgl/settings.cpp
@@ -18,11 +18,10 @@
 #ifndef WX_PRECOMP
     #include "wx/colour.h"
     #include "wx/font.h"
 #ifndef WX_PRECOMP
     #include "wx/colour.h"
     #include "wx/font.h"

+    #include "wx/gdicmn.h"
+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/gdicmn.h"
-#include "wx/module.h"
-

 // ----------------------------------------------------------------------------
 // global data
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // global data
 // ----------------------------------------------------------------------------


@@ -35,8 +34,7 @@ public:
     virtual bool OnInit() { return true; }
     virtual void OnExit()
     {
     virtual bool OnInit() { return true; }
     virtual void OnExit()
     {

-        delete gs_fontDefault;
-        gs_fontDefault = NULL;
+        wxDELETE(gs_fontDefault);

     }
 
 private:
     }
 
 private:


@@ -49,7 +47,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxSystemSettingsModule, wxModule)
 
 wxColour wxSystemSettingsNative::GetColour(wxSystemColour WXUNUSED(index))
 {
 
 wxColour wxSystemSettingsNative::GetColour(wxSystemColour WXUNUSED(index))
 {

-    // not implemented, the mean is in wxUniversal
+    // overridden by wxSystemSettings::GetColour in wxUniversal

     return wxColour(0,0,0);
 }
 
     return wxColour(0,0,0);
 }
 


@@ -92,9 +90,6 @@ int wxSystemSettingsNative::GetMetric(wxSystemMetric index, wxWindow* WXUNUSED(w
         case wxSYS_SCREEN_Y:
             wxDisplaySize(NULL, &val);
             return val;
         case wxSYS_SCREEN_Y:
             wxDisplaySize(NULL, &val);
             return val;

-        case wxSYS_VSCROLL_X:
-        case wxSYS_HSCROLL_Y:
-            return 15;

         default:
         {
         }
         default:
         {
         }


@@ -108,12 +103,12 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
     switch (index)
     {
         case wxSYS_CAN_ICONIZE_FRAME:
     switch (index)
     {
         case wxSYS_CAN_ICONIZE_FRAME:

-            return false;

         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:

+        case wxSYS_TABLET_PRESENT:

             return false;
             return false;

+

         default:
         default:

-        {
-        }
+            wxFAIL_MSG( wxT("unknown feature") );

     }
 
     return false;
     }
 
     return false;