Combine two wxImage-to-pixmap creation functions into one.

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

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 7f7cbe93c0126c60324526a6df8e60f0b8c905a1..6afd9e20062b1744a4bfb3ed96e89f72d6a067c9 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -12,23 +12,23 @@
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#include "wx/app.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/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"
 #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/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;