X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f65e33794fca0c936227235515a40e7df5c56e3..16d42857061b4df8bed14563ea06fc06c9165c43:/src/gtk/dcmemory.cpp

diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp
index e947cd2ca7..0ec10532b7 100644
--- a/src/gtk/dcmemory.cpp
+++ b/src/gtk/dcmemory.cpp
@@ -2,75 +2,162 @@
 // Name:        dcmemory.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:   	wxWindows licence
+// Copyright:   (c) 1998 Robert Roebling
+// 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
 //-----------------------------------------------------------------------------
 
-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();
+    
+#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) )
+  : wxWindowDC()
 {
-  m_ok = FALSE;
-  m_cmap = gdk_colormap_get_system();
-};
+    m_ok = FALSE;
 
-wxMemoryDC::~wxMemoryDC(void)
+    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()
 {
-};
+}
 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
-  m_selected = bitmap;
-  if (m_selected.Ok())
-  {
-    if (m_selected.GetPixmap())
+    Destroy();
+    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();
+        }
+
+        m_isMemDC = TRUE;
+
+        SetUpDC();
     }
     else
     {
-      m_window = m_selected.GetBitmap();
+        m_ok = FALSE;
+        m_window = (GdkWindow *) NULL;
     }
-    
-    SetUpDC();
-  }
-  else
-  {
-    m_ok = FALSE;
-    m_window = 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::GetSize( int *width, int *height )
+void wxMemoryDC::SetBrush( const wxBrush& brushOrig )
 {
-  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;
-  };
-};
+    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())
+    {
+        if (width) (*width) = m_selected.GetWidth();
+        if (height) (*height) = m_selected.GetHeight();
+    }
+    else
+    {
+        if (width) (*width) = 0;
+        if (height) (*height) = 0;
+    }
+}