Updated to new PyCrust

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

diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp
index c5ff7897f071442519568a6816b73cee32fda63c..bb061200c3f9d826c5407e080ce21f09511a8aea 100644 (file)
--- a/src/mgl/app.cpp
+++ b/src/mgl/app.cpp
@@ -31,6 +31,8 @@
 
 #include "wx/app.h"
 #include "wx/fontutil.h"
 
 #include "wx/app.h"
 #include "wx/fontutil.h"

+#include "wx/univ/theme.h"
+#include "wx/univ/renderer.h"

 #include "wx/mgl/private.h"
 
 #define MGL_DEBUG
 #include "wx/mgl/private.h"
 
 #define MGL_DEBUG


@@ -144,8 +146,6 @@ wxApp::~wxApp()
 
 bool wxApp::OnInitGui()
 {
 
 bool wxApp::OnInitGui()
 {

-    if ( MGL_init(".", NULL) == 0 )
-        return FALSE;

     if ( !wxCreateMGL_WM() )
         return FALSE;
 
     if ( !wxCreateMGL_WM() )
         return FALSE;
 


@@ -256,9 +256,7 @@ void wxApp::ExitMainLoop()
 
 bool wxApp::Initialized()
 {
 
 bool wxApp::Initialized()
 {

-    // FIXME_MGL -- only for now because we don't have wxFrame/wxDialog yet
-    return TRUE;
-    //return (wxTopLevelWindows.GetCount() != 0);
+    return (wxTopLevelWindows.GetCount() != 0);

 }
 
 bool wxApp::Pending()
 }
 
 bool wxApp::Pending()


@@ -289,6 +287,9 @@ void wxApp::DeletePendingObjects()
 
 bool wxApp::Initialize()
 {
 
 bool wxApp::Initialize()
 {

+    if ( MGL_init(".", NULL) == 0 )
+        return FALSE;
+

     wxBuffer = new wxChar[BUFSIZ + 512];
 
     wxClassInfo::InitializeClasses();
     wxBuffer = new wxChar[BUFSIZ + 512];
 
     wxClassInfo::InitializeClasses();


@@ -325,27 +326,9 @@ bool wxApp::Initialize()
     return TRUE;
 }
 
     return TRUE;
 }
 

-#include "info.xpm"
-#include "error.xpm"
-#include "question.xpm"
-#include "warning.xpm"
-

 wxIcon wxApp::GetStdIcon(int which) const
 {
 wxIcon wxApp::GetStdIcon(int which) const
 {

-    switch(which)
-    {
-        case wxICON_INFORMATION:
-            return wxIcon(info_xpm);
-        case wxICON_QUESTION:
-            return wxIcon(question_xpm);
-        case wxICON_EXCLAMATION:
-            return wxIcon(warning_xpm);
-        default:
-            wxFAIL_MSG(wxT("requested non existent standard icon"));
-            // still fall through
-        case wxICON_HAND:
-            return wxIcon(error_xpm);
-    }
+    return wxTheme::Get()->GetRenderer()->GetStdIcon(which);

 }
 
 void wxApp::CleanUp()
 }
 
 void wxApp::CleanUp()