better <HR> tag handling in wxHTML

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

diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index 164860cf2a581a3582b38d015ee869ad3ccabf30..77a30f02201f2d299e1db977e8c0ff7709fb2039 100644 (file)
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -27,6 +27,7 @@
     #include "wx/dialog.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/dialog.h"
     #include "wx/log.h"
     #include "wx/intl.h"

+    #include "wx/resource.h"

 #endif
 
 #include "wx/app.h"
 #endif
 
 #include "wx/app.h"


@@ -170,11 +171,11 @@ static bool wxCreateMGL_WM(const wxDisplayModeInfo& displayMode)
                         displayMode.GetDepth());
     if ( mode == -1 )
     {
                         displayMode.GetDepth());
     if ( mode == -1 )
     {

-        wxLogWarning(_("Mode %ix%i-%i not available, falling back to default mode."), 
+        wxLogError(_("Mode %ix%i-%i not available."), 

                      displayMode.GetScreenSize().x, 
                      displayMode.GetScreenSize().y, 
                      displayMode.GetDepth());
                      displayMode.GetScreenSize().x, 
                      displayMode.GetScreenSize().y, 
                      displayMode.GetDepth());

-        mode = 0; // always available
+        return FALSE;

     }
     g_displayDC = new MGLDisplayDC(mode, 1, refresh);
     if ( !g_displayDC->isValid() )
     }
     g_displayDC = new MGLDisplayDC(mode, 1, refresh);
     if ( !g_displayDC->isValid() )


@@ -187,7 +188,7 @@ static bool wxCreateMGL_WM(const wxDisplayModeInfo& displayMode)
     g_winMng = MGL_wmCreate(g_displayDC->getDC());
     if (!g_winMng)
         return FALSE;
     g_winMng = MGL_wmCreate(g_displayDC->getDC());
     if (!g_winMng)
         return FALSE;

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -218,7 +219,6 @@ END_EVENT_TABLE()
 
 wxApp::wxApp() : m_mainLoop(NULL)
 {
 
 wxApp::wxApp() : m_mainLoop(NULL)
 {

-    m_displayMode = wxDisplayModeInfo(wxSize(640, 480), 16);

 }
 
 wxApp::~wxApp()
 }
 
 wxApp::~wxApp()


@@ -234,26 +234,24 @@ bool wxApp::SetDisplayMode(const wxDisplayModeInfo& mode)
     if ( g_displayDC != NULL )
     {
         // FIXME_MGL -- we currently don't allow to switch video mode
     if ( g_displayDC != NULL )
     {
         // FIXME_MGL -- we currently don't allow to switch video mode

-        // at runtime. This can hopefully be changed...
+        // more than once. This can hopefully be changed...

         wxFAIL_MSG(wxT("Can't change display mode after intialization!"));
         return FALSE;
     }
         wxFAIL_MSG(wxT("Can't change display mode after intialization!"));
         return FALSE;
     }

+
+    if ( !wxCreateMGL_WM(mode) )
+        return FALSE;
+    gs_rootWindow = new wxRootWindow;
+

     m_displayMode = mode;
     m_displayMode = mode;

+

     return TRUE;
 }
 
 bool wxApp::OnInitGui()
 {
     return TRUE;
 }
 
 bool wxApp::OnInitGui()
 {

-    if ( !wxCreateMGL_WM(m_displayMode) )
-        return FALSE;
-
-    // This has to be done *after* wxCreateMGL_WM() because it initializes 
-    // wxUniv's themes

     if ( !wxAppBase::OnInitGui() )
         return FALSE;
     if ( !wxAppBase::OnInitGui() )
         return FALSE;

-        
-    // ...and this has to be done after wxUniv themes were initialized
-    gs_rootWindow = new wxRootWindow;

 
 #ifdef MGL_DEBUG
     // That damn MGL redirects stdin and stdout to physical console
 
 #ifdef MGL_DEBUG
     // That damn MGL redirects stdin and stdout to physical console