use <bitmapsize> to load bitmaps at the specified size in wxToolBar's XRC handler

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

diff --git a/include/wx/os2/metafile.h b/include/wx/os2/metafile.h
index 03818f44b171d696ba177dce1631b1d86b438f8e..ada95467051e6b3ddf8d1a50af7ba3eb08af78a7 100644 (file)
--- a/include/wx/os2/metafile.h
+++ b/include/wx/os2/metafile.h
@@ -33,7 +33,7 @@
 
 class WXDLLIMPEXP_FWD_CORE wxMetafile;
 
 
 class WXDLLIMPEXP_FWD_CORE wxMetafile;
 

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

 {
     friend class WXDLLIMPEXP_FWD_CORE wxMetafile;
 public:
 {
     friend class WXDLLIMPEXP_FWD_CORE wxMetafile;
 public:


@@ -49,7 +49,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

 {
     DECLARE_DYNAMIC_CLASS(wxMetafile)
 public:
 {
     DECLARE_DYNAMIC_CLASS(wxMetafile)
 public:


@@ -73,7 +73,7 @@ protected:
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 };
 
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 };
 

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

 {
 public:
     wxMetafileDCImpl(wxDC *owner, const wxString& file = wxEmptyString);
 {
 public:
     wxMetafileDCImpl(wxDC *owner, const wxString& file = wxEmptyString);


@@ -82,7 +82,7 @@ public:
     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,


@@ -103,10 +103,10 @@ protected:
 
 private:
     DECLARE_CLASS(wxMetafileDCImpl)
 
 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
 {
 public:
     // Don't supply origin and extent


@@ -118,10 +118,10 @@ public:
     // 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)

-        : wxDC(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(); }
 
     virtual ~wxMetafileDC(void)
         { return ((wxMetafileDCImpl*)m_pimpl)->GetMetaFile(); }
 
     virtual ~wxMetafileDC(void)


@@ -136,7 +136,7 @@ public:
 
 private:
     DECLARE_CLASS(wxMetafileDC)
 
 private:
     DECLARE_CLASS(wxMetafileDC)

-    DECLARE_NO_COPY_CLASS(wxMetafileDC)
+    wxDECLARE_NO_COPY_CLASS(wxMetafileDC);

 };
 
 /*
 };
 
 /*


@@ -148,10 +148,10 @@ private:
 
 // No origin or extent
 #define wxMakeMetaFilePlaceable wxMakeMetafilePlaceable
 
 // No origin or extent
 #define wxMakeMetaFilePlaceable wxMakeMetafilePlaceable

-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
+bool WXDLLIMPEXP_CORE wxMakeMetaFilePlaceable( const wxString& filename

                                          ,int x1
                                          ,int y1
                                          ,int x2
                                          ,int x1
                                          ,int y1
                                          ,int x2


@@ -168,7 +168,7 @@ bool WXDLLEXPORT wxMakeMetaFilePlaceable( const wxString& filename
 // use.
 
 #if wxUSE_DRAG_AND_DROP
 // use.
 
 #if wxUSE_DRAG_AND_DROP

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

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