projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated wxExecute checks in wxGTK to be same as in other Unix ports after recent...
[wxWidgets.git]
/
src
/
common
/
imagfill.cpp
diff --git
a/src/common/imagfill.cpp
b/src/common/imagfill.cpp
index b5a6c66a5300031da30fe282ff5cda60a13ec8cf..b81b9770557a854d4cd6a03c93d544444a274fc4 100644
(file)
--- a/
src/common/imagfill.cpp
+++ b/
src/common/imagfill.cpp
@@
-1,9
+1,9
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: imagfill.cpp
+// Name:
src/common/
imagfill.cpp
// Purpose: FloodFill for wxImage
// Purpose: FloodFill for wxImage
-// Author:
+// Author:
Julian Smart
// RCS-ID: $Id$
// RCS-ID: $Id$
-// Copyright:
+// Copyright:
(c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@
-15,17
+15,14
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
-#include "wx/defs.h"
-
#if wxUSE_IMAGE && !defined(__WXMSW__)
// we have no use for this code in wxMSW...
#if wxUSE_IMAGE && !defined(__WXMSW__)
// we have no use for this code in wxMSW...
-#include "wx/image.h"
-
#ifndef WX_PRECOMP
#include "wx/brush.h"
#include "wx/dc.h"
#include "wx/dcmemory.h"
#ifndef WX_PRECOMP
#include "wx/brush.h"
#include "wx/dc.h"
#include "wx/dcmemory.h"
+ #include "wx/image.h"
#endif
// DoFloodFill
#endif
// DoFloodFill
@@
-35,7
+32,7
@@
static bool LINKAGEMODE MatchPixel(wxImage *img, int x, int y, int w, int h, const wxColour& c)
{
static bool LINKAGEMODE MatchPixel(wxImage *img, int x, int y, int w, int h, const wxColour& c)
{
- if ((x<0)||(x>=w)||(y<0)||(y>=h)) return
FALSE
;
+ if ((x<0)||(x>=w)||(y<0)||(y>=h)) return
false
;
unsigned char r = img->GetRed(x,y);
unsigned char g = img->GetGreen(x,y);
unsigned char r = img->GetRed(x,y);
unsigned char g = img->GetGreen(x,y);
@@
-45,16
+42,16
@@
static bool LINKAGEMODE MatchPixel(wxImage *img, int x, int y, int w, int h, con
static bool LINKAGEMODE MatchBoundaryPixel(wxImage *img, int x, int y, int w, int h, const wxColour & fill, const wxColour& bound)
{
static bool LINKAGEMODE MatchBoundaryPixel(wxImage *img, int x, int y, int w, int h, const wxColour & fill, const wxColour& bound)
{
- if ((x<0)||(x>=w)||(y<0)||(y>=h)) return
TRUE
;
+ if ((x<0)||(x>=w)||(y<0)||(y>=h)) return
true
;
unsigned char r = img->GetRed(x,y);
unsigned char g = img->GetGreen(x,y);
unsigned char b = img->GetBlue(x,y);
if ( fill.Red() == r && fill.Green() == g && fill.Blue() == b )
unsigned char r = img->GetRed(x,y);
unsigned char g = img->GetGreen(x,y);
unsigned char b = img->GetBlue(x,y);
if ( fill.Red() == r && fill.Green() == g && fill.Blue() == b )
- return
TRUE
;
+ return
true
;
if ( bound.Red() == r && bound.Green() == g && bound.Blue() == b )
if ( bound.Red() == r && bound.Green() == g && bound.Blue() == b )
- return
TRUE
;
- return
FALSE
;
+ return
true
;
+ return
false
;
}
}
@@
-62,12
+59,15
@@
static void LINKAGEMODE
wxImageFloodFill(wxImage *image,
wxCoord x, wxCoord y, const wxBrush & fillBrush,
const wxColour& testColour, int style,
wxImageFloodFill(wxImage *image,
wxCoord x, wxCoord y, const wxBrush & fillBrush,
const wxColour& testColour, int style,
-
int LogicalFunction
)
+
int WXUNUSED(LogicalFunction)
)
{
/* A diamond flood-fill using a circular queue system.
Each pixel surrounding the current pixel is added to
the queue if it meets the criteria, then is retrieved in
{
/* A diamond flood-fill using a circular queue system.
Each pixel surrounding the current pixel is added to
the queue if it meets the criteria, then is retrieved in
- its turn. Code originally based on http://www.drawit.co.nz/Developers.htm */
+ its turn. Code originally based on http://www.drawit.co.nz/Developers.htm,
+ with explicit permission to use this for wxWidgets granted by Andrew Empson
+ (no copyright claimed)
+ */
int width = image->GetWidth();
int height = image->GetHeight();
int width = image->GetWidth();
int height = image->GetHeight();
@@
-273,18
+273,19
@@
wxImageFloodFill(wxImage *image,
}
}
-
void
wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
+
bool
wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
const wxColour& col, int style)
{
if (dc->GetBrush().GetStyle() == wxTRANSPARENT)
const wxColour& col, int style)
{
if (dc->GetBrush().GetStyle() == wxTRANSPARENT)
- return;
+ return
true
;
int height = 0;
int width = 0;
dc->GetSize(&width, &height);
//it would be nice to fail if we don't get a sensible size...
int height = 0;
int width = 0;
dc->GetSize(&width, &height);
//it would be nice to fail if we don't get a sensible size...
- wxCHECK_RET(width >= 1 && height >= 1, wxT("In FloodFill, dc.GetSize routine failed, method not supported by this DC"));
+ wxCHECK_MSG(width >= 1 && height >= 1, false,
+ wxT("In FloodFill, dc.GetSize routine failed, method not supported by this DC"));
//this is much faster than doing the individual pixels
wxMemoryDC memdc;
//this is much faster than doing the individual pixels
wxMemoryDC memdc;
@@
-300,7
+301,8
@@
void wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
memdc.SelectObject(bitmap);
dc->Blit(0, 0, width, height, &memdc, 0, 0);
memdc.SelectObject(wxNullBitmap);
memdc.SelectObject(bitmap);
dc->Blit(0, 0, width, height, &memdc, 0, 0);
memdc.SelectObject(wxNullBitmap);
+
+ return true;
}
#endif // wxUSE_IMAGE
}
#endif // wxUSE_IMAGE
-