fixes for __WINCE_NET__ build (slightly modified patch 1892654)

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

diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h
index 8ac8a37734c9e954909fc375bf08c5936a66a594..341b1ce3b8cca70353c1086f1714ce87a61be921 100644 (file)
--- a/include/wx/msw/metafile.h
+++ b/include/wx/msw/metafile.h
@@ -27,15 +27,18 @@ class WXDLLIMPEXP_FWD_CORE wxMetafile;
 
 class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData
 {
-    friend class WXDLLIMPEXP_FWD_CORE wxMetafile;
 public:
     wxMetafileRefData();
     virtual ~wxMetafileRefData();
 
+    virtual bool IsOk() const { return m_metafile != 0; }
+
 public:
     WXHANDLE m_metafile;
     int m_windowsMappingMode;
     int m_width, m_height;
+
+    friend class WXDLLIMPEXP_FWD_CORE wxMetafile;
 };
 
 #define M_METAFILEDATA ((wxMetafileRefData *)m_refData)
@@ -51,8 +54,6 @@ public:
     virtual bool SetClipboard(int width = 0, int height = 0);
 
     virtual bool Play(wxDC *dc);
-    bool Ok() const { return IsOk(); }
-    bool IsOk() const { return (M_METAFILEDATA && (M_METAFILEDATA->m_metafile != 0)); };
 
     // set/get the size of metafile for clipboard operations
     wxSize GetSize() const { return wxSize(GetWidth(), GetHeight()); }
@@ -68,6 +69,10 @@ public:
     int GetWindowsMappingMode() const { return M_METAFILEDATA->m_windowsMappingMode; }
     void SetWindowsMappingMode(int mm);
 
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
 private:
     DECLARE_DYNAMIC_CLASS(wxMetafile)
 };
@@ -75,8 +80,9 @@ private:
 class WXDLLEXPORT wxMetafileDCImpl: public wxMSWDCImpl
 {
 public:
-    wxMetafileDCImpl(const wxString& file = wxEmptyString);
-    wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg);
+    wxMetafileDCImpl(wxDC *owner, const wxString& file = wxEmptyString);
+    wxMetafileDCImpl(wxDC *owner, const wxString& file,
+                     int xext, int yext, int xorg, int yorg);
     virtual ~wxMetafileDCImpl();
 
     virtual wxMetafile *Close();
@@ -109,13 +115,15 @@ class WXDLLEXPORT wxMetafileDC: public wxDC
 public:
     // Don't supply origin and extent
     // Supply them to wxMakeMetaFilePlaceable instead.
-    wxMetafileDC(const wxString& file);
-       { m_pimpl = new wxMetafileDCImpl( this, file ); }
+    wxMetafileDC(const wxString& file)
+        : wxDC(new wxMetafileDCImpl( this, 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)
-       { m_pimpl = new wxMetafileDCImpl( this, file, xext, yext, xorg, yorg ); }
+        : wxDC(new wxMetafileDCImpl( this, file, xext, yext, xorg, yorg ))
+        { }
 
     wxMetafile *GetMetafile() const 
        { return ((wxMetafileDCImpl*)m_pimpl)->GetMetaFile(); }