fixed another place where wxString was used as bool

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

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 6022888051ce8cfa903778129f635f3db8589b76..c064590ae8f81b80eff016653b1969d595cb1f8b 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -324,7 +324,7 @@ wxWindowDC::wxWindowDC( wxWindow *window )
        standard (as e.g. wxStatusBar) */
 
     m_owner = window;
-    
+
     if (m_owner && m_owner->m_wxwindow && (m_owner->GetLayoutDirection() == wxLayout_RightToLeft))
     {
         // reverse sense
@@ -391,7 +391,7 @@ void wxWindowDC::SetUpDC()
     gdk_gc_set_background( m_textGC, m_textBackgroundColour.GetColor() );
 
     gdk_gc_set_fill( m_textGC, GDK_SOLID );
-    
+
     gdk_gc_set_colormap( m_textGC, m_cmap );
 
     /* m_penGC */
@@ -862,7 +862,7 @@ void wxWindowDC::DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord h
                     gdk_draw_rectangle( m_window, m_penGC, FALSE, xx, yy, ww-2, hh-2 );
                     gdk_draw_rectangle( m_window, m_penGC, FALSE, xx-1, yy-1, ww, hh );
                 }
-                
+
                 // reset
                 gdk_gc_set_line_attributes( m_penGC, 2, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND );
             }
@@ -1083,10 +1083,10 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
 
     int w = bitmap.GetWidth();
     int h = bitmap.GetHeight();
-    
+
     if (m_owner && m_owner->GetLayoutDirection() == wxLayout_RightToLeft)
         xx -= w;
-        
+
     CalcBoundingBox( x, y );
     CalcBoundingBox( x + w, y + h );
 
@@ -1217,9 +1217,15 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
     xsrc = source->LogicalToDeviceX(xsrc);
     ysrc = source->LogicalToDeviceY(ysrc);
 
+    wxBitmap selected;
     wxMemoryDC *memDC = wxDynamicCast(source, wxMemoryDC);
-    wxBitmap selected = source->GetSelectedBitmap();
-    
+    if ( memDC )
+    {
+        selected = memDC->GetSelectedBitmap();
+        if ( !selected.IsOk() )
+            return false;
+    }
+
     bool use_bitmap_method = false;
     bool is_mono = false;
 
@@ -1229,8 +1235,6 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
         ysrcMask = ysrc;
     }
 
-    if (memDC && !selected.Ok()) return false;
-    
     if (selected.Ok())
     {
         is_mono = (selected.GetDepth() == 1);
@@ -1428,7 +1432,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
             GdkWindow* window = source->GetGDKWindow();
             if ( !window )
                 return false;
-            
+
             // copy including child window contents
             gdk_gc_set_subwindow( m_penGC, GDK_INCLUDE_INFERIORS );
             gdk_draw_drawable( m_window, m_penGC,
@@ -1468,11 +1472,16 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
         return;
     size_t datalen = strlen(data);
 
-    // TODO: as soon as Pango provides a function to check at runtime its
-    //       version, we can use it to disable the underline hack for
-    //       Pango >= 1.16 as the "underline of leading/trailing spaces"
-    //       has been fixed there
-    bool needshack = underlined;
+#ifdef PANGO_VERSION_MAJOR
+    // in Pango >= 1.16 the "underline of leading/trailing spaces" bug has been fixed...
+    static bool pangoOk = (pango_version_check(1, 16, 1) == NULL);
+#else
+    // the version of Pango used for compiling wxWidgets does not have version macros/functions...
+    // we are forced to assume that the run-time version of Pango is older than 1.16
+    const bool pangoOk = false;
+#endif
+
+    bool needshack = underlined && !pangoOk;
     char *hackstring = NULL;
 
     if (needshack)
@@ -1579,7 +1588,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
             gdk_draw_rectangle(m_window, m_textGC, TRUE, x, y, w, h);
             gdk_gc_set_foreground(m_textGC, m_textForegroundColour.GetColor());
         }
-        
+
         // Draw layout.
         if (m_owner && m_owner->GetLayoutDirection() == wxLayout_RightToLeft)
             gdk_draw_layout( m_window, m_textGC, x-w, y, m_layout );
@@ -1771,7 +1780,7 @@ void wxWindowDC::DoGetTextExtent(const wxString &string,
     }
 
     // Reset old font description
-    if (theFont)
+    if (theFont->IsOk())
         pango_layout_set_font_description( m_layout, m_fontdesc );
 }
 
@@ -1796,7 +1805,7 @@ bool wxWindowDC::DoGetPartialTextExtents(const wxString& text,
     }
 
     pango_layout_set_text( m_layout, dataUTF8, strlen(dataUTF8) );
-    
+
     // Calculate the position of each character based on the widths of
     // the previous characters
 
@@ -1809,7 +1818,6 @@ bool wxWindowDC::DoGetPartialTextExtents(const wxString& text,
     {
         pango_layout_iter_get_cluster_extents(iter, NULL, &pos);
         int position = PANGO_PIXELS(pos.x);
-        size_t curIndex = pango_layout_iter_get_index(iter);
         widths[i++] = position;
     }
     while (i < len)
@@ -1831,7 +1839,12 @@ wxCoord wxWindowDC::GetCharWidth() const
 wxCoord wxWindowDC::GetCharHeight() const
 {
     PangoFontMetrics *metrics = pango_context_get_metrics (m_context, m_fontdesc, pango_context_get_language(m_context));
-    return PANGO_PIXELS (pango_font_metrics_get_descent (metrics) + pango_font_metrics_get_ascent (metrics));
+    wxCHECK_MSG( metrics, -1, _T("failed to get pango font metrics") );
+
+    wxCoord h = PANGO_PIXELS (pango_font_metrics_get_descent (metrics) +
+                pango_font_metrics_get_ascent (metrics));
+    pango_font_metrics_unref (metrics);
+    return h;
 }
 
 void wxWindowDC::Clear()
@@ -2369,7 +2382,7 @@ void wxWindowDC::SetDeviceOrigin( wxCoord x, wxCoord y )
 {
     m_deviceOriginX = x;
     m_deviceOriginY = y;
-    
+
     ComputeScaleAndOrigin();
 }
 
@@ -2377,10 +2390,10 @@ void wxWindowDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
 {
     m_signX = (xLeftRight ?  1 : -1);
     m_signY = (yBottomUp  ? -1 :  1);
-    
+
     if (m_owner && m_owner->m_wxwindow && (m_owner->GetLayoutDirection() == wxLayout_RightToLeft))
-        m_signX = -m_signX;        
-        
+        m_signX = -m_signX;
+
     ComputeScaleAndOrigin();
 }