X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e273151278d28cceefe6eee8c49bc6915306805d..74a8f67d96591cec101def2a7d47c64072aff7fd:/src/palmos/bitmap.cpp

diff --git a/src/palmos/bitmap.cpp b/src/palmos/bitmap.cpp
index 1129bca534..9d25528834 100644
--- a/src/palmos/bitmap.cpp
+++ b/src/palmos/bitmap.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "bitmap.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -28,6 +24,8 @@
     #pragma hdrstop
 #endif
 
+#include "wx/bitmap.h"
+
 #ifndef WX_PRECOMP
     #include <stdio.h>
 
@@ -36,23 +34,17 @@
     #include "wx/app.h"
     #include "wx/palette.h"
     #include "wx/dcmemory.h"
-    #include "wx/bitmap.h"
     #include "wx/icon.h"
+    #include "wx/log.h"
+    #include "wx/image.h"
 #endif
 
-#include "wx/log.h"
-
 #if wxUSE_WXDIB
 #include "wx/palmos/dib.h"
 #endif
 
-#include "wx/image.h"
 #include "wx/xpmdecod.h"
 
-#ifdef wxHAVE_RAW_BITMAP
-#include "wx/rawbmp.h"
-#endif
-
 // missing from mingw32 header
 #ifndef CLR_INVALID
     #define CLR_INVALID ((COLORREF)-1)
@@ -85,10 +77,6 @@ public:
     wxPalette     m_bitmapPalette;
 #endif // wxUSE_PALETTE
 
-#ifdef __WXDEBUG__
-    wxDC         *m_selectedInto;
-#endif // __WXDEBUG__
-
 #if wxUSE_WXDIB
     wxDIB *m_dib;
 #endif
@@ -100,7 +88,7 @@ public:
 private:
     wxMask       *m_bitmapMask;
 
-    DECLARE_NO_COPY_CLASS(wxBitmapRefData)
+    wxDECLARE_NO_COPY_CLASS(wxBitmapRefData);
 };
 
 // ----------------------------------------------------------------------------
@@ -155,9 +143,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
 
 wxBitmapRefData::wxBitmapRefData()
 {
-#ifdef __WXDEBUG__
-    m_selectedInto = NULL;
-#endif
     m_bitmapMask = NULL;
 
     m_hBitmap = (WXHBITMAP) NULL;
@@ -206,34 +191,16 @@ bool wxBitmap::CopyFromDIB(const wxDIB& dib)
 
 #endif // NEVER_USE_DIB
 
-wxBitmap::~wxBitmap()
-{
-}
-
 wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
 {
     Init();
 }
 
-// Create from XPM data
-#if wxUSE_IMAGE && wxUSE_XPM
-bool wxBitmap::CreateFromXpm(const char **data)
-#else
-bool wxBitmap::CreateFromXpm(const char **WXUNUSED(data))
-#endif
-{
-    return false;
-}
-
-wxBitmap::wxBitmap(int w, int h, int d)
-{
-}
-
 wxBitmap::wxBitmap(int w, int h, const wxDC& dc)
 {
 }
 
-wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth)
+wxBitmap::wxBitmap(const void* data, long type, int width, int height, int depth)
 {
 }
 
@@ -298,7 +265,7 @@ bool wxBitmap::LoadFile(const wxString& filename, long type)
     return false;
 }
 
-bool wxBitmap::Create(void *data, long type, int width, int height, int depth)
+bool wxBitmap::Create(const void* data, long type, int width, int height, int depth)
 {
     return false;
 }
@@ -327,26 +294,13 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const
 #if wxUSE_PALETTE
 wxPalette* wxBitmap::GetPalette() const
 {
-    return (wxPalette *) NULL;
+    return NULL;
 }
 #endif
 
 wxMask *wxBitmap::GetMask() const
 {
-    return (wxMask *) NULL;
-}
-
-#ifdef __WXDEBUG__
-
-wxDC *wxBitmap::GetSelectedInto() const
-{
-    return (wxDC *) NULL;
-}
-
-#endif
-
-void wxBitmap::UseAlpha()
-{
+    return NULL;
 }
 
 bool wxBitmap::HasAlpha() const
@@ -358,14 +312,6 @@ bool wxBitmap::HasAlpha() const
 // wxBitmap setters
 // ----------------------------------------------------------------------------
 
-#ifdef __WXDEBUG__
-
-void wxBitmap::SetSelectedInto(wxDC *dc)
-{
-}
-
-#endif
-
 #if wxUSE_PALETTE
 
 void wxBitmap::SetPalette(const wxPalette& palette)
@@ -382,18 +328,6 @@ void wxBitmap::SetMask(wxMask *mask)
 // raw bitmap access support
 // ----------------------------------------------------------------------------
 
-#ifdef wxHAVE_RAW_BITMAP
-void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
-{
-    return NULL;
-}
-
-void wxBitmap::UngetRawData(wxPixelDataBase& dataBase)
-{
-    return;
-}
-#endif // #ifdef wxHAVE_RAW_BITMAP
-
 // ----------------------------------------------------------------------------
 // wxMask
 // ----------------------------------------------------------------------------
@@ -449,7 +383,7 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 // ----------------------------------------------------------------------------
 
 bool wxBitmapHandler::Create(wxGDIImage *image,
-                             void *data,
+                             const void* data,
                              long flags,
                              int width, int height, int depth)
 {
@@ -472,7 +406,7 @@ bool wxBitmapHandler::Save(wxGDIImage *image,
 }
 
 bool wxBitmapHandler::Create(wxBitmap *WXUNUSED(bitmap),
-                             void *WXUNUSED(data),
+                             const void* WXUNUSED(data),
                              long WXUNUSED(type),
                              int WXUNUSED(width),
                              int WXUNUSED(height),