call wxApp::OnExceptionInMainLoop() when an exception occurs (refactored the change...

[wxWidgets.git] / src / mgl / dc.cpp

diff --git a/src/mgl/dc.cpp b/src/mgl/dc.cpp
index 4a2a4909ec10484ae491edc7eda9827bf55cd51d..ba6ff76f3cb2466c33c870b6a04cb67e31902b6c 100644 (file)
--- a/src/mgl/dc.cpp
+++ b/src/mgl/dc.cpp
@@ -16,7 +16,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "dc.h"
 #endif
 
     #pragma implementation "dc.h"
 #endif
 


@@ -33,6 +33,7 @@
 #endif
 
 #include "wx/fontutil.h"
 #endif
 
 #include "wx/fontutil.h"

+#include "wx/encinfo.h"

 #include "wx/fontmap.h"
 #include "wx/mgl/private.h"
 #include "wx/log.h"
 #include "wx/fontmap.h"
 #include "wx/mgl/private.h"
 #include "wx/log.h"


@@ -332,36 +333,13 @@ void wxDC::Clear()
     }
 }
 
     }
 }
 

-void wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style)
-{
-    if (GetBrush().GetStyle() == wxTRANSPARENT)
-    {
-        wxLogDebug(wxT("In FloodFill, Current Brush is transparent, no filling done"));
-        return ;
-    }
-    int height = 0;
-    int width  = 0;
-    this->GetSize(&width, &height);
-    //it would be nice to fail if we don't get a sensible size...
-    if (width < 1 || height < 1)
-    {
-        wxLogError(wxT("In FloodFill, dc.GetSize routine failed, method not supported by this DC"));
-        return ;
-    }
+extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y, 
+                          const wxColour & col, int style);

 
 

-    //this is much faster than doing the individual pixels
-    wxMemoryDC memdc;
-    wxBitmap bitmap(width, height);
-    memdc.SelectObject(bitmap);
-    memdc.Blit(0, 0, width, height, (wxDC*) this, 0, 0);
-    memdc.SelectObject(wxNullBitmap);
-
-    wxImage image(bitmap);
-    image.DoFloodFill (x,y, GetBrush(), col, style, GetLogicalFunction());
-    bitmap = wxBitmap(image);
-    memdc.SelectObject(bitmap);
-    this->Blit(0, 0, width, height, &memdc, 0, 0);
-    memdc.SelectObject(wxNullBitmap);
+bool wxDC::DoFloodFill(wxCoord x, wxCoord y,
+                       const wxColour& col, int style)
+{
+    return wxDoFloodFill(this, x, y, col, style);

 }
 
 bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
 }
 
 bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const