Derive wxWebViewEvent from wxNotifyEvent.

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

diff --git a/src/mgl/settings.cpp b/src/mgl/settings.cpp
index 93224a6c295b4a39777d213084a44708e6489362..107eb14b12d7be41e2a6dc608cc8903c190b9ef1 100644 (file)
--- a/src/mgl/settings.cpp
+++ b/src/mgl/settings.cpp
@@ -34,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:


@@ -91,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:
         {
         }


@@ -112,7 +108,7 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
             return false;
 
         default:
             return false;
 
         default:

-            wxFAIL_MSG( _T("unknown feature") );
+            wxFAIL_MSG( wxT("unknown feature") );

     }
 
     return false;
     }
 
     return false;