corrected the direction of comparisons between wxString and char/wxChar strings

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

diff --git a/include/wx/palmos/bitmap.h b/include/wx/palmos/bitmap.h
index f4f92cdc925de3340f1dd73d0a34e8c9983fa5d0..71f4d9bef96ebe3c6111d94633d9d59289a1f748 100644 (file)
--- a/include/wx/palmos/bitmap.h
+++ b/include/wx/palmos/bitmap.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/bitmap.h
 // Purpose:     wxBitmap class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/palmos/bitmap.h
 // Purpose:     wxBitmap class

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/13/04
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,10 +12,6 @@
 #ifndef _WX_BITMAP_H_
 #define _WX_BITMAP_H_
 
 #ifndef _WX_BITMAP_H_
 #define _WX_BITMAP_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "bitmap.h"
-#endif
-

 #include "wx/palmos/gdiimage.h"
 #include "wx/gdicmn.h"
 #include "wx/palette.h"
 #include "wx/palmos/gdiimage.h"
 #include "wx/gdicmn.h"
 #include "wx/palette.h"


@@ -45,21 +41,17 @@ public:
     // default ctor creates an invalid bitmap, you must Create() it later
     wxBitmap() { Init(); }
 
     // default ctor creates an invalid bitmap, you must Create() it later
     wxBitmap() { Init(); }
 

-    // Copy constructors
-    wxBitmap(const wxBitmap& bitmap) { Init(); Ref(bitmap); }
-

     // Initialize with raw data
     wxBitmap(const char bits[], int width, int height, int depth = 1);
 
     // Initialize with XPM data
     // Initialize with raw data
     wxBitmap(const char bits[], int width, int height, int depth = 1);
 
     // Initialize with XPM data

-    wxBitmap(const char **data) { CreateFromXpm(data); }
-    wxBitmap(char **data) { CreateFromXpm((const char **)data); }
+    wxBitmap(const char* const* data);

 
     // Load a file or resource
     wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_BMP_RESOURCE);
 
     // New constructor for generalised creation from data
 
     // Load a file or resource
     wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_BMP_RESOURCE);
 
     // New constructor for generalised creation from data

-    wxBitmap(void *data, long type, int width, int height, int depth = 1);
+    wxBitmap(const void* data, long type, int width, int height, int depth = 1);

 
     // Create a new, uninitialized bitmap of the given size and depth (if it
     // is omitted, will create a bitmap compatible with the display)
 
     // Create a new, uninitialized bitmap of the given size and depth (if it
     // is omitted, will create a bitmap compatible with the display)


@@ -85,13 +77,6 @@ public:
     // the copy ctor but the resulting bitmap is invalid!
     wxBitmap(const wxIcon& icon) { Init(); CopyFromIcon(icon); }
 
     // the copy ctor but the resulting bitmap is invalid!
     wxBitmap(const wxIcon& icon) { Init(); CopyFromIcon(icon); }
 

-    wxBitmap& operator=(const wxBitmap& bitmap)
-    {
-        if ( m_refData != bitmap.m_refData )
-            Ref(bitmap);
-        return *this;
-    }
-

     wxBitmap& operator=(const wxIcon& icon)
     {
         (void)CopyFromIcon(icon);
     wxBitmap& operator=(const wxIcon& icon)
     {
         (void)CopyFromIcon(icon);


@@ -128,7 +113,7 @@ public:
 
     virtual bool Create(int width, int height, int depth = -1);
     virtual bool Create(int width, int height, const wxDC& dc);
 
     virtual bool Create(int width, int height, int depth = -1);
     virtual bool Create(int width, int height, const wxDC& dc);

-    virtual bool Create(void *data, long type, int width, int height, int depth = 1);
+    virtual bool Create(const void* data, long type, int width, int height, int depth = 1);

     virtual bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE);
     virtual bool SaveFile(const wxString& name, int type, const wxPalette *cmap = NULL);
 
     virtual bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE);
     virtual bool SaveFile(const wxString& name, int type, const wxPalette *cmap = NULL);
 


@@ -147,9 +132,6 @@ public:
     wxMask *GetMask() const;
     void SetMask(wxMask *mask);
 
     wxMask *GetMask() const;
     void SetMask(wxMask *mask);
 

-    bool operator==(const wxBitmap& bitmap) const { return m_refData == bitmap.m_refData; }
-    bool operator!=(const wxBitmap& bitmap) const { return m_refData != bitmap.m_refData; }
-

     // these functions are internal and shouldn't be used, they risk to
     // disappear in the future
     bool HasAlpha() const;
     // these functions are internal and shouldn't be used, they risk to
     // disappear in the future
     bool HasAlpha() const;


@@ -173,9 +155,6 @@ protected:
 
     virtual wxGDIImageRefData *CreateData() const;
 
 
     virtual wxGDIImageRefData *CreateData() const;
 

-    // creates the bitmap from XPM data, supposed to be called from ctor
-    bool CreateFromXpm(const char **bits);
-

     // creates an uninitialized bitmap, called from Create()s above
     bool DoCreate(int w, int h, int depth, WXHDC hdc);
 
     // creates an uninitialized bitmap, called from Create()s above
     bool DoCreate(int w, int h, int depth, WXHDC hdc);
 


@@ -249,7 +228,7 @@ public:
     // keep wxBitmapHandler derived from wxGDIImageHandler compatible with the
     // old class which worked only with bitmaps
     virtual bool Create(wxBitmap *bitmap,
     // keep wxBitmapHandler derived from wxGDIImageHandler compatible with the
     // old class which worked only with bitmaps
     virtual bool Create(wxBitmap *bitmap,

-                        void *data,
+                        const void* data,

                         long flags,
                         int width, int height, int depth = 1);
     virtual bool LoadFile(wxBitmap *bitmap,
                         long flags,
                         int width, int height, int depth = 1);
     virtual bool LoadFile(wxBitmap *bitmap,


@@ -262,7 +241,7 @@ public:
                           const wxPalette *palette = NULL);
 
     virtual bool Create(wxGDIImage *image,
                           const wxPalette *palette = NULL);
 
     virtual bool Create(wxGDIImage *image,

-                        void *data,
+                        const void* data,

                         long flags,
                         int width, int height, int depth = 1);
     virtual bool Load(wxGDIImage *image,
                         long flags,
                         int width, int height, int depth = 1);
     virtual bool Load(wxGDIImage *image,