Allow using wxDEFAULT as font size in wxOSX.

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

diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h
index a74416887e0c4dd18aa2fa9bf4b226ac5e037305..5af79e6c89c97c0f5d1417f7c9d4440cba2df8e0 100644 (file)
--- a/include/wx/msw/metafile.h
+++ b/include/wx/msw/metafile.h
@@ -25,7 +25,7 @@
 
 class WXDLLIMPEXP_FWD_CORE wxMetafile;
 
 
 class WXDLLIMPEXP_FWD_CORE wxMetafile;
 

-class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData
+class WXDLLIMPEXP_CORE wxMetafileRefData: public wxGDIRefData

 {
 public:
     wxMetafileRefData();
 {
 public:
     wxMetafileRefData();


@@ -43,7 +43,7 @@ public:
 
 #define M_METAFILEDATA ((wxMetafileRefData *)m_refData)
 
 
 #define M_METAFILEDATA ((wxMetafileRefData *)m_refData)
 

-class WXDLLEXPORT wxMetafile: public wxGDIObject
+class WXDLLIMPEXP_CORE wxMetafile: public wxGDIObject

 {
 public:
     wxMetafile(const wxString& file = wxEmptyString);
 {
 public:
     wxMetafile(const wxString& file = wxEmptyString);


@@ -69,19 +69,24 @@ 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)
 };
 

-class WXDLLEXPORT wxMetafileDCImpl: public wxMSWDCImpl
+class WXDLLIMPEXP_CORE wxMetafileDCImpl: public wxMSWDCImpl

 {
 public:
 {
 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();

-    virtual void SetMapMode(int mode);
+    virtual void SetMapMode(wxMappingMode mode);

     virtual void DoGetTextExtent(const wxString& string,
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
     virtual void DoGetTextExtent(const wxString& string,
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,


@@ -97,39 +102,38 @@ 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;
 
 private:
     DECLARE_CLASS(wxMetafileDCImpl)
     int           m_windowsMappingMode;
     wxMetafile*   m_metaFile;
 
 private:
     DECLARE_CLASS(wxMetafileDCImpl)

-    DECLARE_NO_COPY_CLASS(wxMetafileDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxMetafileDCImpl);

 };
 
 };
 

-class WXDLLEXPORT wxMetafileDC: public wxDC
+class WXDLLIMPEXP_CORE 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 
+    wxMetafile *GetMetafile() const

        { return ((wxMetafileDCImpl*)m_pimpl)->GetMetaFile(); }
        { return ((wxMetafileDCImpl*)m_pimpl)->GetMetaFile(); }

-       
+

     wxMetafile *Close()
        { return ((wxMetafileDCImpl*)m_pimpl)->Close(); }
 
 private:
     DECLARE_CLASS(wxMetafileDC)
     wxMetafile *Close()
        { return ((wxMetafileDCImpl*)m_pimpl)->Close(); }
 
 private:
     DECLARE_CLASS(wxMetafileDC)

-    DECLARE_NO_COPY_CLASS(wxMetafileDC)
+    wxDECLARE_NO_COPY_CLASS(wxMetafileDC);

 };
 
 
 };
 
 


@@ -143,10 +147,10 @@ private:
  */
 
 // No origin or extent
  */
 
 // No origin or extent

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

 
 // Optional origin and extent
 
 // 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);
+bool WXDLLIMPEXP_CORE 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
 
 // ----------------------------------------------------------------------------
 // wxMetafileDataObject is a specialization of wxDataObject for metafile data


@@ -154,7 +158,7 @@ bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y
 
 #if wxUSE_DRAG_AND_DROP
 
 
 #if wxUSE_DRAG_AND_DROP
 

-class WXDLLEXPORT wxMetafileDataObject : public wxDataObjectSimple
+class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObjectSimple

 {
 public:
     // ctors
 {
 public:
     // ctors