wxSize/wxPoint/wxRect versions of functions added to wxMSW, wxMotif;

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

diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp
index 78de378ed0d19d31725dba493c9e34aec5de43aa..66f8772b980b1779cd5278a03faa7100936ff6d8 100644 (file)
--- a/src/gtk/dcmemory.cpp
+++ b/src/gtk/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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -20,16 +19,18 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
 
-wxMemoryDC::wxMemoryDC(void)
+wxMemoryDC::wxMemoryDC(void) : wxPaintDC()
 {
   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) ) : wxPaintDC()
 {
   m_ok = FALSE;
-  m_cmap = gdk_colormap_get_system();
+  
+  m_cmap = gtk_widget_get_default_colormap();
 }
 
 wxMemoryDC::~wxMemoryDC(void)
@@ -52,12 +53,12 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
     
     SetUpDC();
     
-    m_isDrawable = FALSE;
+    m_isMemDC = TRUE;
   }
   else
   {
     m_ok = FALSE;
-    m_window = NULL;
+    m_window = (GdkWindow *) NULL;
   }
 }