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

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

diff --git a/include/wx/msw/dcprint.h b/include/wx/msw/dcprint.h
index 2c7f7d42d56ac49b284cbf0ffc668f420a40eec8..85a60246dd882fa35f3253d21a85d6099d519106 100644 (file)
--- a/include/wx/msw/dcprint.h
+++ b/include/wx/msw/dcprint.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97

-// RCS-ID:      $Id$

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


@@ -35,7 +34,7 @@ public:
     virtual void StartPage();
     virtual void EndPage();
 
     virtual void StartPage();
     virtual void EndPage();
 

-    virtual wxRect GetPaperRect();
+    virtual wxRect GetPaperRect() const;

 
 protected:
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
 
 protected:
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,


@@ -43,7 +42,8 @@ protected:
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
                         wxCoord width, wxCoord height,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
                         wxCoord width, wxCoord height,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,

-                        int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
+                        wxRasterOperationMode rop = wxCOPY, bool useMask = false,
+                        wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);

     virtual void DoGetSize(int *w, int *h) const
     {
         GetDeviceSize(w, h);
     virtual void DoGetSize(int *w, int *h) const
     {
         GetDeviceSize(w, h);


@@ -57,7 +57,7 @@ protected:
 
 private:
     DECLARE_CLASS(wxPrinterDCImpl)
 
 private:
     DECLARE_CLASS(wxPrinterDCImpl)

-    DECLARE_NO_COPY_CLASS(wxPrinterDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxPrinterDCImpl);

 };
 
 // Gets an HDC for the specified printer configuration
 };
 
 // Gets an HDC for the specified printer configuration