forwardported a 2.6 branch fix for misplaced define

[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 2b528efeca862bfc71ffb87de0281b583e66fc86..add0be172af9a2c882c9aed80fa21d3ebc9eedde 100644 (file)
--- a/include/wx/mac/carbon/metafile.h
+++ b/include/wx/mac/carbon/metafile.h
@@ -15,7 +15,6 @@
 #ifndef _WX_METAFIILE_H_
 #define _WX_METAFIILE_H_
 
-#if wxUSE_METAFILE
 #include "wx/dc.h"
 #include "wx/gdiobj.h"
 
@@ -32,17 +31,7 @@
 #define wxMetaFileDC wxMetafileDC
 
 class WXDLLEXPORT wxMetafile;
-
-class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData
-{
-    friend class WXDLLEXPORT wxMetafile;
-public:
-    wxMetafileRefData(void);
-    ~wxMetafileRefData(void);
-
-public:
-    WXHMETAFILE m_metafile;
-};
+class wxMetafileRefData ;
 
 #define M_METAFILEDATA ((wxMetafileRefData *)m_refData)
 
@@ -50,11 +39,6 @@ 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);
 
@@ -63,20 +47,19 @@ public:
     virtual bool SetClipboard(int width = 0, int height = 0);
 
     virtual bool Play(wxDC *dc);
-    inline bool Ok(void) const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); };
+    bool Ok() const ;
 
     wxSize GetSize() const;
     int GetWidth() const { return GetSize().x; }
     int GetHeight() const { return GetSize().y; }
 
     // Implementation
-    inline WXHMETAFILE GetHMETAFILE() const { return M_METAFILEDATA->m_metafile; }
+    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) { return m_refData == metafile.m_refData; }
-    inline bool operator != (const wxMetafile& metafile) { 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; }
 
 protected:
 };
@@ -96,13 +79,14 @@ class WXDLLEXPORT wxMetafileDC: public wxDC
 
   // 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:
+    virtual void DoGetSize(int *width, int *height) const;
+
   wxMetafile*   m_metaFile;
 };
 
@@ -159,8 +143,5 @@ protected:
 };
 #endif
 
-#endif // wxUSE_METAFILE
-
-
 #endif
     // _WX_METAFIILE_H_