projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xti updates
[wxWidgets.git]
/
include
/
wx
/
mgl
/
dc.h
diff --git
a/include/wx/mgl/dc.h
b/include/wx/mgl/dc.h
index d59cec8a7bfc733bb2ed079b1f17c0c139b884cd..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
/////////////////////////////////////////////////////////////////////////////
@@
-167,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;
@@
-269,8
+269,7
@@
protected:
wxPalette m_oldPalette;
wxRegion m_currentClippingRegion;
wxPalette m_oldPalette;
wxRegion m_currentClippingRegion;
- // clipping region m_MGLDC had when it was attached:
- MGLRegion *m_globalClippingRegion;
+ wxRegion m_globalClippingRegion;
// wxDC::Blit handles memoryDCs as special cases :(
bool m_isMemDC;
// wxDC::Blit handles memoryDCs as special cases :(
bool m_isMemDC;