X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0cbff1201aa47e2b73ec90a97886f18e88270ea6..7eb8c6ee3e90554c94d05dc06e6826f832640927:/include/wx/mgl/dc.h?ds=sidebyside diff --git a/include/wx/mgl/dc.h b/include/wx/mgl/dc.h index 5d4b1c1be1..aa9d55875f 100644 --- a/include/wx/mgl/dc.h +++ b/include/wx/mgl/dc.h @@ -4,14 +4,14 @@ // Author: Vaclav Slavik // Created: 2001/03/09 // RCS-ID: $Id$ -// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) +// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_DC_H_ #define _WX_DC_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "dc.h" #endif @@ -45,6 +45,7 @@ class WXDLLEXPORT wxDC; // MGL fwd declarations: class MGLDevCtx; +class MGLRegion; struct font_t; class WXDLLEXPORT wxDC : public wxDCBase @@ -166,7 +167,7 @@ public: void SetMGLDC(MGLDevCtx *mgldc, bool OwnsMGLDC = FALSE); protected: - virtual void DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, + virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style = wxFLOOD_SURFACE); virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const; @@ -268,6 +269,7 @@ protected: wxPalette m_oldPalette; wxRegion m_currentClippingRegion; + wxRegion m_globalClippingRegion; // wxDC::Blit handles memoryDCs as special cases :( bool m_isMemDC;