X error handler should be extern C (SunCC warning fix)

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

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 626d46cf44c10e25b8049d4e6b0988960daa8154..94ef8c1051cdbc81de23f6a13b125855ef057e6a 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -1372,7 +1372,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
                 {
                     gdk_gc_set_clip_mask( m_textGC, mask );
                     gdk_gc_set_clip_origin( m_textGC, cx-xsrcMask, cy-ysrcMask );
-                }                                
+                }
             }
             else
             {
@@ -1385,7 +1385,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
                 {
                     gdk_gc_set_clip_mask( m_penGC, mask );
                     gdk_gc_set_clip_origin( m_penGC, cx-xsrcMask, cy-ysrcMask );
-                }                
+                }
             }
         }
 
@@ -1888,11 +1888,14 @@ void wxWindowDC::SetFont( const wxFont &font )
             PangoContext *oldContext = m_context;
 
             // We might want to use the X11 context for faster
-            // rendering on screen
+            // rendering on screen.
+            // MR: Lets not want to do this, as this introduces libpangox dependancy.
+#if 0
             if (m_font.GetNoAntiAliasing())
                 m_context = m_owner->GtkGetPangoX11Context();
             else
-                m_context = m_owner->GtkGetPangoDefaultContext();
+#endif
+            m_context = m_owner->GtkGetPangoDefaultContext();
 
             // If we switch back/forth between different contexts
             // we also have to create a new layout. I think so,
@@ -2377,12 +2380,12 @@ void wxWindowDC::ComputeScaleAndOrigin()
     if ((m_scaleX != origScaleX || m_scaleY != origScaleY) &&
         (m_pen.Ok()))
     {
-      /* this is a bit artificial, but we need to force wxDC to think
-         the pen has changed */
-      wxPen pen = m_pen;
-      m_pen = wxNullPen;
-      SetPen( pen );
-  }
+        /* this is a bit artificial, but we need to force wxDC to think
+           the pen has changed */
+        wxPen pen = m_pen;
+        m_pen = wxNullPen;
+        SetPen( pen );
+    }
 }
 
 // Resolution in pixels per logical inch