X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e4ea166d76da40eaa5fdcf9e958d93521f72fba..f46ad98f0df1e1b073a484cb34a91e2e1278fdb7:/src/gtk1/dcmemory.cpp

diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp
index 6e6365b3ea..713e58e881 100644
--- a/src/gtk1/dcmemory.cpp
+++ b/src/gtk1/dcmemory.cpp
@@ -1,20 +1,19 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcmemory.cpp
+// Name:        src/gtk1/dcmemory.cpp
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#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"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // wxMemoryDC
@@ -24,17 +23,18 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 
 wxMemoryDC::wxMemoryDC() : wxWindowDC()
 {
-    m_ok = FALSE;
-  
+    m_ok = false;
+
     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();
+
 }
 
 wxMemoryDC::~wxMemoryDC()
@@ -43,6 +43,7 @@ wxMemoryDC::~wxMemoryDC()
 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
+    Destroy();
     m_selected = bitmap;
     if (m_selected.Ok())
     {
@@ -54,18 +55,82 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
         {
             m_window = m_selected.GetBitmap();
         }
-    
+
+        m_isMemDC = true;
+
         SetUpDC();
-    
-        m_isMemDC = TRUE;
     }
     else
-    { 
-        m_ok = FALSE;
+    {
+        m_ok = false;
         m_window = (GdkWindow *) NULL;
     }
 }
 
+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())
@@ -79,5 +144,3 @@ void wxMemoryDC::DoGetSize( int *width, int *height ) const
         if (height) (*height) = 0;
     }
 }
-
-