X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47d67540a017101b3e46abe9ef0f55914d8de37e..a5e13868ca700aa39bae26b8fb13c640f466d9f0:/src/gtk1/dcmemory.cpp?ds=sidebyside

diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp
index 84a6e144e7..f346200a81 100644
--- a/src/gtk1/dcmemory.cpp
+++ b/src/gtk1/dcmemory.cpp
@@ -2,9 +2,8 @@
 // Name:        dcmemory.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -14,10 +13,6 @@
 
 #include "wx/dcmemory.h"
 
-#ifdef wxUSE_GDK_IMLIB
-#include "../gdk_imlib/gdk_imlib.h"
-#endif
-
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
@@ -28,22 +23,14 @@ wxMemoryDC::wxMemoryDC(void)
 {
   m_ok = FALSE;
   
-#ifdef wxUSE_GDK_IMLIB
-  m_cmap = gdk_imlib_get_colormap();
-#else
-  m_cmap = gdk_colormap_get_system();
-#endif
+  m_cmap = gtk_widget_get_default_colormap();
 }
 
 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
+  m_cmap = gtk_widget_get_default_colormap();
 }
 
 wxMemoryDC::~wxMemoryDC(void)
@@ -66,7 +53,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
     
     SetUpDC();
     
-    m_isDrawable = FALSE;
+    m_isMemDC = TRUE;
   }
   else
   {