adding an autorelease capability (got weird crashes when deleting tools from a toolba...

[wxWidgets.git] / include / wx / mac / carbon / metafile.h

diff --git a/include/wx/mac/carbon/metafile.h b/include/wx/mac/carbon/metafile.h
index 93ff61d9e650d3a33863ef7ee3f1a1e7b36b3e6c..da46526593f9d1da9cc7b41a1637ad1d8ebed350 100644 (file)
--- a/include/wx/mac/carbon/metafile.h
+++ b/include/wx/mac/carbon/metafile.h
@@ -39,20 +39,16 @@ class WXDLLEXPORT wxMetafile: public wxGDIObject
 {
     DECLARE_DYNAMIC_CLASS(wxMetafile)
 public:
-    // Copy constructor
-    wxMetafile(const wxMetafile& metafile)
-      : wxGDIObject()
-    { Ref(metafile); }
-
     wxMetafile(const wxString& file = wxEmptyString);
-    ~wxMetafile(void);
+    virtual ~wxMetafile(void);
 
     // After this is called, the metafile cannot be used for anything
     // since it is now owned by the clipboard.
     virtual bool SetClipboard(int width = 0, int height = 0);
 
     virtual bool Play(wxDC *dc);
-    bool Ok() const ;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const ;
 
     wxSize GetSize() const;
     int GetWidth() const { return GetSize().x; }
@@ -61,13 +57,6 @@ public:
     // Implementation
     WXHMETAFILE GetHMETAFILE() const ;
     void SetHMETAFILE(WXHMETAFILE mf) ;
-
-    // Operators
-    inline wxMetafile& operator = (const wxMetafile& metafile) { if (*this == metafile) return (*this); Ref(metafile); return *this; }
-    inline bool operator == (const wxMetafile& metafile) const { return m_refData == metafile.m_refData; }
-    inline bool operator != (const wxMetafile& metafile) const { return m_refData != metafile.m_refData; }
-
-protected:
 };
 
 class WXDLLEXPORT wxMetafileDC: public wxDC
@@ -81,7 +70,7 @@ class WXDLLEXPORT wxMetafileDC: public wxDC
                     int width = 0, int height = 0,
                     const wxString& description = wxEmptyString);
 
-  ~wxMetafileDC(void);
+  virtual ~wxMetafileDC(void);
 
   // Should be called at end of drawing
   virtual wxMetafile *Close(void);