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 29649632b977dbc565be4880b67074f01141d2b4..0936677dd20ee0628dfa61ddf390a767de00d7b0 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -113,11 +113,9 @@ public:
     void SetWidth( int width );
     void SetDepth( int depth );
     void SetPixmap( GdkPixmap *pixmap );
     void SetWidth( int width );
     void SetDepth( int depth );
     void SetPixmap( GdkPixmap *pixmap );

-    void SetBitmap( GdkBitmap *bitmap );

     void SetPixbuf(GdkPixbuf *pixbuf);
 
     GdkPixmap *GetPixmap() const;
     void SetPixbuf(GdkPixbuf *pixbuf);
 
     GdkPixmap *GetPixmap() const;

-    GdkBitmap *GetBitmap() const;

     bool HasPixmap() const;
     bool HasPixbuf() const;
     GdkPixbuf *GetPixbuf() const;
     bool HasPixmap() const;
     bool HasPixbuf() const;
     GdkPixbuf *GetPixbuf() const;


@@ -138,9 +136,7 @@ protected:
 
 private:
     // to be called from CreateFromImage only!
 
 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
     bool CreateFromImageAsPixbuf(const wxImage& image);
 
     enum Representation