added wxSplitFile() to decompose a file name into path + name + ext

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

diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp
index 804ba3e3a382163af794e76ac6bfe92f81726ebd..66c5549f5278feb1f698e28a1a870bb7f775032c 100644 (file)
--- a/src/gtk/dcmemory.cpp
+++ b/src/gtk/dcmemory.cpp
@@ -3,7 +3,7 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
-// Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -41,8 +41,18 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
   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_isDrawable = FALSE;
   }
   else
   {
@@ -51,7 +61,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
   };
 };
 
-void wxMemoryDC::GetSize( int *width, int *height )
+void wxMemoryDC::GetSize( int *width, int *height ) const
 {
   if (m_selected.Ok())
   {