Applied wxGauge:Pulse() patch.

[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 7bf91023d10c7dab99c5a05fed7cd426244400e6..d959a386a90da1f3831b27e25fc493384180514f 100644 (file)
--- a/include/wx/mac/carbon/metafile.h
+++ b/include/wx/mac/carbon/metafile.h
@@ -39,13 +39,8 @@ class WXDLLEXPORT wxMetafile: public wxGDIObject
 {
     DECLARE_DYNAMIC_CLASS(wxMetafile)
 public:
 {
     DECLARE_DYNAMIC_CLASS(wxMetafile)
 public:

-    // Copy constructor
-    wxMetafile(const wxMetafile& metafile)
-      : wxGDIObject()
-    { Ref(metafile); }
-

     wxMetafile(const wxString& file = wxEmptyString);
     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.
 
     // After this is called, the metafile cannot be used for anything
     // since it is now owned by the clipboard.


@@ -63,7 +58,6 @@ public:
     void SetHMETAFILE(WXHMETAFILE mf) ;
 
     // Operators
     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; }
 
     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; }
 


@@ -81,17 +75,18 @@ class WXDLLEXPORT wxMetafileDC: public wxDC
                     int width = 0, int height = 0,
                     const wxString& description = wxEmptyString);
 
                     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);
 
   // Should be called at end of drawing
   virtual wxMetafile *Close(void);

-  virtual void DoGetSize(int *width, int *height) const ;

 
   // Implementation
   inline wxMetafile *GetMetaFile(void) const { return m_metaFile; }
   inline void SetMetaFile(wxMetafile *mf) { m_metaFile = mf; }
 
 protected:
 
   // Implementation
   inline wxMetafile *GetMetaFile(void) const { return m_metaFile; }
   inline void SetMetaFile(wxMetafile *mf) { m_metaFile = mf; }
 
 protected:

+    virtual void DoGetSize(int *width, int *height) const;
+

   wxMetafile*   m_metaFile;
 };
 
   wxMetafile*   m_metaFile;
 };