Rearrange code to fix some problems

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

diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp
index 46920d7d6dc370361a539bd38773da184e553a3a..47c9a673f5c8a7b365793c88f4978276d6ec8d19 100644 (file)
--- a/src/gtk/dcmemory.cpp
+++ b/src/gtk/dcmemory.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -7,9 +7,8 @@
 // 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/dcmemory.h"
 


@@ -22,101 +21,98 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 

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

 {
 {

-    m_ok = FALSE;
+    m_ok = false;

 
     m_cmap = gtk_widget_get_default_colormap();
 
     m_cmap = gtk_widget_get_default_colormap();

-    
-#ifdef __WXGTK20__
+

     m_context = gdk_pango_context_get();
     m_context = gdk_pango_context_get();

+    // Note: The Sun customised version of Pango shipping with Solaris 10
+    // crashes if the language is left NULL (see bug 1374114)
+    pango_context_set_language( m_context, gtk_get_default_language() );

     m_layout = pango_layout_new( m_context );
     m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) );
     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()
 {
 }
 
 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
+    Init();

 }
 
 wxMemoryDC::~wxMemoryDC()
 {
 }
 
 wxMemoryDC::~wxMemoryDC()
 {

+    g_object_unref(m_context);

 }
 
 }
 

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

 {
     Destroy();
 {
     Destroy();

+

     m_selected = bitmap;
     if (m_selected.Ok())
     {
     m_selected = bitmap;
     if (m_selected.Ok())
     {

-        if (m_selected.GetPixmap())
-        {
-            m_window = m_selected.GetPixmap();
-        }
-        else
-        {
-            m_window = m_selected.GetBitmap();
-        }
+        m_window = m_selected.GetPixmap();
+
+        m_selected.PurgeOtherRepresentations(wxBitmap::Pixmap);

 
 

-        m_isMemDC = TRUE;
+        m_isMemDC = true;

 
         SetUpDC();
     }
     else
     {
 
         SetUpDC();
     }
     else
     {

-        m_ok = FALSE;
+        m_ok = false;

         m_window = (GdkWindow *) NULL;
     }
 }
 
         m_window = (GdkWindow *) NULL;
     }
 }
 

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

 {
 {

-    if (m_selected.Ok() && m_selected.GetBitmap() && (*wxTRANSPARENT_PEN != pen))
-    {
-        if (*wxWHITE_PEN == pen)
-            wxWindowDC::SetPen( *wxBLACK_PEN );
-        else
-            wxWindowDC::SetPen( *wxWHITE_PEN );
-    }
-    else
+    wxPen pen( penOrig );
+    if ( m_selected.Ok() &&
+            m_selected.GetDepth() == 1 &&
+                (pen != *wxTRANSPARENT_PEN) )

     {
     {

-        wxWindowDC::SetPen( pen );
+        pen.SetColour( pen.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );

     }
     }

+
+    wxWindowDC::SetPen( pen );

 }
 
 }
 

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

 {
 {

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

     {
     {

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

     }
     }

-    else
+
+    wxWindowDC::SetBrush( brush );
+}
+
+void wxMemoryDC::SetBackground( const wxBrush& brushOrig )
+{
+    wxBrush brush(brushOrig);
+
+    if ( m_selected.Ok() &&
+            m_selected.GetDepth() == 1 &&
+                (brush != *wxTRANSPARENT_BRUSH) )

     {
     {

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

     }
     }

+
+    wxWindowDC::SetBackground( brush );

 }
 
 }
 

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

 {
 {

-    if (m_selected.Ok() && m_selected.GetBitmap())
+    if ( m_selected.Ok() && m_selected.GetDepth() == 1 )

     {
     {

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

     }
     else
     {
     }
     else
     {


@@ -126,12 +122,9 @@ void wxMemoryDC::SetTextForeground( const wxColour &col )
 
 void wxMemoryDC::SetTextBackground( const wxColour &col )
 {
 
 void wxMemoryDC::SetTextBackground( const wxColour &col )
 {

-    if (m_selected.Ok() && m_selected.GetBitmap())
+    if (m_selected.Ok() && m_selected.GetDepth() == 1)

     {
     {

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

     }
     else
     {
     }
     else
     {


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

-
-