wxImage::ConvertToMono wasn't const - fixed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/image.h b/include/wx/image.h
index 44a63769c2e9c7c0728edb54dfbf72919d5ed609..ca9cc6a3c10ce2e857600df931d3f37e25d24565 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -104,7 +104,7 @@ public:
     operator wxBitmap() const { return ConvertToBitmap(); }
     wxBitmap ConvertToBitmap() const;
 #ifdef __WXGTK__
     operator wxBitmap() const { return ConvertToBitmap(); }
     wxBitmap ConvertToBitmap() const;
 #ifdef __WXGTK__

-    wxBitmap ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue );
+    wxBitmap ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const;

 #endif
 #endif
 
 #endif
 #endif
 


@@ -142,7 +142,7 @@ public:
                   unsigned char r2, unsigned char g2, unsigned char b2 );
                  
     // convert to monochrome image (<r,g,b> will be replaced by white, everything else by black)
                   unsigned char r2, unsigned char g2, unsigned char b2 );
                  
     // convert to monochrome image (<r,g,b> will be replaced by white, everything else by black)

-    wxImage ConvertToMono( unsigned char r, unsigned char g, unsigned char b );
+    wxImage ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const;

 
     // these routines are slow but safe
     void SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b );
 
     // these routines are slow but safe
     void SetRGB( int x, int y, unsigned char r, unsigned char g, unsigned char b );

diff --git a/src/common/image.cpp b/src/common/image.cpp
index ef7c6c123e4578ff3ff505d095292826121eff61..8778bb42898b8021a9a0a6d90cabc61ad478d94a 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -464,7 +464,7 @@ void wxImage::Replace( unsigned char r1, unsigned char g1, unsigned char b1,
         }
 }
 
         }
 }
 

-wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char b )
+wxImage wxImage::ConvertToMono( unsigned char r, unsigned char g, unsigned char b ) const

 {
     wxImage image;
 
 {
     wxImage image;
 


@@ -1084,7 +1084,7 @@ bool wxImageHandler::CanRead( const wxString& name )
 #if wxUSE_GUI
 
 #ifdef __WXGTK__
 #if wxUSE_GUI
 
 #ifdef __WXGTK__

-wxBitmap wxImage::ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue )
+wxBitmap wxImage::ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const

 {
     wxImage mono = this->ConvertToMono( red, green, blue );
     wxBitmap bitmap( mono, 1 );
 {
     wxImage mono = this->ConvertToMono( red, green, blue );
     wxBitmap bitmap( mono, 1 );