Add some version checks to help compiling on OSX.

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

diff --git a/src/palmos/bitmap.cpp b/src/palmos/bitmap.cpp
index 674aa379a903cc3e0859e8161f5a8d0a65f10e8d..9d255288349bfe3f3365bed2a0c569ef293946ed 100644 (file)
--- a/src/palmos/bitmap.cpp
+++ b/src/palmos/bitmap.cpp
@@ -77,10 +77,6 @@ public:
     wxPalette     m_bitmapPalette;
 #endif // wxUSE_PALETTE
 
     wxPalette     m_bitmapPalette;
 #endif // wxUSE_PALETTE
 

-#ifdef __WXDEBUG__
-    wxDC         *m_selectedInto;
-#endif // __WXDEBUG__
-

 #if wxUSE_WXDIB
     wxDIB *m_dib;
 #endif
 #if wxUSE_WXDIB
     wxDIB *m_dib;
 #endif


@@ -92,7 +88,7 @@ public:
 private:
     wxMask       *m_bitmapMask;
 
 private:
     wxMask       *m_bitmapMask;
 

-    DECLARE_NO_COPY_CLASS(wxBitmapRefData)
+    wxDECLARE_NO_COPY_CLASS(wxBitmapRefData);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -147,9 +143,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
 
 wxBitmapRefData::wxBitmapRefData()
 {
 
 wxBitmapRefData::wxBitmapRefData()
 {

-#ifdef __WXDEBUG__
-    m_selectedInto = NULL;
-#endif

     m_bitmapMask = NULL;
 
     m_hBitmap = (WXHBITMAP) NULL;
     m_bitmapMask = NULL;
 
     m_hBitmap = (WXHBITMAP) NULL;


@@ -198,19 +191,11 @@ bool wxBitmap::CopyFromDIB(const wxDIB& dib)
 
 #endif // NEVER_USE_DIB
 
 
 #endif // NEVER_USE_DIB
 

-wxBitmap::~wxBitmap()
-{
-}
-

 wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
 {
     Init();
 }
 
 wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
 {
     Init();
 }
 

-wxBitmap::wxBitmap(int w, int h, int d)
-{
-}
-

 wxBitmap::wxBitmap(int w, int h, const wxDC& dc)
 {
 }
 wxBitmap::wxBitmap(int w, int h, const wxDC& dc)
 {
 }


@@ -309,24 +294,15 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 #if wxUSE_PALETTE
 wxPalette* wxBitmap::GetPalette() const
 {
 #if wxUSE_PALETTE
 wxPalette* wxBitmap::GetPalette() const
 {

-    return (wxPalette *) NULL;
+    return NULL;

 }
 #endif
 
 wxMask *wxBitmap::GetMask() const
 {
 }
 #endif
 
 wxMask *wxBitmap::GetMask() const
 {

-    return (wxMask *) NULL;
-}
-
-#ifdef __WXDEBUG__
-
-wxDC *wxBitmap::GetSelectedInto() const
-{
-    return (wxDC *) NULL;
+    return NULL;

 }
 
 }
 

-#endif
-

 bool wxBitmap::HasAlpha() const
 {
     return false;
 bool wxBitmap::HasAlpha() const
 {
     return false;


@@ -336,14 +312,6 @@ bool wxBitmap::HasAlpha() const
 // wxBitmap setters
 // ----------------------------------------------------------------------------
 
 // wxBitmap setters
 // ----------------------------------------------------------------------------
 

-#ifdef __WXDEBUG__
-
-void wxBitmap::SetSelectedInto(wxDC *dc)
-{
-}
-
-#endif
-

 #if wxUSE_PALETTE
 
 void wxBitmap::SetPalette(const wxPalette& palette)
 #if wxUSE_PALETTE
 
 void wxBitmap::SetPalette(const wxPalette& palette)