Merge in from trunk r64802 - r68625

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

diff --git a/src/gtk1/dcmemory.cpp b/src/gtk1/dcmemory.cpp
index 95bf5b9a8a7bd11d0e2dea3d69f6a3da72040a8b..90b866b03480c1c3b40f4aa249d58285a3c88e6c 100644 (file)
--- a/src/gtk1/dcmemory.cpp
+++ b/src/gtk1/dcmemory.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcmemory.cpp
+// Name:        src/gtk1/dcmemory.cpp

 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Purpose:
 // Author:      Robert Roebling
 // RCS-ID:      $Id$


@@ -7,45 +7,43 @@
 // 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 "wx/gtk1/dcmemory.h"

 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------

-// wxMemoryDC
+// wxMemoryDCImpl

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
+IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxWindowDCImpl)

 
 

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

 {
 {

-    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()
+wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC *owner, wxDC *WXUNUSED(dc))
+              : wxWindowDCImpl(owner)

 {
 {

-    m_ok = FALSE;
-
-    m_cmap = gtk_widget_get_default_colormap();
+    Init();

 }
 
 }
 

-wxMemoryDC::~wxMemoryDC()
+wxMemoryDCImpl::~wxMemoryDCImpl()

 {
 }
 
 {
 }
 

-void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
+void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap )

 {
     Destroy();
 {
     Destroy();

+

     m_selected = bitmap;
     m_selected = bitmap;

-    if (m_selected.Ok())
+    if (m_selected.IsOk())

     {
         if (m_selected.GetPixmap())
         {
     {
         if (m_selected.GetPixmap())
         {


@@ -56,80 +54,84 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
             m_window = m_selected.GetBitmap();
         }
 
             m_window = m_selected.GetBitmap();
         }
 

-        SetUpDC();
+        m_isMemDC = true;

 
 

-        m_isMemDC = TRUE;
+        SetUpDC();

     }
     else
     {
     }
     else
     {

-        m_ok = FALSE;
-        m_window = (GdkWindow *) NULL;
+        m_ok = false;
+        m_window = NULL;

     }
 }
 
     }
 }
 

-void wxMemoryDC::SetPen( const wxPen &pen )
+void wxMemoryDCImpl::SetPen( const wxPen& penOrig )

 {
 {

-    if (m_selected.Ok() && m_selected.GetBitmap() && (*wxTRANSPARENT_PEN != pen))
+    wxPen pen( penOrig );
+    if ( m_selected.IsOk() &&
+            m_selected.GetBitmap() &&
+                (pen != *wxTRANSPARENT_PEN) )

     {
     {

-        if (*wxWHITE_PEN == pen)
-            wxWindowDC::SetPen( *wxBLACK_PEN );
-        else
-            wxWindowDC::SetPen( *wxWHITE_PEN );
-    }
-    else
-    {
-        wxWindowDC::SetPen( pen );
+        pen.SetColour( pen.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );

     }
     }

+
+    wxWindowDCImpl::SetPen( pen );

 }
 
 }
 

-void wxMemoryDC::SetBrush( const wxBrush &brush )
+void wxMemoryDCImpl::SetBrush( const wxBrush& brushOrig )

 {
 {

-    if (m_selected.Ok() && m_selected.GetBitmap() && (*wxTRANSPARENT_BRUSH != brush))
+    wxBrush brush( brushOrig );
+    if ( m_selected.IsOk() &&
+            m_selected.GetBitmap() &&
+                (brush != *wxTRANSPARENT_BRUSH) )

     {
     {

-        if (*wxWHITE_BRUSH == brush)
-            wxWindowDC::SetBrush( *wxBLACK_BRUSH );
-        else
-            wxWindowDC::SetBrush( *wxWHITE_BRUSH );
+        brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE);

     }
     }

-    else
+
+    wxWindowDCImpl::SetBrush( brush );
+}
+
+void wxMemoryDCImpl::SetBackground( const wxBrush& brushOrig )
+{
+    wxBrush brush(brushOrig);
+
+    if ( m_selected.IsOk() &&
+            m_selected.GetBitmap() &&
+                (brush != *wxTRANSPARENT_BRUSH) )

     {
     {

-        wxWindowDC::SetBrush( brush );
+        brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );

     }
     }

+
+    wxWindowDCImpl::SetBackground( brush );

 }
 
 }
 

-void wxMemoryDC::SetTextForeground( const wxColour &col )
+void wxMemoryDCImpl::SetTextForeground( const wxColour& col )

 {
 {

-    if (m_selected.Ok() && m_selected.GetBitmap())
+    if ( m_selected.IsOk() && m_selected.GetBitmap() )

     {
     {

-        if (col == *wxWHITE)
-            wxWindowDC::SetTextForeground( *wxBLACK );
-        else
-            wxWindowDC::SetTextForeground( *wxWHITE );
+        wxWindowDCImpl::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE);

     }
     else
     {
     }
     else
     {

-        wxWindowDC::SetTextForeground( col );
+        wxWindowDCImpl::SetTextForeground( col );

     }
 }
 
     }
 }
 

-void wxMemoryDC::SetTextBackground( const wxColour &col )
+void wxMemoryDCImpl::SetTextBackground( const wxColour &col )

 {
 {

-    if (m_selected.Ok() && m_selected.GetBitmap())
+    if (m_selected.IsOk() && m_selected.GetBitmap())

     {
     {

-        if (col == *wxWHITE)
-            wxWindowDC::SetTextBackground( *wxBLACK );
-        else
-            wxWindowDC::SetTextBackground( *wxWHITE );
+        wxWindowDCImpl::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE );

     }
     else
     {
     }
     else
     {

-        wxWindowDC::SetTextBackground( col );
+        wxWindowDCImpl::SetTextBackground( col );

     }
 }
 
     }
 }
 

-void wxMemoryDC::DoGetSize( int *width, int *height ) const
+void wxMemoryDCImpl::DoGetSize( int *width, int *height ) const

 {
 {

-    if (m_selected.Ok())
+    if (m_selected.IsOk())

     {
         if (width) (*width) = m_selected.GetWidth();
         if (height) (*height) = m_selected.GetHeight();
     {
         if (width) (*width) = m_selected.GetWidth();
         if (height) (*height) = m_selected.GetHeight();


@@ -140,5 +142,3 @@ void wxMemoryDC::DoGetSize( int *width, int *height ) const
         if (height) (*height) = 0;
     }
 }
         if (height) (*height) = 0;
     }
 }

-
-