Applied patch [ 581139 ] Misc wxCmdLineParser changes/fixes

[wxWidgets.git] / include / wx / gtk / bitmap.h

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 41959d5ba6326fd0095af719e661f5e7244088be..3de03236153221e6b60d863221369668cdd28a30 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -27,6 +27,7 @@
 
 class wxMask;
 class wxBitmap;
 
 class wxMask;
 class wxBitmap;

+class wxImage;

 
 //-----------------------------------------------------------------------------
 // wxMask
 
 //-----------------------------------------------------------------------------
 // wxMask


@@ -68,6 +69,7 @@ public:
     wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); }
     wxBitmap( const wxBitmap& bmp );
     wxBitmap( const wxString &filename, int type = wxBITMAP_TYPE_XPM );
     wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); }
     wxBitmap( const wxBitmap& bmp );
     wxBitmap( const wxString &filename, int type = wxBITMAP_TYPE_XPM );

+    wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }

     ~wxBitmap();
     wxBitmap& operator = ( const wxBitmap& bmp );
     bool operator == ( const wxBitmap& bmp ) const;
     ~wxBitmap();
     wxBitmap& operator = ( const wxBitmap& bmp );
     bool operator == ( const wxBitmap& bmp ) const;


@@ -79,6 +81,11 @@ public:
     int GetHeight() const;
     int GetWidth() const;
     int GetDepth() const;
     int GetHeight() const;
     int GetWidth() const;
     int GetDepth() const;

+    
+    wxImage ConvertToImage() const;
+
+    // copies the contents and mask of the given (colour) icon to the bitmap
+    virtual bool CopyFromIcon(const wxIcon& icon);

 
     wxMask *GetMask() const;
     void SetMask( wxMask *mask );
 
     wxMask *GetMask() const;
     void SetMask( wxMask *mask );


@@ -106,6 +113,7 @@ public:
     
 protected:
     bool CreateFromXpm(const char **bits);
     
 protected:
     bool CreateFromXpm(const char **bits);

+    bool CreateFromImage(const wxImage& image, int depth);

 
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)