X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f65e33794fca0c936227235515a40e7df5c56e3..ec45f8ee19190fce57180381611075d3a5b63435:/src/gtk/dcmemory.cpp

diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp
index e947cd2ca7..84a6e144e7 100644
--- a/src/gtk/dcmemory.cpp
+++ b/src/gtk/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 )
 {
@@ -51,15 +65,17 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
     }
     
     SetUpDC();
+    
+    m_isDrawable = FALSE;
   }
   else
   {
     m_ok = FALSE;
-    m_window = NULL;
-  };
-};
+    m_window = (GdkWindow *) NULL;
+  }
+}
 
-void wxMemoryDC::GetSize( int *width, int *height )
+void wxMemoryDC::GetSize( int *width, int *height ) const
 {
   if (m_selected.Ok())
   {
@@ -70,7 +86,7 @@ void wxMemoryDC::GetSize( int *width, int *height )
   {
     if (width) (*width) = 0;
     if (height) (*height) = 0;
-  };
-};
+  }
+}