Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/msw/enhmeta.h b/include/wx/msw/enhmeta.h
index e828b2935863f00eb626618718e233a8816d798f..3951bd7f5abfb4a88ec0877467f1037fd8ba3364 100644 (file)
--- a/include/wx/msw/enhmeta.h
+++ b/include/wx/msw/enhmeta.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     13.01.00
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     13.01.00

-// RCS-ID:      $Id$

 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -37,7 +36,7 @@ public:
         { Free(); }
 
     // display the picture stored in the metafile on the given DC
         { 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; }
 
     // accessors
     virtual bool IsOk() const { return m_hMF != 0; }


@@ -87,6 +86,14 @@ public:
                     int width = 0, int height = 0,
                     const wxString& description = wxEmptyString);
 
                     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();
 
     // obtain a pointer to the new metafile (caller should delete it)
     wxEnhMetaFile *Close();
 


@@ -129,7 +136,7 @@ public:
 protected:
     wxEnhMetaFile m_metafile;
 
 protected:
     wxEnhMetaFile m_metafile;
 

-    DECLARE_NO_COPY_CLASS(wxEnhMetaFileDataObject)
+    wxDECLARE_NO_COPY_CLASS(wxEnhMetaFileDataObject);

 };
 
 
 };
 
 


@@ -172,7 +179,7 @@ public:
 protected:
     wxEnhMetaFile m_metafile;
 
 protected:
     wxEnhMetaFile m_metafile;
 

-    DECLARE_NO_COPY_CLASS(wxEnhMetaFileSimpleDataObject)
+    wxDECLARE_NO_COPY_CLASS(wxEnhMetaFileSimpleDataObject);

 };
 
 #endif // wxUSE_DRAG_AND_DROP
 };
 
 #endif // wxUSE_DRAG_AND_DROP