X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aedeab233f282a928668f791d36ef6e24ed5dddb..f8a139493553049e0b92db4bbee11deb33093ee3:/src/x11/app.cpp diff --git a/src/x11/app.cpp b/src/x11/app.cpp index 86d6447c63..6afd9e2006 100644 --- a/src/x11/app.cpp +++ b/src/x11/app.cpp @@ -12,21 +12,24 @@ // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/frame.h" #include "wx/app.h" -#include "wx/utils.h" -#include "wx/gdicmn.h" -#include "wx/icon.h" -#include "wx/dialog.h" -#include "wx/log.h" + +#ifndef WX_PRECOMP + #include "wx/hash.h" + #include "wx/intl.h" + #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" +#endif + #include "wx/module.h" -#include "wx/memory.h" -#include "wx/log.h" -#include "wx/intl.h" #include "wx/evtloop.h" -#include "wx/timer.h" #include "wx/filename.h" -#include "wx/hash.h" #include "wx/univ/theme.h" #include "wx/univ/renderer.h" @@ -43,8 +46,6 @@ // global data //------------------------------------------------------------------------ -extern wxList wxPendingDelete; - wxWindowHash *wxWidgetHashTable = NULL; wxWindowHash *wxClientWidgetHashTable = NULL; @@ -667,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;