include "ToolUtils.h" for LoWord and friends

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

diff --git a/include/wx/mac/metafile.h b/include/wx/mac/metafile.h
index 17ffbc08664305e538c59b135c3ca2baf5793a83..bbf8e541170e48b7fc561a2ab6f375113fb13a4b 100644 (file)
--- 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.
 // 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:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -41,7 +41,7 @@ public:
     ~wxMetafileRefData(void);
 
 public:
     ~wxMetafileRefData(void);
 
 public:

-    PicHandle m_metafile;
+    WXHMETAFILE m_metafile;

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


@@ -51,10 +51,11 @@ class WXDLLEXPORT wxMetafile: public wxGDIObject
   DECLARE_DYNAMIC_CLASS(wxMetafile)
  public:
   // Copy constructor
   DECLARE_DYNAMIC_CLASS(wxMetafile)
  public:
   // Copy constructor

-  inline wxMetafile(const wxMetafile& metafile)
+  wxMetafile(const wxMetafile& metafile)
+      : wxGDIObject()

   { Ref(metafile); }
 
   { Ref(metafile); }
 

-  wxMetafile(const wxString& file = "");
+  wxMetafile(const wxString& file = wxEmptyString);

   ~wxMetafile(void);
 
   // After this is called, the metafile cannot be used for anything
   ~wxMetafile(void);
 
   // After this is called, the metafile cannot be used for anything


@@ -65,8 +66,8 @@ class WXDLLEXPORT wxMetafile: public wxGDIObject
   inline bool Ok(void) const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); };
 
   // Implementation
   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) ;
+  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; }
 
   // Operators
   inline wxMetafile& operator = (const wxMetafile& metafile) { if (*this == metafile) return (*this); Ref(metafile); return *this; }


@@ -83,7 +84,7 @@ class WXDLLEXPORT wxMetafileDC: public wxDC
  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 = wxEmptyString);

 
   // 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.