don't hardcode 16/32 as sizes for small/normal icons (fixes bug 1862812)

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

diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h
index 0ef7398f882152938ee7fb6ea581337aa748c462..a74416887e0c4dd18aa2fa9bf4b226ac5e037305 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
 {
 
 class WXDLLEXPORT wxMetafileRefData: public wxGDIRefData
 {

-    friend class WXDLLIMPEXP_FWD_CORE wxMetafile;

 public:
     wxMetafileRefData();
     virtual ~wxMetafileRefData();
 
 public:
     wxMetafileRefData();
     virtual ~wxMetafileRefData();
 

+    virtual bool IsOk() const { return m_metafile != 0; }
+

 public:
     WXHANDLE m_metafile;
     int m_windowsMappingMode;
     int m_width, m_height;
 public:
     WXHANDLE m_metafile;
     int m_windowsMappingMode;
     int m_width, m_height;

+
+    friend class WXDLLIMPEXP_FWD_CORE wxMetafile;

 };
 
 #define M_METAFILEDATA ((wxMetafileRefData *)m_refData)
 };
 
 #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);
     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()); }
 
     // set/get the size of metafile for clipboard operations
     wxSize GetSize() const { return wxSize(GetWidth(), GetHeight()); }


@@ -72,20 +73,13 @@ private:
     DECLARE_DYNAMIC_CLASS(wxMetafile)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMetafile)
 };
 

-class WXDLLEXPORT wxMetafileDC: public wxDC
+class WXDLLEXPORT wxMetafileDCImpl: public wxMSWDCImpl

 {
 public:
 {
 public:

-    // Don't supply origin and extent
-    // Supply them to wxMakeMetaFilePlaceable instead.
-    wxMetafileDC(const wxString& file = wxEmptyString);
-
-    // Supply origin and extent (recommended).
-    // Then don't need to supply them to wxMakeMetaFilePlaceable.
+    wxMetafileDCImpl(const wxString& file = wxEmptyString);

     wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg);
     wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg);

+    virtual ~wxMetafileDCImpl();

 
 

-    virtual ~wxMetafileDC();
-
-    // Should be called at end of drawing

     virtual wxMetafile *Close();
     virtual void SetMapMode(int mode);
     virtual void DoGetTextExtent(const wxString& string,
     virtual wxMetafile *Close();
     virtual void SetMapMode(int mode);
     virtual void DoGetTextExtent(const wxString& string,


@@ -103,13 +97,44 @@ 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:
     int           m_windowsMappingMode;
     wxMetafile*   m_metaFile;
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxMetafileDC)
+    DECLARE_CLASS(wxMetafileDCImpl)
+    DECLARE_NO_COPY_CLASS(wxMetafileDCImpl)
+};
+
+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 ); }
+
+    // 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 ); }
+
+    wxMetafile *GetMetafile() const 
+       { return ((wxMetafileDCImpl*)m_pimpl)->GetMetaFile(); }
+       
+    wxMetafile *Close()
+       { return ((wxMetafileDCImpl*)m_pimpl)->Close(); }
+
+private:
+    DECLARE_CLASS(wxMetafileDC)
+    DECLARE_NO_COPY_CLASS(wxMetafileDC)

 };
 
 };
 

+
+
+

 /*
  * 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,