Blind compilation fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h
index a74416887e0c4dd18aa2fa9bf4b226ac5e037305..341b1ce3b8cca70353c1086f1714ce87a61be921 100644 (file)
--- a/include/wx/msw/metafile.h
+++ b/include/wx/msw/metafile.h
@@ -69,6 +69,10 @@ public:
     int GetWindowsMappingMode() const { return M_METAFILEDATA->m_windowsMappingMode; }
     void SetWindowsMappingMode(int mm);
 
     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)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxMetafile)
 };


@@ -76,8 +80,9 @@ private:
 class WXDLLEXPORT wxMetafileDCImpl: public wxMSWDCImpl
 {
 public:
 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();
     virtual ~wxMetafileDCImpl();
 
     virtual wxMetafile *Close();


@@ -97,9 +102,6 @@ public:
 protected:
     virtual void DoGetSize(int *width, int *height) const;
 
 protected:
     virtual void DoGetSize(int *width, int *height) const;
 

-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-

     int           m_windowsMappingMode;
     wxMetafile*   m_metaFile;
 
     int           m_windowsMappingMode;
     wxMetafile*   m_metaFile;
 


@@ -113,13 +115,15 @@ 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);
-       { 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)
 
     // 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(); }
 
     wxMetafile *GetMetafile() const 
        { return ((wxMetafileDCImpl*)m_pimpl)->GetMetaFile(); }

diff --git a/src/msw/metafile.cpp b/src/msw/metafile.cpp
index 3076145d20bff433c6cabef2871df602bf515d73..7152568160d0e7be08d668f5f9ddd9b4ce407de1 100644 (file)
--- a/src/msw/metafile.cpp
+++ b/src/msw/metafile.cpp
@@ -101,7 +101,7 @@ wxGDIRefData *wxMetafile::CreateGDIRefData() const
 
 wxGDIRefData *wxMetafile::CloneGDIRefData(const wxGDIRefData *data) const
 {
 
 wxGDIRefData *wxMetafile::CloneGDIRefData(const wxGDIRefData *data) const
 {

-    return new wxMetafileRefData(wx_static_cast(wxMetafileRefData *, data));
+    return new wxMetafileRefData(*wx_static_cast(const wxMetafileRefData *, data));

 }
 
 bool wxMetafile::SetClipboard(int width, int height)
 }
 
 bool wxMetafile::SetClipboard(int width, int height)


@@ -166,7 +166,8 @@ void wxMetafile::SetWindowsMappingMode(int mm)
 
 // Original constructor that does not takes origin and extent. If you use this,
 // *DO* give origin/extent arguments to wxMakeMetafilePlaceable.
 
 // Original constructor that does not takes origin and extent. If you use this,
 // *DO* give origin/extent arguments to wxMakeMetafilePlaceable.

-wxMetafileDC::wxMetafileDC(const wxString& file)
+wxMetafileDCImpl::wxMetafileDCImpl(wxDC *owner, const wxString& file)
+    : wxMSWDCImpl(owner)

 {
     m_metaFile = NULL;
     m_minX = 10000;
 {
     m_metaFile = NULL;
     m_minX = 10000;


@@ -193,7 +194,9 @@ wxMetafileDC::wxMetafileDC(const wxString& file)
 
 // New constructor that takes origin and extent. If you use this, don't
 // give origin/extent arguments to wxMakeMetafilePlaceable.
 
 // New constructor that takes origin and extent. If you use this, don't
 // give origin/extent arguments to wxMakeMetafilePlaceable.

-wxMetafileDC::wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg)
+wxMetafileDCImpl::wxMetafileDCImpl(wxDC *owner, const wxString& file,
+                                   int xext, int yext, int xorg, int yorg)
+    : wxMSWDCImpl(owner)

 {
     m_minX = 10000;
     m_minY = 10000;
 {
     m_minX = 10000;
     m_minY = 10000;


@@ -214,15 +217,15 @@ wxMetafileDC::wxMetafileDC(const wxString& file, int xext, int yext, int xorg, i
     SetMapMode(wxMM_TEXT); // NOTE: does not set HDC mapmode (this is correct)
 }
 
     SetMapMode(wxMM_TEXT); // NOTE: does not set HDC mapmode (this is correct)
 }
 

-wxMetafileDC::~wxMetafileDC()
+wxMetafileDCImpl::~wxMetafileDCImpl()

 {
     m_hDC = 0;
 }
 
 {
     m_hDC = 0;
 }
 

-void wxMetafileDC::DoGetTextExtent(const wxString& string,
-                                   wxCoord *x, wxCoord *y,
-                                   wxCoord *descent, wxCoord *externalLeading,
-                                   const wxFont *theFont) const
+void wxMetafileDCImpl::DoGetTextExtent(const wxString& string,
+                                       wxCoord *x, wxCoord *y,
+                                       wxCoord *descent, wxCoord *externalLeading,
+                                       const wxFont *theFont) const

 {
     const wxFont *fontToUse = theFont;
     if (!fontToUse)
 {
     const wxFont *fontToUse = theFont;
     if (!fontToUse)


@@ -246,7 +249,7 @@ void wxMetafileDC::DoGetTextExtent(const wxString& string,
         *externalLeading = tm.tmExternalLeading;
 }
 
         *externalLeading = tm.tmExternalLeading;
 }
 

-void wxMetafileDC::DoGetSize(int *width, int *height) const
+void wxMetafileDCImpl::DoGetSize(int *width, int *height) const

 {
     wxCHECK_RET( m_refData, _T("invalid wxMetafileDC") );
 
 {
     wxCHECK_RET( m_refData, _T("invalid wxMetafileDC") );
 


@@ -256,7 +259,7 @@ void wxMetafileDC::DoGetSize(int *width, int *height) const
         *height = M_METAFILEDATA->m_height;
 }
 
         *height = M_METAFILEDATA->m_height;
 }
 

-wxMetafile *wxMetafileDC::Close()
+wxMetafile *wxMetafileDCImpl::Close()

 {
     SelectOldObjects(m_hDC);
     HANDLE mf = CloseMetaFile((HDC) m_hDC);
 {
     SelectOldObjects(m_hDC);
     HANDLE mf = CloseMetaFile((HDC) m_hDC);


@@ -271,7 +274,7 @@ wxMetafile *wxMetafileDC::Close()
     return NULL;
 }
 
     return NULL;
 }
 

-void wxMetafileDC::SetMapMode(int mode)
+void wxMetafileDCImpl::SetMapMode(int mode)

 {
     m_mappingMode = mode;
 
 {
     m_mappingMode = mode;