X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0b140baaa614e0c37028b288f0948b664c549329..ea8f6fc718c121d91e5026840d3f22160d83e512:/include/wx/mac/metafile.h?ds=sidebyside

diff --git a/include/wx/mac/metafile.h b/include/wx/mac/metafile.h
index f6334a434d..2b528efeca 100644
--- a/include/wx/mac/metafile.h
+++ b/include/wx/mac/metafile.h
@@ -3,12 +3,12 @@
 // Purpose:     wxMetaFile, wxMetaFileDC classes.
 //              This probably should be restricted to Windows platforms,
 //              but if there is an equivalent on your platform, great.
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -41,37 +41,42 @@ public:
     ~wxMetafileRefData(void);
 
 public:
-    PicHandle m_metafile;
+    WXHMETAFILE m_metafile;
 };
 
 #define M_METAFILEDATA ((wxMetafileRefData *)m_refData)
 
 class WXDLLEXPORT wxMetafile: public wxGDIObject
 {
-  DECLARE_DYNAMIC_CLASS(wxMetafile)
- public:
-  // Copy constructor
-  inline wxMetafile(const wxMetafile& metafile)
-  { Ref(metafile); }
+    DECLARE_DYNAMIC_CLASS(wxMetafile)
+public:
+    // Copy constructor
+    wxMetafile(const wxMetafile& metafile)
+      : wxGDIObject()
+    { Ref(metafile); }
 
-  wxMetafile(const wxString& file = "");
-  ~wxMetafile(void);
+    wxMetafile(const wxString& file = wxEmptyString);
+    ~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);
+    // 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)); };
+    virtual bool Play(wxDC *dc);
+    inline bool Ok(void) const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); };
 
-  // Implementation
-  inline PicHandle GetHMETAFILE(void) { return M_METAFILEDATA->m_metafile; }
-  void SetHMETAFILE(PicHandle mf) ;
+    wxSize GetSize() const;
+    int GetWidth() const { return GetSize().x; }
+    int GetHeight() const { return GetSize().y; }
 
-  // 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; }
+    // Implementation
+    inline WXHMETAFILE GetHMETAFILE() const { return M_METAFILEDATA->m_metafile; }
+    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:
 };
@@ -81,18 +86,17 @@ class WXDLLEXPORT wxMetafileDC: public wxDC
   DECLARE_DYNAMIC_CLASS(wxMetafileDC)
 
  public:
-  // Don't supply origin and extent
-  // Supply them to wxMakeMetaFilePlaceable instead.
-  wxMetafileDC(const wxString& file = "");
-
-  // Supply origin and extent (recommended).
-  // Then don't need to supply them to wxMakeMetaFilePlaceable.
-  wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg);
+    // the ctor parameters specify the filename (empty for memory metafiles),
+    // the metafile picture size and the optional description/comment
+    wxMetafileDC(const wxString& filename = wxEmptyString,
+                    int width = 0, int height = 0,
+                    const wxString& description = wxEmptyString);
 
   ~wxMetafileDC(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; }
@@ -121,38 +125,37 @@ bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y
 // ----------------------------------------------------------------------------
 
 #if wxUSE_DATAOBJ
-class WXDLLEXPORT wxMetafileDataObject : public wxDataObject
+class WXDLLEXPORT wxMetafileDataObject : public wxDataObjectSimple
 {
 public:
   // ctors
-  wxMetafileDataObject() { m_width = 0; m_height = 0; };
-  wxMetafileDataObject(const wxMetafile& metafile, int width = 0, int height = 0):
-    m_metafile(metafile), m_width(width), m_height(height) { }
-
-  void SetMetafile(const wxMetafile& metafile, int w = 0, int h = 0)
-    { m_metafile = metafile; m_width = w; m_height = h; }
-  wxMetafile GetMetafile() const { return m_metafile; }
-  int GetWidth() const { return m_width; }
-  int GetHeight() const { return m_height; }
-
-  virtual wxDataFormat GetFormat() const { return wxDF_METAFILE; }
-
-/* ??
-  // implement base class pure virtuals
-  virtual wxDataFormat GetPreferredFormat() const
-    { return (wxDataFormat) wxDataObject::Text; }
-  virtual bool IsSupportedFormat(wxDataFormat format) const
-    { return format == wxDataObject::Text || format == wxDataObject::Locale; }
-  virtual size_t GetDataSize() const
-    { return m_strText.Len() + 1; } // +1 for trailing '\0'of course
-  virtual void GetDataHere(void *pBuf) const
-    { memcpy(pBuf, m_strText.c_str(), GetDataSize()); }
-*/
-
-private:
+  wxMetafileDataObject() 
+    : wxDataObjectSimple(wxDF_METAFILE) {  };
+  wxMetafileDataObject(const wxMetafile& metafile)
+    : wxDataObjectSimple(wxDF_METAFILE), m_metafile(metafile) { }
+
+    // virtual functions which you may override if you want to provide data on
+    // demand only - otherwise, the trivial default versions will be used
+    virtual void SetMetafile(const wxMetafile& metafile)
+        { m_metafile = metafile; }
+    virtual wxMetafile GetMetafile() const
+        { return m_metafile; }
+
+    // implement base class pure virtuals
+    virtual size_t GetDataSize() const;
+    virtual bool GetDataHere(void *buf) const;
+    virtual bool SetData(size_t len, const void *buf);
+
+    virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const
+        { return GetDataSize(); }
+    virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format),
+                             void *buf) const
+        { return GetDataHere(buf); }
+    virtual bool SetData(const wxDataFormat& WXUNUSED(format),
+                         size_t len, const void *buf)
+        { return SetData(len, buf); }
+protected:
   wxMetafile   m_metafile;
-  int          m_width;
-  int          m_height;
 };
 #endif