Derive wxWebViewEvent from wxNotifyEvent.

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

diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index eaa8a042564a6610911a152dfafb7453ca3e8309..753d2df7f6641250f057f94a354183f54bb9ac1b 100644 (file)
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -120,8 +120,7 @@ static bool wxCreateMGL_WM(const wxVideoMode& displayMode)
     g_displayDC = new MGLDisplayDC(mode, 1, refresh);
     if ( !g_displayDC->isValid() )
     {
     g_displayDC = new MGLDisplayDC(mode, 1, refresh);
     if ( !g_displayDC->isValid() )
     {

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

         return false;
     }
 
         return false;
     }
 


@@ -139,11 +138,7 @@ static void wxDestroyMGL_WM()
         MGL_wmDestroy(g_winMng);
         g_winMng = NULL;
     }
         MGL_wmDestroy(g_winMng);
         g_winMng = NULL;
     }

-    if ( g_displayDC )
-    {
-        delete g_displayDC;
-        g_displayDC = NULL;
-    }
+    wxDELETE(g_displayDC);

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -166,7 +161,7 @@ wxVideoMode wxGetDefaultDisplayMode()
     unsigned w, h, bpp;
 
     if ( !wxGetEnv(wxT("WXMODE"), &mode) ||
     unsigned w, h, bpp;
 
     if ( !wxGetEnv(wxT("WXMODE"), &mode) ||

-         (wxSscanf(mode.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3) )
+         (wxSscanf(mode.c_str(), wxT("%ux%u-%u"), &w, &h, &bpp) != 3) )

     {
         w = 640, h = 480, bpp = 16;
     }
     {
         w = 640, h = 480, bpp = 16;
     }


@@ -202,13 +197,12 @@ bool wxApp::OnInitGui()
     if ( !wxAppBase::OnInitGui() )
         return false;
 
     if ( !wxAppBase::OnInitGui() )
         return false;
 

-#ifdef __WXDEBUG__
-    // MGL redirects stdout and stderr to physical console, so lets redirect
-    // it to file in debug build. Do it only when WXSTDERR environment variable is set
+    // MGL redirects stdout and stderr to physical console, so let's redirect
+    // it to file if WXSTDERR environment variable is set to be able to see
+    // wxLogDebug() output

     wxString redirect;
     if ( wxGetEnv(wxT("WXSTDERR"), &redirect) )
         freopen(redirect.mb_str(), "wt", stderr);
     wxString redirect;
     if ( wxGetEnv(wxT("WXSTDERR"), &redirect) )
         freopen(redirect.mb_str(), "wt", stderr);

-#endif // __WXDEBUG__

 
     wxLog *oldLog = wxLog::SetActiveTarget(new wxLogGui);
     if ( oldLog ) delete oldLog;
 
     wxLog *oldLog = wxLog::SetActiveTarget(new wxLogGui);
     if ( oldLog ) delete oldLog;