use wxWindow::NewControlId() instead of wxNewId() to avoid clashes with user-defined...

[wxWidgets.git] / src / palmos / gdiimage.cpp

diff --git a/src/palmos/gdiimage.cpp b/src/palmos/gdiimage.cpp
index ac1b03e9b908b85e03cf326001dc31b63257b3a0..8175ecdcca4b2094d0a019a72f27b1824976e7e3 100644 (file)
--- a/src/palmos/gdiimage.cpp
+++ b/src/palmos/gdiimage.cpp
@@ -27,11 +27,10 @@
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/log.h"

+    #include "wx/app.h"
+    #include "wx/bitmap.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#include "wx/app.h"
-
-#include "wx/bitmap.h"

 #include "wx/palmos/gdiimage.h"
 
 #if wxUSE_WXDIB
 #include "wx/palmos/gdiimage.h"
 
 #if wxUSE_WXDIB


@@ -41,7 +40,7 @@
 #include "wx/file.h"
 
 #include "wx/listimpl.cpp"
 #include "wx/file.h"
 
 #include "wx/listimpl.cpp"

-WX_DEFINE_LIST(wxGDIImageHandlerList);
+WX_DEFINE_LIST(wxGDIImageHandlerList)

 
 // ----------------------------------------------------------------------------
 // auxiliary functions
 
 // ----------------------------------------------------------------------------
 // auxiliary functions


@@ -111,5 +110,3 @@ void wxGDIImage::CleanUpHandlers()
 void wxGDIImage::InitStandardHandlers()
 {
 }
 void wxGDIImage::InitStandardHandlers()
 {
 }

-
-