Fix XPM decoder for images using color (1,0,0) and also using a mask.

[wxWidgets.git] / src / common / dcbase.cpp

diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index 623ff0bc61c8c8a4544986c03d6c08c4499db694..6d16b4706fca63f188f09e69ec1d3ec5668ef590 100644 (file)
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -42,10 +42,14 @@
     #include "wx/msw/dcscreen.h"
 #endif
 
-#ifdef __WXGTK__
+#ifdef __WXGTK20__
     #include "wx/gtk/dcclient.h"
     #include "wx/gtk/dcmemory.h"
     #include "wx/gtk/dcscreen.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/dcclient.h"
+    #include "wx/gtk1/dcmemory.h"
+    #include "wx/gtk1/dcscreen.h"
 #endif
 
 #ifdef __WXMAC__
@@ -78,6 +82,12 @@
     #include "wx/dfb/dcscreen.h"
 #endif
 
+#ifdef __WXPALMOS__
+    #include "wx/palmos/dcclient.h"
+    #include "wx/palmos/dcmemory.h"
+    #include "wx/palmos/dcscreen.h"
+#endif
+
 //----------------------------------------------------------------------------
 // wxDCFactory
 //----------------------------------------------------------------------------