fixed bug with the caret positioning after SetValue() introduced by the last commit

[wxWidgets.git] / include / wx / image.h

diff --git a/include/wx/image.h b/include/wx/image.h
index f814deabba677bb0f67f37d58cc2b8b945088d78..661c514d8143c016b30bc82dbbc6fcf69c9c70d0 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -103,7 +103,6 @@ public:
 #if wxUSE_GUI
     // convertion to/from wxBitmap (deprecated, use wxBitmap's methods instead):
     wxImage( const wxBitmap &bitmap );
 #if wxUSE_GUI
     // convertion to/from wxBitmap (deprecated, use wxBitmap's methods instead):
     wxImage( const wxBitmap &bitmap );

-    operator wxBitmap() const { return ConvertToBitmap(); }

     wxBitmap ConvertToBitmap() const;
 #ifdef __WXGTK__
     wxBitmap ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const;
     wxBitmap ConvertToBitmap() const;
 #ifdef __WXGTK__
     wxBitmap ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const;


@@ -152,6 +151,15 @@ public:
     unsigned char GetGreen( int x, int y ) const;
     unsigned char GetBlue( int x, int y ) const;
 
     unsigned char GetGreen( int x, int y ) const;
     unsigned char GetBlue( int x, int y ) const;
 

+    // find first colour that is not used in the image and has higher
+    // RGB values than <startR,startG,startB>
+    bool FindFirstUnusedColour( unsigned char *r, unsigned char *g, unsigned char *b,
+                                unsigned char startR = 1, unsigned char startG = 0, 
+                                unsigned char startB = 0 );
+    // Set image's mask to the area of 'mask' that has <r,g,b> colour
+    bool SetMaskFromImage(const wxImage & mask, 
+                          unsigned char mr, unsigned char mg, unsigned char mb);
+

     static bool CanRead( const wxString& name );
     virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_ANY );
     virtual bool LoadFile( const wxString& name, const wxString& mimetype );
     static bool CanRead( const wxString& name );
     virtual bool LoadFile( const wxString& name, long type = wxBITMAP_TYPE_ANY );
     virtual bool LoadFile( const wxString& name, const wxString& mimetype );


@@ -186,10 +194,12 @@ public:
     void SetMask( bool mask = TRUE );
     bool HasMask() const;
 
     void SetMask( bool mask = TRUE );
     bool HasMask() const;
 

+#if wxUSE_PALETTE

     // Palette functions
     bool HasPalette() const;
     const wxPalette& GetPalette() const;
     void SetPalette(const wxPalette& palette);
     // Palette functions
     bool HasPalette() const;
     const wxPalette& GetPalette() const;
     void SetPalette(const wxPalette& palette);

+#endif // wxUSE_PALETTE

 
     // Option functions (arbitrary name/value mapping)
     void SetOption(const wxString& name, const wxString& value);
 
     // Option functions (arbitrary name/value mapping)
     void SetOption(const wxString& name, const wxString& value);