Final tweaks for 2.1b1

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

diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp
index 5a6e982f9ef7e46a03bd7c81d216f4fd79efbb6a..6e6365b3ea92c7c3d9e21b64566597d4d36cae9d 100644 (file)
--- 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,65 +13,71 @@
 
 #include "wx/dcmemory.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
+IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 
-wxMemoryDC::wxMemoryDC(void)
+wxMemoryDC::wxMemoryDC() : wxWindowDC()
 {
-  m_ok = FALSE;
-  m_cmap = gdk_colormap_get_system();
+    m_ok = FALSE;
+  
+    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_ok = FALSE;
+  
+    m_cmap = gtk_widget_get_default_colormap();
 }
 
-wxMemoryDC::~wxMemoryDC(void)
+wxMemoryDC::~wxMemoryDC()
 {
 }
 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
-  m_selected = bitmap;
-  if (m_selected.Ok())
-  {
-    if (m_selected.GetPixmap())
+    m_selected = bitmap;
+    if (m_selected.Ok())
     {
-      m_window = m_selected.GetPixmap();
+        if (m_selected.GetPixmap())
+        {
+            m_window = m_selected.GetPixmap();
+        }
+        else
+        {
+            m_window = m_selected.GetBitmap();
+        }
+    
+        SetUpDC();
+    
+        m_isMemDC = TRUE;
     }
     else
-    {
-      m_window = m_selected.GetBitmap();
+    { 
+        m_ok = FALSE;
+        m_window = (GdkWindow *) NULL;
     }
-    
-    SetUpDC();
-    
-    m_isDrawable = FALSE;
-  }
-  else
-  {
-    m_ok = FALSE;
-    m_window = (GdkWindow *) NULL;
-  }
 }
 
-void wxMemoryDC::GetSize( int *width, int *height ) const
+void wxMemoryDC::DoGetSize( int *width, int *height ) const
 {
-  if (m_selected.Ok())
-  {
-    if (width) (*width) = m_selected.GetWidth();
-    if (height) (*height) = m_selected.GetHeight();
-  }
-  else
-  {
-    if (width) (*width) = 0;
-    if (height) (*height) = 0;
-  }
+    if (m_selected.Ok())
+    {
+        if (width) (*width) = m_selected.GetWidth();
+        if (height) (*height) = m_selected.GetHeight();
+    }
+    else
+    {
+        if (width) (*width) = 0;
+        if (height) (*height) = 0;
+    }
 }