fixing this conversion (was essentially a no-op under NON-UNICODE)

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

diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp
index ee801a6f56796541f72fa4fb70ebaad560224136..b57a4b8aa81223581bb44e9e2584020ff0197eea 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$
@@ -23,38 +23,34 @@ IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxWindowDC)
 
 wxMemoryDC::wxMemoryDC() : wxWindowDC()
 {
-    m_ok = FALSE;
+    m_ok = false;
 
     m_cmap = gtk_widget_get_default_colormap();
-    
-#ifdef __WXGTK20__
+
     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 ) );
-#endif
 }
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
   : wxWindowDC()
 {
-    m_ok = FALSE;
+    m_ok = false;
 
     m_cmap = gtk_widget_get_default_colormap();
-    
-#ifdef __WXGTK20__
+
     m_context = gdk_pango_context_get();
     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 ) );
-#endif
 }
 
 wxMemoryDC::~wxMemoryDC()
 {
-#ifdef __WXGTK20__
     g_object_unref(m_context);
-#endif
 }
 
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
@@ -63,26 +59,17 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
     m_selected = bitmap;
     if (m_selected.Ok())
     {
-        if (m_selected.GetPixmap())
-        {
-            m_window = m_selected.GetPixmap();
-        }
-        else
-        {
-            m_window = m_selected.GetBitmap();
-        }
-
-#ifdef __WXGTK20__
+        m_window = m_selected.GetPixmap();
+
         m_selected.PurgeOtherRepresentations(wxBitmap::Pixmap);
-#endif
 
-        m_isMemDC = TRUE;
+        m_isMemDC = true;
 
         SetUpDC();
     }
     else
     {
-        m_ok = FALSE;
+        m_ok = false;
         m_window = (GdkWindow *) NULL;
     }
 }
@@ -91,7 +78,7 @@ void wxMemoryDC::SetPen( const wxPen& penOrig )
 {
     wxPen pen( penOrig );
     if ( m_selected.Ok() &&
-            m_selected.GetBitmap() &&
+            m_selected.GetDepth() == 1 &&
                 (pen != *wxTRANSPARENT_PEN) )
     {
         pen.SetColour( pen.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
@@ -104,7 +91,7 @@ void wxMemoryDC::SetBrush( const wxBrush& brushOrig )
 {
     wxBrush brush( brushOrig );
     if ( m_selected.Ok() &&
-            m_selected.GetBitmap() &&
+            m_selected.GetDepth() == 1 &&
                 (brush != *wxTRANSPARENT_BRUSH) )
     {
         brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE);
@@ -113,12 +100,12 @@ void wxMemoryDC::SetBrush( const wxBrush& brushOrig )
     wxWindowDC::SetBrush( brush );
 }
 
-void wxMemoryDC::SetBackground( const wxBrush& brushOrig ) 
+void wxMemoryDC::SetBackground( const wxBrush& brushOrig )
 {
     wxBrush brush(brushOrig);
 
     if ( m_selected.Ok() &&
-            m_selected.GetBitmap() &&
+            m_selected.GetDepth() == 1 &&
                 (brush != *wxTRANSPARENT_BRUSH) )
     {
         brush.SetColour( brush.GetColour() == *wxWHITE ? *wxBLACK : *wxWHITE );
@@ -129,7 +116,7 @@ void wxMemoryDC::SetBackground( const wxBrush& brushOrig )
 
 void wxMemoryDC::SetTextForeground( const wxColour& col )
 {
-    if ( m_selected.Ok() && m_selected.GetBitmap() )
+    if ( m_selected.Ok() && m_selected.GetDepth() == 1 )
     {
         wxWindowDC::SetTextForeground( col == *wxWHITE ? *wxBLACK : *wxWHITE);
     }
@@ -141,7 +128,7 @@ void wxMemoryDC::SetTextForeground( const wxColour& col )
 
 void wxMemoryDC::SetTextBackground( const wxColour &col )
 {
-    if (m_selected.Ok() && m_selected.GetBitmap())
+    if (m_selected.Ok() && m_selected.GetDepth() == 1)
     {
         wxWindowDC::SetTextBackground( col == *wxWHITE ? *wxBLACK : *wxWHITE );
     }
@@ -164,5 +151,3 @@ void wxMemoryDC::DoGetSize( int *width, int *height ) const
         if (height) (*height) = 0;
     }
 }
-
-