pen.h depends from brush.h in compat mode

[wxWidgets.git] / src / gtk1 / bitmap.cpp

diff --git a/src/gtk1/bitmap.cpp b/src/gtk1/bitmap.cpp
index c5d1e1685f4fe96705e4255fe993728a0b08ffd9..daa51e4dc566f88f42f43a6d8d4b8273cc2f1879 100644 (file)
--- a/src/gtk1/bitmap.cpp
+++ b/src/gtk1/bitmap.cpp
@@ -224,7 +224,7 @@ GdkBitmap *wxMask::GetBitmap() const
 // wxBitmap
 //-----------------------------------------------------------------------------
 
 // wxBitmap
 //-----------------------------------------------------------------------------
 

-class wxBitmapRefData: public wxObjectRefData
+class wxBitmapRefData : public wxGDIRefData

 {
 public:
     wxBitmapRefData();
 {
 public:
     wxBitmapRefData();


@@ -232,6 +232,8 @@ public:
     bool Create(int width, int height, int bpp);
     virtual ~wxBitmapRefData();
 
     bool Create(int width, int height, int bpp);
     virtual ~wxBitmapRefData();
 

+    virtual bool IsOk() const { return m_pixmap || m_bitmap; }
+

     GdkPixmap      *m_pixmap;
     GdkBitmap      *m_bitmap;
     wxMask         *m_mask;
     GdkPixmap      *m_pixmap;
     GdkBitmap      *m_bitmap;
     wxMask         *m_mask;


@@ -360,12 +362,12 @@ wxBitmap::wxBitmap( int width, int height, int depth )
     Create( width, height, depth );
 }
 
     Create( width, height, depth );
 }
 

-wxObjectRefData *wxBitmap::CreateRefData() const
+wxGDIRefData *wxBitmap::CreateGDIRefData() const

 {
     return new wxBitmapRefData;
 }
 
 {
     return new wxBitmapRefData;
 }
 

-wxObjectRefData *wxBitmap::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxBitmap::CloneGDIRefData(const wxGDIRefData *data) const

 {
     return new wxBitmapRefData(*wx_static_cast(const wxBitmapRefData *, data));
 }
 {
     return new wxBitmapRefData(*wx_static_cast(const wxBitmapRefData *, data));
 }


@@ -1137,12 +1139,6 @@ wxBitmap::~wxBitmap()
 {
 }
 
 {
 }
 

-bool wxBitmap::IsOk() const
-{
-    return (m_refData != NULL) &&
-           (M_BMPDATA->m_bitmap || M_BMPDATA->m_pixmap);
-}
-

 int wxBitmap::GetHeight() const
 {
     wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );
 int wxBitmap::GetHeight() const
 {
     wxCHECK_MSG( Ok(), -1, wxT("invalid bitmap") );


@@ -1363,7 +1359,7 @@ GdkBitmap *wxBitmap::GetBitmap() const
     return M_BMPDATA->m_bitmap;
 }
 
     return M_BMPDATA->m_bitmap;
 }
 

-void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
+void *wxBitmap::GetRawData(wxPixelDataBase& WXUNUSED(data), int WXUNUSED(bpp))

 {
     return NULL;
 }
 {
     return NULL;
 }


@@ -1377,10 +1373,6 @@ bool wxBitmap::HasAlpha() const
     return false;
 }
 
     return false;
 }
 

-void wxBitmap::UseAlpha()
-{
-}
-

 //-----------------------------------------------------------------------------
 // wxBitmapHandler
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxBitmapHandler
 //-----------------------------------------------------------------------------