surround deprecated wxImage methods in WXWIN_COMPATIBILITY_2_2

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

diff --git a/include/wx/mac/metafile.h b/include/wx/mac/metafile.h
index eb86b97a04e72214194586ba5726528acb9d8a54..393cca992e695bd781878258d135a3416c4d400f 100644 (file)
--- a/include/wx/mac/metafile.h
+++ b/include/wx/mac/metafile.h
@@ -15,87 +15,140 @@
 #ifndef _WX_METAFIILE_H_
 #define _WX_METAFIILE_H_
 
 #ifndef _WX_METAFIILE_H_
 #define _WX_METAFIILE_H_
 

-#ifdef __GNUG__
-#pragma interface "metafile.h"
-#endif
+#if wxUSE_METAFILE
+#include "wx/dc.h"
+#include "wx/gdiobj.h"

 
 

-#include "wx/setup.h"
+#if wxUSE_DATAOBJ
+#include "wx/dataobj.h"
+#endif

 
 /*
 
 /*

- * Metafile and metafile device context classes - work in Windows 3.1 only
+ * Metafile and metafile device context classes

  *
  */
 
  *
  */
 

-class WXDLLEXPORT wxDC;
-class WXDLLEXPORT wxMetaFile: public wxObject
+#define wxMetaFile wxMetafile
+#define wxMetaFileDC wxMetafileDC
+
+class WXDLLEXPORT wxMetafile;
+
+class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxMetaFile)
+    friend class WXDLLEXPORT wxMetafile;
+public:
+    wxMetafileRefData(void);
+    ~wxMetafileRefData(void);
+
+public:
+    WXHMETAFILE m_metafile;
+};
+
+#define M_METAFILEDATA ((wxMetafileRefData *)m_refData)
+
+class WXDLLEXPORT wxMetafile: public wxGDIObject
+{
+  DECLARE_DYNAMIC_CLASS(wxMetafile)

  public:
  public:

-  wxMetaFile(const wxString& file = "");
-  ~wxMetaFile();
+  // Copy constructor
+  inline wxMetafile(const wxMetafile& metafile)
+  { Ref(metafile); }
+
+  wxMetafile(const wxString& file = "");
+  ~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);

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

 
 

-/* TODO: Implementation
-  inline WXHANDLE GetHMETAFILE() { return m_metaFile; }
-  inline void SetHMETAFILE(WXHANDLE mf) { m_metaFile = mf; }
+  // Implementation
+  inline WXHMETAFILE GetHMETAFILE(void) { 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:
 
 protected:

-  WXHANDLE m_metaFile;
-*/

 };
 
 };
 

-class WXDLLEXPORT wxMetaFileDC: public wxDC
+class WXDLLEXPORT wxMetafileDC: public wxDC

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxMetaFileDC)
+  DECLARE_DYNAMIC_CLASS(wxMetafileDC)

 
  public:
   // Don't supply origin and extent
   // Supply them to wxMakeMetaFilePlaceable instead.
 
  public:
   // Don't supply origin and extent
   // Supply them to wxMakeMetaFilePlaceable instead.

-  wxMetaFileDC(const wxString& file = "");
+  wxMetafileDC(const wxString& file = "");

 
   // Supply origin and extent (recommended).
   // Then don't need to supply them to wxMakeMetaFilePlaceable.
 
   // 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);
+  wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg);

 
 

-  ~wxMetaFileDC();
+  ~wxMetafileDC(void);

 
   // Should be called at end of drawing
 
   // Should be called at end of drawing

-  virtual wxMetaFile *Close();
-  virtual void SetMapMode(int mode);
-  virtual void GetTextExtent(const wxString& string, float *x, float *y,
-                     float *descent = NULL, float *externalLeading = NULL,
-                     wxFont *theFont = NULL, bool use16bit = FALSE);
+  virtual wxMetafile *Close(void);

 
   // Implementation
 
   // Implementation

-  inline wxMetaFile *GetMetaFile() { return m_metaFile; }
-  inline void SetMetaFile(wxMetaFile *mf) { m_metaFile = mf; }
-  inline int GetWindowsMappingMode() { return m_windowsMappingMode; }
-  inline void SetWindowsMappingMode(int mm) { m_windowsMappingMode = mm; }
+  inline wxMetafile *GetMetaFile(void) const { return m_metaFile; }
+  inline void SetMetaFile(wxMetafile *mf) { m_metaFile = mf; }

 
 protected:
 
 protected:

-  int m_windowsMappingMode;
-  wxMetaFile *m_metaFile;
+  wxMetafile*   m_metaFile;

 };
 
 /*
  * Pass filename of existing non-placeable metafile, and bounding box.
  * Adds a placeable metafile header, sets the mapping mode to anisotropic,
 };
 
 /*
  * Pass filename of existing non-placeable metafile, and bounding box.
  * Adds a placeable metafile header, sets the mapping mode to anisotropic,

- * and sets the window origin and extent to mimic the MM_TEXT mapping mode.
+ * and sets the window origin and extent to mimic the wxMM_TEXT mapping mode.

  *
  */
 
 // No origin or extent
  *
  */
 
 // No origin or extent

-bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, float scale = 1.0);
+#define wxMakeMetaFilePlaceable wxMakeMetafilePlaceable
+bool WXDLLEXPORT wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0);

 
 // Optional origin and extent
 bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = TRUE);
 
 
 // Optional origin and extent
 bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = TRUE);
 

+// ----------------------------------------------------------------------------
+// wxMetafileDataObject is a specialization of wxDataObject for metafile data
+// ----------------------------------------------------------------------------
+
+#if wxUSE_DATAOBJ
+class WXDLLEXPORT wxMetafileDataObject : public wxDataObjectSimple
+{
+public:
+  // ctors
+  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);
+
+protected:
+  wxMetafile   m_metafile;
+};
+#endif
+
+#endif // wxUSE_METAFILE
+
+

 #endif
     // _WX_METAFIILE_H_
 #endif
     // _WX_METAFIILE_H_