Corrected VC++ compilo (not yet tested)

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 33ec0f68bee8b1eda2074d35686f0de68b680f3f..0936677dd20ee0628dfa61ddf390a767de00d7b0 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -71,11 +71,9 @@ public:
     wxBitmap( const char bits[], int width, int height, int depth = 1 );
     wxBitmap( const char **bits ) { (void)CreateFromXpm(bits); }
     wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); }
-    wxBitmap( const wxBitmap& bmp );
     wxBitmap( const wxString &filename, wxBitmapType 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;
     bool operator != ( const wxBitmap& bmp ) const;
     bool Ok() const;
@@ -115,11 +113,9 @@ public:
     void SetWidth( int width );
     void SetDepth( int depth );
     void SetPixmap( GdkPixmap *pixmap );
-    void SetBitmap( GdkBitmap *bitmap );
     void SetPixbuf(GdkPixbuf *pixbuf);
 
     GdkPixmap *GetPixmap() const;
-    GdkBitmap *GetBitmap() const;
     bool HasPixmap() const;
     bool HasPixbuf() const;
     GdkPixbuf *GetPixbuf() const;
@@ -140,9 +136,7 @@ protected:
 
 private:
     // to be called from CreateFromImage only!
-    bool CreateFromImageAsBitmap(const wxImage& image);
-    bool CreateFromImageAsPixmap(const wxImage& image);
-
+    bool CreateFromImageAsPixmap(const wxImage& image, int depth);
     bool CreateFromImageAsPixbuf(const wxImage& image);
 
     enum Representation