Version 0.4 of wxPython for MSW.

[wxWidgets.git] / src / gtk1 / dcmemory.cpp

diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp
index 66c5549f5278feb1f698e28a1a870bb7f775032c..84a6e144e70bfb92379361cd8c31a3c86a0b57f2 100644 (file)
--- a/src/gtk1/dcmemory.cpp
+++ b/src/gtk1/dcmemory.cpp
@@ -14,6 +14,10 @@
 
 #include "wx/dcmemory.h"
 
+#ifdef wxUSE_GDK_IMLIB
+#include "../gdk_imlib/gdk_imlib.h"
+#endif
+
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
@@ -23,18 +27,28 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
 wxMemoryDC::wxMemoryDC(void)
 {
   m_ok = FALSE;
+  
+#ifdef wxUSE_GDK_IMLIB
+  m_cmap = gdk_imlib_get_colormap();
+#else
   m_cmap = gdk_colormap_get_system();
-};
+#endif
+}
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
 {
   m_ok = FALSE;
+  
+#ifdef wxUSE_GDK_IMLIB
+  m_cmap = gdk_imlib_get_colormap();
+#else
   m_cmap = gdk_colormap_get_system();
-};
+#endif
+}
 
 wxMemoryDC::~wxMemoryDC(void)
 {
-};
+}
 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
@@ -57,9 +71,9 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
   else
   {
     m_ok = FALSE;
-    m_window = NULL;
-  };
-};
+    m_window = (GdkWindow *) NULL;
+  }
+}
 
 void wxMemoryDC::GetSize( int *width, int *height ) const
 {
@@ -72,7 +86,7 @@ void wxMemoryDC::GetSize( int *width, int *height ) const
   {
     if (width) (*width) = 0;
     if (height) (*height) = 0;
-  };
-};
+  }
+}