Remove SetPageTitle and GetPageTitle and make GetCurrentTitle actually return the...

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

diff --git a/include/wx/msw/enhmeta.h b/include/wx/msw/enhmeta.h
index e828b2935863f00eb626618718e233a8816d798f..e134750ea6554d8f521abfe0ae52a31e15398c2d 100644 (file)
--- a/include/wx/msw/enhmeta.h
+++ b/include/wx/msw/enhmeta.h
@@ -37,7 +37,7 @@ public:
         { Free(); }
 
     // display the picture stored in the metafile on the given DC
-    bool Play(wxDC *dc, wxRect *rectBound = (wxRect *)NULL);
+    bool Play(wxDC *dc, wxRect *rectBound = NULL);
 
     // accessors
     virtual bool IsOk() const { return m_hMF != 0; }
@@ -87,6 +87,14 @@ public:
                     int width = 0, int height = 0,
                     const wxString& description = wxEmptyString);
 
+    // as above, but takes reference DC as first argument to take resolution,
+    // size, font metrics etc. from
+    wxEXPLICIT
+    wxEnhMetaFileDC(const wxDC& referenceDC,
+                    const wxString& filename = wxEmptyString,
+                    int width = 0, int height = 0,
+                    const wxString& description = wxEmptyString);
+
     // obtain a pointer to the new metafile (caller should delete it)
     wxEnhMetaFile *Close();
 
@@ -129,7 +137,7 @@ public:
 protected:
     wxEnhMetaFile m_metafile;
 
-    DECLARE_NO_COPY_CLASS(wxEnhMetaFileDataObject)
+    wxDECLARE_NO_COPY_CLASS(wxEnhMetaFileDataObject);
 };
 
 
@@ -172,7 +180,7 @@ public:
 protected:
     wxEnhMetaFile m_metafile;
 
-    DECLARE_NO_COPY_CLASS(wxEnhMetaFileSimpleDataObject)
+    wxDECLARE_NO_COPY_CLASS(wxEnhMetaFileSimpleDataObject);
 };
 
 #endif // wxUSE_DRAG_AND_DROP