X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76b49cf49ba9ee9f3eeec9730cb4bc4569ab17f1..994453b843b007de6367fedbf4a49ac9d920c63c:/src/x11/app.cpp diff --git a/src/x11/app.cpp b/src/x11/app.cpp index 9bb8539733..e5dc6785da 100644 --- a/src/x11/app.cpp +++ b/src/x11/app.cpp @@ -20,15 +20,15 @@ #include "wx/log.h" #include "wx/utils.h" #include "wx/frame.h" + #include "wx/icon.h" + #include "wx/dialog.h" + #include "wx/timer.h" + #include "wx/memory.h" + #include "wx/gdicmn.h" + #include "wx/module.h" #endif -#include "wx/gdicmn.h" -#include "wx/icon.h" -#include "wx/dialog.h" -#include "wx/module.h" -#include "wx/memory.h" #include "wx/evtloop.h" -#include "wx/timer.h" #include "wx/filename.h" #include "wx/univ/theme.h" @@ -46,8 +46,6 @@ // global data //------------------------------------------------------------------------ -extern wxList wxPendingDelete; - wxWindowHash *wxWidgetHashTable = NULL; wxWindowHash *wxClientWidgetHashTable = NULL; @@ -670,10 +668,12 @@ void wxApp::WakeUpIdle() // Create display, and other initialization bool wxApp::OnInitGui() { +#if wxUSE_LOG // Eventually this line will be removed, but for // now we don't want to try popping up a dialog // for error messages. delete wxLog::SetActiveTarget(new wxLogStderr); +#endif if (!wxAppBase::OnInitGui()) return false;