X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ec3892d77c643be28516d34b0440decc0565c33..2fe212b0336512aac9eace69fab09ce856b0bf4b:/src/mgl/app.cpp?ds=sidebyside diff --git a/src/mgl/app.cpp b/src/mgl/app.cpp index c5ff7897f0..bb061200c3 100644 --- a/src/mgl/app.cpp +++ b/src/mgl/app.cpp @@ -31,6 +31,8 @@ #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 @@ -144,8 +146,6 @@ wxApp::~wxApp() bool wxApp::OnInitGui() { - if ( MGL_init(".", NULL) == 0 ) - return FALSE; if ( !wxCreateMGL_WM() ) return FALSE; @@ -256,9 +256,7 @@ void wxApp::ExitMainLoop() 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() @@ -289,6 +287,9 @@ void wxApp::DeletePendingObjects() bool wxApp::Initialize() { + if ( MGL_init(".", NULL) == 0 ) + return FALSE; + wxBuffer = new wxChar[BUFSIZ + 512]; wxClassInfo::InitializeClasses(); @@ -325,27 +326,9 @@ bool wxApp::Initialize() return TRUE; } -#include "info.xpm" -#include "error.xpm" -#include "question.xpm" -#include "warning.xpm" - 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()