correct access for virtuals

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

diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index 017578e01655cdc94b488288e7f617436f4a91c7..50fa1d12716c1eeee92a38d28b79e99b1ad34e9c 100644 (file)
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -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/msw/gdiimage.h"
 #include "wx/gdicmn.h"
 #include "wx/palette.h"
 #include "wx/msw/gdiimage.h"
 #include "wx/gdicmn.h"
 #include "wx/palette.h"


@@ -43,10 +39,7 @@ class WXDLLEXPORT wxBitmap : public wxGDIImage
 {
 public:
     // default ctor creates an invalid bitmap, you must Create() it later
 {
 public:
     // default ctor creates an invalid bitmap, you must Create() it later

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

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


@@ -83,14 +76,7 @@ public:
 
     // we must have this, otherwise icons are silently copied into bitmaps using
     // the copy ctor but the resulting bitmap is invalid!
 
     // we must have this, otherwise icons are silently copied into bitmaps using
     // 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(const wxIcon& icon) { CopyFromIcon(icon); }

 
     wxBitmap& operator=(const wxIcon& icon)
     {
 
     wxBitmap& operator=(const wxIcon& icon)
     {


@@ -145,6 +131,7 @@ public:
 #endif // wxUSE_PALETTE
 
     wxMask *GetMask() const;
 #endif // wxUSE_PALETTE
 
     wxMask *GetMask() const;

+    wxBitmap GetMaskBitmap() const;

     void SetMask(wxMask *mask);
 
     bool operator==(const wxBitmap& bitmap) const { return m_refData == bitmap.m_refData; }
     void SetMask(wxMask *mask);
 
     bool operator==(const wxBitmap& bitmap) const { return m_refData == bitmap.m_refData; }


@@ -162,17 +149,6 @@ public:
     wxDEPRECATED( void SetQuality(int quality) );
 #endif // WXWIN_COMPATIBILITY_2_4
 
     wxDEPRECATED( void SetQuality(int quality) );
 #endif // WXWIN_COMPATIBILITY_2_4
 

-#if WXWIN_COMPATIBILITY_2
-    void SetOk(bool isOk);
-#endif // WXWIN_COMPATIBILITY_2
-
-#if WXWIN_COMPATIBILITY
-#if wxUSE_PALETTE
-    wxPalette *GetColourMap() const { return GetPalette(); }
-    void SetColourMap(wxPalette *cmap) { SetPalette(*cmap); };
-#endif // wxUSE_PALETTE
-#endif // WXWIN_COMPATIBILITY
-

     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------
 


@@ -186,10 +162,8 @@ public:
 #endif // __WXDEBUG__
 
 protected:
 #endif // __WXDEBUG__
 
 protected:

-    // common part of all ctors
-    void Init();
-

     virtual wxGDIImageRefData *CreateData() const;
     virtual wxGDIImageRefData *CreateData() const;

+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;

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


@@ -209,10 +183,9 @@ protected:
 #endif // wxUSE_IMAGE
 
 private:
 #endif // wxUSE_IMAGE
 
 private:

-#ifdef __WIN32__

     // common part of CopyFromIcon/CopyFromCursor for Win32
     bool CopyFromIconOrCursor(const wxGDIImage& icon);
     // common part of CopyFromIcon/CopyFromCursor for Win32
     bool CopyFromIconOrCursor(const wxGDIImage& icon);

-#endif // __WIN32__
+

 
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };
 
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };