some wxArtProv docs

[wxWidgets.git] / src / common / imagfill.cpp

diff --git a/src/common/imagfill.cpp b/src/common/imagfill.cpp
index 81f49d8471d532a2058e163fb2530f4e2599b7fb..b5a6c66a5300031da30fe282ff5cda60a13ec8cf 100644 (file)
--- a/src/common/imagfill.cpp
+++ b/src/common/imagfill.cpp
@@ -33,7 +33,7 @@
 // a color different from the start pixel is reached (wxFLOOD_SURFACE)
 // or fill color is reached (wxFLOOD_BORDER)
 
 // a color different from the start pixel is reached (wxFLOOD_SURFACE)
 // or fill color is reached (wxFLOOD_BORDER)
 

-static LINKAGEMODE bool 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;
 


@@ -43,26 +43,26 @@ static LINKAGEMODE bool MatchPixel(wxImage *img, int x, int y, int w, int h, con
     return c.Red() == r && c.Green() == g && c.Blue() == b ;
 }
 
     return c.Red() == r && c.Green() == g && c.Blue() == b ;
 }
 

-static LINKAGEMODE bool 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;
 
     unsigned char r = img->GetRed(x,y);
     unsigned char g = img->GetGreen(x,y);
     unsigned char b = img->GetBlue(x,y);
 {
     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 ) 
+    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;
 }
 
 

-static LINKAGEMODE
-void wxImageFloodFill(wxImage *image,
-                      wxCoord x, wxCoord y, const wxBrush & fillBrush,
-                      const wxColour& testColour, int style,
-                      int LogicalFunction)
+static void LINKAGEMODE
+wxImageFloodFill(wxImage *image,
+                 wxCoord x, wxCoord y, const wxBrush & fillBrush,
+                 const wxColour& testColour, int style,
+                int LogicalFunction)

 {
     /* A diamond flood-fill using a circular queue system.
     Each pixel surrounding the current pixel is added to
 {
     /* A diamond flood-fill using a circular queue system.
     Each pixel surrounding the current pixel is added to


@@ -273,7 +273,7 @@ void wxImageFloodFill(wxImage *image,
 }
 
 
 }
 
 

-void wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y, 
+void 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)


@@ -294,7 +294,7 @@ void wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
     memdc.SelectObject(wxNullBitmap);
 
     wxImage image = bitmap.ConvertToImage();
     memdc.SelectObject(wxNullBitmap);
 
     wxImage image = bitmap.ConvertToImage();

-    wxImageFloodFill(&image, x,y, dc->GetBrush(), col, style, 
+    wxImageFloodFill(&image, x,y, dc->GetBrush(), col, style,

                      dc->GetLogicalFunction());
     bitmap = wxBitmap(image);
     memdc.SelectObject(bitmap);
                      dc->GetLogicalFunction());
     bitmap = wxBitmap(image);
     memdc.SelectObject(bitmap);