X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d1dff0172e94487c4aa2d830c714f93be73c7ec..e7300ec6d9ebbd1cfa2fcf12c0ce6e5aee85a152:/src/gtk/app.cpp?ds=sidebyside diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp index b25fce3b1c..43d42a540f 100644 --- a/src/gtk/app.cpp +++ b/src/gtk/app.cpp @@ -501,8 +501,6 @@ bool wxApp::SendIdleEvents( wxWindow* win ) win->GetEventHandler()->ProcessEvent(event); - win->OnInternalIdle(); - if (event.MoreRequested()) needMore = TRUE; @@ -516,6 +514,8 @@ bool wxApp::SendIdleEvents( wxWindow* win ) node = node->Next(); } + win->OnInternalIdle(); + return needMore; } @@ -564,8 +564,6 @@ void wxApp::DeletePendingObjects() bool wxApp::Initialize() { - wxBuffer = new wxChar[BUFSIZ + 512]; - wxClassInfo::InitializeClasses(); #if wxUSE_INTL @@ -613,9 +611,6 @@ void wxApp::CleanUp() delete wxTheApp; wxTheApp = (wxApp*) NULL; - delete[] wxBuffer; - wxBuffer = NULL; - wxClassInfo::CleanUpClasses(); #if wxUSE_THREADS @@ -826,47 +821,6 @@ int wxEntry( int argc, char *argv[] ) return retValue; } -#ifndef __WXUNIVERSAL__ - -// XPM hack: make the arrays const -#define static static const - -#include "wx/gtk/info.xpm" -#include "wx/gtk/error.xpm" -#include "wx/gtk/question.xpm" -#include "wx/gtk/warning.xpm" - -#undef static - -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); - } -} -#else -wxIcon wxApp::GetStdIcon(int which) const -{ - return wxTheme::Get()->GetRenderer()->GetStdIcon(which); -} -#endif // !__WXUNIVERSAL__ - - #ifdef __WXDEBUG__ void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)