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 9353049eb3fa450e67f1ad9d07f9f1d010911cdf..5cc7ed1c1c6aba9546a4ffb12a8e7ca014b2f635 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -62,18 +62,20 @@ public:
     }
 #endif
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
     }
 #endif
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );

+#if wxUSE_IMAGE

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

+#endif // wxUSE_IMAGE

     virtual ~wxBitmap();
     virtual ~wxBitmap();

-    bool Ok() const { return IsOk(); }
-    bool IsOk() const;

 
     bool Create(int width, int height, int depth = -1);
 
 
     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;
     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);
 
     // copies the contents and mask of the given (colour) icon to the bitmap
     virtual bool CopyFromIcon(const wxIcon& icon);


@@ -117,19 +119,24 @@ public:
     void UngetRawData(wxPixelDataBase& data);
 
     bool HasAlpha() const;
     void UngetRawData(wxPixelDataBase& data);
 
     bool HasAlpha() const;

-    void UseAlpha();

 
 protected:
 
 protected:

+#if wxUSE_IMAGE

     bool CreateFromImage(const wxImage& image, int depth);
     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:
 
 private:

+#if wxUSE_IMAGE

     // to be called from CreateFromImage only!
     bool CreateFromImageAsPixmap(const wxImage& image, int depth);
     bool CreateFromImageAsPixbuf(const wxImage& 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,
     enum Representation
     {
         Pixmap,


@@ -139,9 +146,6 @@ private:
     // (wxBitmap may keep same bitmap e.g. as both pixmap and pixbuf):
     void PurgeOtherRepresentations(Representation keep);
 
     // (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)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };