Last part from weak ref patch for event sink disconnection

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 1aadd87f6d9b6e48d0519eb6ab089e6360bb5ea5..5cc7ed1c1c6aba9546a4ffb12a8e7ca014b2f635 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -11,7 +11,7 @@
 #define _WX_GTK_BITMAP_H_
 
 typedef struct _GdkPixbuf GdkPixbuf;
-class WXDLLEXPORT wxPixelDataBase;
+class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
 
 //-----------------------------------------------------------------------------
 // wxMask
@@ -54,7 +54,7 @@ public:
     wxBitmap( int width, int height, int depth = -1 );
     wxBitmap( const char bits[], int width, int height, int depth = 1 );
     wxBitmap( const char* const* bits );
-#if defined (__GNUC__) && __GNUC__ < 3
+#ifdef wxNEEDS_CHARPP
     // needed for old GCC
     wxBitmap(char** data)
     {
@@ -62,20 +62,20 @@ public:
     }
 #endif
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
+#if wxUSE_IMAGE
     wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
+#endif // wxUSE_IMAGE
     virtual ~wxBitmap();
-    bool operator == ( const wxBitmap& bmp ) const;
-    bool operator != ( const wxBitmap& bmp ) const { return !(*this == bmp); }
-    bool Ok() const { return IsOk(); }
-    bool IsOk() const;
 
     bool Create(int width, int height, int depth = -1);
 
-    int GetHeight() const;
-    int GetWidth() const;
-    int GetDepth() const;
+    virtual int GetHeight() const;
+    virtual int GetWidth() const;
+    virtual int GetDepth() const;
 
+#if wxUSE_IMAGE
     wxImage ConvertToImage() const;
+#endif // wxUSE_IMAGE
 
     // copies the contents and mask of the given (colour) icon to the bitmap
     virtual bool CopyFromIcon(const wxIcon& icon);
@@ -119,19 +119,24 @@ public:
     void UngetRawData(wxPixelDataBase& data);
 
     bool HasAlpha() const;
-    void UseAlpha();
 
 protected:
+#if wxUSE_IMAGE
     bool CreateFromImage(const wxImage& image, int depth);
+#endif // wxUSE_IMAGE
 
-    virtual wxObjectRefData* CreateRefData() const;
-    virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;
+    virtual wxGDIRefData* CreateGDIRefData() const;
+    virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;
 
 private:
+#if wxUSE_IMAGE
     // to be called from CreateFromImage only!
     bool CreateFromImageAsPixmap(const wxImage& image, int depth);
     bool CreateFromImageAsPixbuf(const wxImage& image);
+#endif // wxUSE_IMAGE
 
+public:
+    // implementation only
     enum Representation
     {
         Pixmap,
@@ -141,9 +146,6 @@ private:
     // (wxBitmap may keep same bitmap e.g. as both pixmap and pixbuf):
     void PurgeOtherRepresentations(Representation keep);
 
-    friend class wxMemoryDC;
-    friend class wxBitmapHandler;
-
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };