wxWindowDC now uses its window's font

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

diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp
index c41cb0234890647a46007c9f5f31a75a100f6e62..6e6365b3ea92c7c3d9e21b64566597d4d36cae9d 100644 (file)
--- a/src/gtk1/dcmemory.cpp
+++ b/src/gtk1/dcmemory.cpp
@@ -13,68 +13,71 @@
 
 #include "wx/dcmemory.h"
 
 
 #include "wx/dcmemory.h"
 

+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+

 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 

-wxMemoryDC::wxMemoryDC(void) : wxWindowDC()
+wxMemoryDC::wxMemoryDC() : wxWindowDC()

 {
 {

-  m_ok = FALSE;
+    m_ok = FALSE;

   
   

-  m_cmap = gtk_widget_get_default_colormap();
+    m_cmap = gtk_widget_get_default_colormap();

 }
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) ) 
   : wxWindowDC()
 {
 }
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) ) 
   : wxWindowDC()
 {

-  m_ok = FALSE;
+    m_ok = FALSE;

   
   

-  m_cmap = gtk_widget_get_default_colormap();
+    m_cmap = gtk_widget_get_default_colormap();

 }
 
 }
 

-wxMemoryDC::~wxMemoryDC(void)
+wxMemoryDC::~wxMemoryDC()

 {
 }
 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
 {
 }
 
 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
     }
     else

-    {
-      m_window = m_selected.GetBitmap();
+    { 
+        m_ok = FALSE;
+        m_window = (GdkWindow *) NULL;

     }
     }

-    
-    SetUpDC();
-    
-    m_isMemDC = TRUE;
-  }
-  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;
+    }

 }
 
 
 }