X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0180d5daae8187ca9d938a1aa07e54ac16a12d1a..7b678698047ca224e98952b5a5bd81f650becc51:/src/gtk1/dcmemory.cpp

diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp
index 66c5549f52..c41cb02348 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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -18,23 +17,26 @@
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
+IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 
-wxMemoryDC::wxMemoryDC(void)
+wxMemoryDC::wxMemoryDC(void) : wxWindowDC()
 {
   m_ok = FALSE;
-  m_cmap = gdk_colormap_get_system();
-};
+  
+  m_cmap = gtk_widget_get_default_colormap();
+}
 
-wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
+wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) ) 
+  : wxWindowDC()
 {
   m_ok = FALSE;
-  m_cmap = gdk_colormap_get_system();
-};
+  
+  m_cmap = gtk_widget_get_default_colormap();
+}
 
 wxMemoryDC::~wxMemoryDC(void)
 {
-};
+}
 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
@@ -52,14 +54,14 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
     
     SetUpDC();
     
-    m_isDrawable = FALSE;
+    m_isMemDC = TRUE;
   }
   else
   {
     m_ok = FALSE;
-    m_window = NULL;
-  };
-};
+    m_window = (GdkWindow *) NULL;
+  }
+}
 
 void wxMemoryDC::GetSize( int *width, int *height ) const
 {
@@ -72,7 +74,7 @@ void wxMemoryDC::GetSize( int *width, int *height ) const
   {
     if (width) (*width) = 0;
     if (height) (*height) = 0;
-  };
-};
+  }
+}