wxFrame size bug

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

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index 8fdd39e4ce4c830546bf5e52891405fa01dd7d42..452f2bde090ed72703f1084b73550dd91915f785 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -552,11 +552,11 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height,
     
             if (useMask && mask) 
             {
-                gdk_gc_set_clip_mask( m_penGC, mask );
-                gdk_gc_set_clip_origin( m_penGC, xx, yy );
+                gdk_gc_set_clip_mask( m_textGC, mask );
+                gdk_gc_set_clip_origin( m_textGC, xx, yy );
             }
   
-            gdk_draw_pixmap( m_window, m_penGC, pmap,
+            gdk_draw_pixmap( m_window, m_textGC, pmap,
                              source->DeviceToLogicalX(xsrc), 
                             source->DeviceToLogicalY(ysrc),
                              xx, 
@@ -566,8 +566,8 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height,
          
             if (useMask && mask) 
             {
-                gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL );
-                gdk_gc_set_clip_origin( m_penGC, 0, 0 );
+                gdk_gc_set_clip_mask( m_textGC, (GdkBitmap *) NULL );
+                gdk_gc_set_clip_origin( m_textGC, 0, 0 );
             }
       
             return TRUE;
@@ -584,11 +584,11 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height,
     
             if (useMask && mask) 
             {
-                gdk_gc_set_clip_mask( m_penGC, mask );
-                gdk_gc_set_clip_origin( m_penGC, xx, yy );
+                gdk_gc_set_clip_mask( m_textGC, mask );
+                gdk_gc_set_clip_origin( m_textGC, xx, yy );
             }
   
-            gdk_draw_bitmap( m_window, m_penGC, bmap,
+            gdk_draw_bitmap( m_window, m_textGC, bmap,
                              source->DeviceToLogicalX(xsrc), 
                             source->DeviceToLogicalY(ysrc),
                              xx, 
@@ -598,15 +598,15 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height,
          
             if (useMask && mask) 
             {
-                gdk_gc_set_clip_mask( m_penGC, (GdkBitmap *) NULL );
-                gdk_gc_set_clip_origin( m_penGC, 0, 0 );
+                gdk_gc_set_clip_mask( m_textGC, (GdkBitmap *) NULL );
+                gdk_gc_set_clip_origin( m_textGC, 0, 0 );
             }
       
             return TRUE;
         }
     }
 
-    gdk_window_copy_area ( m_window, m_penGC,
+    gdk_window_copy_area ( m_window, m_textGC,
                            XLOG2DEV(xdest), YLOG2DEV(ydest),
                            csrc->GetWindow(),
                            source->DeviceToLogicalX(xsrc), 
@@ -615,7 +615,7 @@ bool wxPaintDC::Blit( long xdest, long ydest, long width, long height,
                           source->DeviceToLogicalYRel(height) );
 
 /*    
-    gdk_window_copy_area ( m_window, m_penGC,
+    gdk_window_copy_area ( m_window, m_textGC,
                            XLOG2DEV(xdest), YLOG2DEV(ydest),
                            csrc->GetWindow(),
                            xsrc, ysrc,
@@ -868,6 +868,7 @@ void wxPaintDC::SetLogicalFunction( int function )
     m_logicalFunction = function;
     gdk_gc_set_function( m_penGC, mode );
     gdk_gc_set_function( m_brushGC, mode );
+    gdk_gc_set_function( m_textGC, mode );
 }
 
 void wxPaintDC::SetTextForeground( const wxColour &col )