Fix some compilation and linking errors in samples.

[wxWidgets.git] / include / wx / mgl / dc.h

diff --git a/include/wx/mgl/dc.h b/include/wx/mgl/dc.h
index 5d4b1c1be11d3869886178d1cadddbbfdcce2656..9e0cccd4548b065188e84e70f8956b6962461759 100644 (file)
--- a/include/wx/mgl/dc.h
+++ b/include/wx/mgl/dc.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Created:     2001/03/09
 // RCS-ID:      $Id$
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -45,6 +45,7 @@ class WXDLLEXPORT wxDC;
 
 // MGL fwd declarations:
 class MGLDevCtx;
 
 // MGL fwd declarations:
 class MGLDevCtx;

+class MGLRegion;

 struct font_t;
 
 class WXDLLEXPORT wxDC : public wxDCBase
 struct font_t;
 
 class WXDLLEXPORT wxDC : public wxDCBase


@@ -166,7 +167,7 @@ public:
     void SetMGLDC(MGLDevCtx *mgldc, bool OwnsMGLDC = FALSE);
 
 protected:
     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;
                              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;
     wxPalette         m_oldPalette;
     
     wxRegion          m_currentClippingRegion;

+    wxRegion          m_globalClippingRegion;

 
     // wxDC::Blit handles memoryDCs as special cases :(
     bool              m_isMemDC;
 
     // wxDC::Blit handles memoryDCs as special cases :(
     bool              m_isMemDC;