Typo fix

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

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index ffd39ac0a7403ab801dd1ef16982cb7609a571b2..fc69b408a99a2879bd19cc0fc16a12b2dbf4f217 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -19,6 +19,7 @@
 #include "wx/dcmemory.h"
 #include "wx/image.h"
 #include "wx/module.h"
 #include "wx/dcmemory.h"
 #include "wx/image.h"
 #include "wx/module.h"

+#include "wx/log.h"

 
 #include "wx/gtk/win_gtk.h"
 
 
 #include "wx/gtk/win_gtk.h"
 


@@ -400,10 +401,13 @@ void wxWindowDC::DoGetSize( int* width, int* height ) const
     m_owner->GetSize(width, height);
 }
 
     m_owner->GetSize(width, height);
 }
 

-void wxWindowDC::DoFloodFill( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
-                           const wxColour &WXUNUSED(col), int WXUNUSED(style) )
+extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y, 
+                          const wxColour & col, int style);
+
+bool wxWindowDC::DoFloodFill(wxCoord x, wxCoord y,
+                             const wxColour& col, int style)

 {
 {

-    wxFAIL_MSG( wxT("wxWindowDC::DoFloodFill not implemented") );
+    return wxDoFloodFill(this, x, y, col, style);

 }
 
 bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const
 }
 
 bool wxWindowDC::DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const


@@ -1011,10 +1015,6 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
         use_bitmap = bitmap;
     }
     
         use_bitmap = bitmap;
     }
     

-#ifdef __WXGTK20__
-    useMask = FALSE;
-#endif
-

     /* apply mask if any */
     GdkBitmap *mask = (GdkBitmap *) NULL;
     if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();
     /* apply mask if any */
     GdkBitmap *mask = (GdkBitmap *) NULL;
     if (use_bitmap.GetMask()) mask = use_bitmap.GetMask()->GetBitmap();


@@ -1022,6 +1022,7 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
         if (useMask && mask)
         {
             GdkBitmap *new_mask = (GdkBitmap*) NULL;
         if (useMask && mask)
         {
             GdkBitmap *new_mask = (GdkBitmap*) NULL;

+#ifndef __WXGTK20__  // TODO fix crash

             if (!m_currentClippingRegion.IsNull())
             {
                 GdkColor col;
             if (!m_currentClippingRegion.IsNull())
             {
                 GdkColor col;


@@ -1041,7 +1042,7 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
                 gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh );
                 gdk_gc_unref( gc );
             }
                 gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, ww, hh );
                 gdk_gc_unref( gc );
             }

-
+#endif

             if (is_mono)
             {
                 if (new_mask)
             if (is_mono)
             {
                 if (new_mask)


@@ -1058,6 +1059,7 @@ void wxWindowDC::DoDrawBitmap( const wxBitmap &bitmap,
                     gdk_gc_set_clip_mask( m_penGC, mask );
                 gdk_gc_set_clip_origin( m_penGC, xx, yy );
             }
                     gdk_gc_set_clip_mask( m_penGC, mask );
                 gdk_gc_set_clip_origin( m_penGC, xx, yy );
             }

+            

             if (new_mask)
                 gdk_bitmap_unref( new_mask );
         }
             if (new_mask)
                 gdk_bitmap_unref( new_mask );
         }


@@ -1223,6 +1225,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
         if (useMask && mask)
         {
             GdkBitmap *new_mask = (GdkBitmap*) NULL;
         if (useMask && mask)
         {
             GdkBitmap *new_mask = (GdkBitmap*) NULL;

+#ifndef __WXGTK20__  // TODO fix crash

             if (!m_currentClippingRegion.IsNull())
             {
                 GdkColor col;
             if (!m_currentClippingRegion.IsNull())
             {
                 GdkColor col;


@@ -1242,7 +1245,7 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest,
                 gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, bm_ww, bm_hh );
                 gdk_gc_unref( gc );
             }
                 gdk_draw_rectangle( new_mask, gc, TRUE, 0, 0, bm_ww, bm_hh );
                 gdk_gc_unref( gc );
             }

-
+#endif

             if (is_mono)
             {
                 if (new_mask)
             if (is_mono)
             {
                 if (new_mask)