Added DoLoadFile, DoSaveFile to wxTextCtrlBase

[wxWidgets.git] / include / wx / mac / classic / bitmap.h

diff --git a/include/wx/mac/classic/bitmap.h b/include/wx/mac/classic/bitmap.h
index 428c0e19a923a6d8b74d57db40d75be1d122f08e..c20a8a41bc9d3c3ec65bf2575c6ed552c6979dce 100644 (file)
--- a/include/wx/mac/classic/bitmap.h
+++ b/include/wx/mac/classic/bitmap.h
@@ -6,16 +6,12 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #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/palette.h"
 
 // Bitmap
 #include "wx/palette.h"
 
 // Bitmap


@@ -50,7 +46,7 @@ public:
   // Construct a mask from a mono bitmap (copies the bitmap).
   wxMask(const wxBitmap& bitmap);
 
   // Construct a mask from a mono bitmap (copies the bitmap).
   wxMask(const wxBitmap& bitmap);
 

-  ~wxMask();
+  virtual ~wxMask();

 
   bool Create(const wxBitmap& bitmap, const wxColour& colour);
   bool Create(const wxBitmap& bitmap, int paletteIndex);
 
   bool Create(const wxBitmap& bitmap, const wxColour& colour);
   bool Create(const wxBitmap& bitmap, int paletteIndex);


@@ -78,7 +74,7 @@ class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
     friend class WXDLLEXPORT wxCursor;
 public:
     wxBitmapRefData();
     friend class WXDLLEXPORT wxCursor;
 public:
     wxBitmapRefData();

-    ~wxBitmapRefData();
+    virtual ~wxBitmapRefData();

 
 public:
   int           m_width;
 
 public:
   int           m_width;


@@ -137,11 +133,6 @@ class WXDLLEXPORT wxBitmap: public wxBitmapBase
 public:
   wxBitmap(); // Platform-specific
 
 public:
   wxBitmap(); // Platform-specific
 

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

   // 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);
 


@@ -162,7 +153,7 @@ public:
   // Convert from wxImage:
   wxBitmap(const wxImage& image, int depth = -1);
   
   // Convert from wxImage:
   wxBitmap(const wxImage& image, int depth = -1);
   

-  ~wxBitmap();
+  virtual ~wxBitmap();

   
   wxImage ConvertToImage() const;
 
   
   wxImage ConvertToImage() const;
 


@@ -198,7 +189,6 @@ public:
 
   int GetBitmapType() const;
   
 
   int GetBitmapType() const;
   

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

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