Added back compile-time check for about/prefs menu separator; OS 9 should not have...

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

diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp
index e996334c006bd00330c97b8d7bc15be51b16e2a7..a3ac365287797b80972362e05d9bf963a554e360 100644 (file)
--- a/src/gtk1/dcmemory.cpp
+++ b/src/gtk1/dcmemory.cpp
@@ -4,15 +4,21 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "dcmemory.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/dcmemory.h"
 
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
@@ -22,16 +28,28 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 wxMemoryDC::wxMemoryDC() : wxWindowDC()
 {
     m_ok = FALSE;
-  
+
     m_cmap = gtk_widget_get_default_colormap();
+    
+#ifdef __WXGTK20__
+    m_context = gdk_pango_context_get();
+    m_layout = pango_layout_new( m_context );
+    m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );
+#endif
 }
 
-wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) ) 
+wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
   : wxWindowDC()
 {
     m_ok = FALSE;
-  
+
     m_cmap = gtk_widget_get_default_colormap();
+    
+#ifdef __WXGTK20__
+    m_context = gdk_pango_context_get();
+    m_layout = pango_layout_new( m_context );
+    m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );
+#endif
 }
 
 wxMemoryDC::~wxMemoryDC()
@@ -40,6 +58,7 @@ wxMemoryDC::~wxMemoryDC()
 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
+    Destroy();
     m_selected = bitmap;
     if (m_selected.Ok())
     {
@@ -51,19 +70,87 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
         {
             m_window = m_selected.GetBitmap();
         }
-    
-        SetUpDC();
-    
+
+#ifdef __WXGTK20__
+        m_selected.PurgeOtherRepresentations(wxBitmap::Pixmap);
+#endif
+
         m_isMemDC = TRUE;
+
+        SetUpDC();
     }
     else
-    { 
+    {
         m_ok = FALSE;
         m_window = (GdkWindow *) NULL;
     }
 }
 
-void wxMemoryDC::GetSize( int *width, int *height ) const
+void wxMemoryDC::SetPen( const wxPen& penOrig )
+{
+    wxPen pen( penOrig );
+    if ( m_selected.Ok() &&
+            m_selected.GetBitmap() &&
+                (pen != *wxTRANSPARENT_PEN) )
+    {
+        pen.SetColour( pen.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
+    }
+
+    wxWindowDC::SetPen( pen );
+}
+
+void wxMemoryDC::SetBrush( const wxBrush& brushOrig )
+{
+    wxBrush brush( brushOrig );
+    if ( m_selected.Ok() &&
+            m_selected.GetBitmap() &&
+                (brush != *wxTRANSPARENT_BRUSH) )
+    {
+        brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE);
+    }
+
+    wxWindowDC::SetBrush( brush );
+}
+
+void wxMemoryDC::SetBackground( const wxBrush& brushOrig ) 
+{
+    wxBrush brush(brushOrig);
+
+    if ( m_selected.Ok() &&
+            m_selected.GetBitmap() &&
+                (brush != *wxTRANSPARENT_BRUSH) )
+    {
+        brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
+    }
+
+    wxWindowDC::SetBackground( brush );
+}
+
+void wxMemoryDC::SetTextForeground( const wxColour& col )
+{
+    if ( m_selected.Ok() && m_selected.GetBitmap() )
+    {
+        wxWindowDC::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE);
+    }
+    else
+    {
+        wxWindowDC::SetTextForeground( col );
+    }
+}
+
+void wxMemoryDC::SetTextBackground( const wxColour &col )
+{
+    if (m_selected.Ok() && m_selected.GetBitmap())
+    {
+        wxWindowDC::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE );
+    }
+    else
+    {
+        wxWindowDC::SetTextBackground( col );
+    }
+}
+
+void wxMemoryDC::DoGetSize( int *width, int *height ) const
 {
     if (m_selected.Ok())
     {