make DoSetSizeHints protected, remove parameter defaults

[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..d0056405066fe53d7b0e32e863a34e282afd3b55 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_
 
 #ifndef _WX_METAFIILE_H_
 #define _WX_METAFIILE_H_
 

-#if wxUSE_METAFILE

 #include "wx/dc.h"
 #include "wx/gdiobj.h"
 
 #include "wx/dc.h"
 #include "wx/gdiobj.h"
 


@@ -31,18 +30,8 @@
 #define wxMetaFile wxMetafile
 #define wxMetaFileDC wxMetafileDC
 
 #define wxMetaFile wxMetafile
 #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 WXDLLIMPEXP_FWD_CORE wxMetafile;
+class wxMetafileRefData ;

 
 #define M_METAFILEDATA ((wxMetafileRefData *)m_refData)
 
 
 #define M_METAFILEDATA ((wxMetafileRefData *)m_refData)
 


@@ -50,35 +39,28 @@ 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.
     virtual bool SetClipboard(int width = 0, int height = 0);
 
     virtual bool Play(wxDC *dc);
 
     // 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);

-    inline bool Ok(void) const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); };
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const ;

 
     wxSize GetSize() const;
     int GetWidth() const { return GetSize().x; }
     int GetHeight() const { return GetSize().y; }
 
     // Implementation
 
     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) ;
     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; }
-
-protected:
+    // Since the native metafile format is PDF for Quartz
+    // we need a call that allows setting PICT content for
+    // backwards compatibility
+    void SetPICT(void* pictHandle) ;

 };
 
 class WXDLLEXPORT wxMetafileDC: public wxDC
 };
 
 class WXDLLEXPORT wxMetafileDC: public wxDC


@@ -92,17 +74,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;
 };
 


@@ -159,8 +142,5 @@ protected:
 };
 #endif
 
 };
 #endif
 

-#endif // wxUSE_METAFILE
-
-

 #endif
     // _WX_METAFIILE_H_
 #endif
     // _WX_METAFIILE_H_