cleaning up the mess created by the FloodFill patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -175,12 +175,6 @@ public:
|
|||||||
bool SetMaskFromImage(const wxImage & mask,
|
bool SetMaskFromImage(const wxImage & mask,
|
||||||
unsigned char mr, unsigned char mg, unsigned char mb);
|
unsigned char mr, unsigned char mg, unsigned char mb);
|
||||||
|
|
||||||
void DoFloodFill (wxCoord x, wxCoord y,
|
|
||||||
const wxBrush & fillBrush,
|
|
||||||
const wxColour& testColour,
|
|
||||||
int style = wxFLOOD_SURFACE,
|
|
||||||
int LogicalFunction = wxCOPY /* currently unused */ ) ;
|
|
||||||
|
|
||||||
static bool CanRead( const wxString& name );
|
static bool CanRead( const wxString& name );
|
||||||
static int GetImageCount( const wxString& name, long type = wxBITMAP_TYPE_ANY );
|
static int GetImageCount( const wxString& name, long type = wxBITMAP_TYPE_ANY );
|
||||||
virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 );
|
virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 );
|
||||||
@@ -270,10 +264,6 @@ protected:
|
|||||||
static wxList sm_handlers;
|
static wxList sm_handlers;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
//these two are called by FloodFill
|
|
||||||
bool MatchPixel(int x, int y, int w, int h, const wxColour & c) ;
|
|
||||||
bool MatchBoundaryPixel(int x, int y, int w, int h, const wxColour & fill, const wxColour & bound) ;
|
|
||||||
|
|
||||||
friend class WXDLLEXPORT wxImageHandler;
|
friend class WXDLLEXPORT wxImageHandler;
|
||||||
|
|
||||||
DECLARE_DYNAMIC_CLASS(wxImage)
|
DECLARE_DYNAMIC_CLASS(wxImage)
|
||||||
|
Reference in New Issue
Block a user