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 a63e55214fee12445624b850885a1326edefb354..6afd9e20062b1744a4bfb3ed96e89f72d6a067c9 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -23,11 +23,11 @@
     #include "wx/icon.h"
     #include "wx/dialog.h"
     #include "wx/timer.h"
     #include "wx/icon.h"
     #include "wx/dialog.h"
     #include "wx/timer.h"

+    #include "wx/memory.h"
+    #include "wx/gdicmn.h"

 #endif
 
 #endif
 

-#include "wx/gdicmn.h"

 #include "wx/module.h"
 #include "wx/module.h"

-#include "wx/memory.h"

 #include "wx/evtloop.h"
 #include "wx/filename.h"
 
 #include "wx/evtloop.h"
 #include "wx/filename.h"
 


@@ -46,8 +46,6 @@
 //   global data
 //------------------------------------------------------------------------
 
 //   global data
 //------------------------------------------------------------------------
 

-extern wxList wxPendingDelete;
-

 wxWindowHash *wxWidgetHashTable = NULL;
 wxWindowHash *wxClientWidgetHashTable = NULL;
 
 wxWindowHash *wxWidgetHashTable = NULL;
 wxWindowHash *wxClientWidgetHashTable = NULL;
 


@@ -670,10 +668,12 @@ void wxApp::WakeUpIdle()
 // Create display, and other initialization
 bool wxApp::OnInitGui()
 {
 // 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);
     // 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;
 
     if (!wxAppBase::OnInitGui())
         return false;