Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

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

diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h
index 341b1ce3b8cca70353c1086f1714ce87a61be921..8991f58c91586e328ff9d33b32c3dbc5fbe3566b 100644 (file)
--- a/include/wx/msw/metafile.h
+++ b/include/wx/msw/metafile.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: VZ 07.01.00: implemented wxMetaFileDataObject
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by: VZ 07.01.00: implemented wxMetaFileDataObject
 // Created:     01/02/97

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -25,7 +24,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 +42,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);


@@ -77,7 +76,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxMetafile)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMetafile)
 };
 

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

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


@@ -86,7 +85,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,


@@ -107,10 +106,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


@@ -125,15 +124,15 @@ public:
         : 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(); }
        { 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);

 };
 
 
 };
 
 


@@ -147,10 +146,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


@@ -158,7 +157,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