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

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

diff --git a/include/wx/msw/printwin.h b/include/wx/msw/printwin.h
index 6aef6a4d29818d52b37483d25403d2da1abf9a77..e5ef80b0433034114ec62a10cd0a8ccb4ec0f436 100644 (file)
--- a/include/wx/msw/printwin.h
+++ b/include/wx/msw/printwin.h
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        printwin.h
+// Name:        wx/msw/printwin.h

 // Purpose:     wxWindowsPrinter, wxWindowsPrintPreview classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // Purpose:     wxWindowsPrinter, wxWindowsPrintPreview classes
 // 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
 /////////////////////////////////////////////////////////////////////////////


@@ -12,34 +11,28 @@
 #ifndef _WX_PRINTWIN_H_
 #define _WX_PRINTWIN_H_
 
 #ifndef _WX_PRINTWIN_H_
 #define _WX_PRINTWIN_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "printwin.h"
-#endif
-

 #include "wx/prntbase.h"
 
 // ---------------------------------------------------------------------------
 // Represents the printer: manages printing a wxPrintout object
 // ---------------------------------------------------------------------------
 
 #include "wx/prntbase.h"
 
 // ---------------------------------------------------------------------------
 // Represents the printer: manages printing a wxPrintout object
 // ---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxWindowsPrinter : public wxPrinterBase
+class WXDLLIMPEXP_CORE wxWindowsPrinter : public wxPrinterBase

 {
     DECLARE_DYNAMIC_CLASS(wxWindowsPrinter)
 
 public:
     wxWindowsPrinter(wxPrintDialogData *data = NULL);
 {
     DECLARE_DYNAMIC_CLASS(wxWindowsPrinter)
 
 public:
     wxWindowsPrinter(wxPrintDialogData *data = NULL);

-    virtual ~wxWindowsPrinter();

 
     virtual bool Print(wxWindow *parent,
                        wxPrintout *printout,
                        bool prompt = true);
 
     virtual bool Print(wxWindow *parent,
                        wxPrintout *printout,
                        bool prompt = true);

-    virtual wxDC* PrintDialog(wxWindow *parent);
+
+    virtual wxDC *PrintDialog(wxWindow *parent);

     virtual bool Setup(wxWindow *parent);
 
 private:
     virtual bool Setup(wxWindow *parent);
 
 private:

-    WXFARPROC     m_lpAbortProc;
-
-    DECLARE_NO_COPY_CLASS(wxWindowsPrinter)
+    wxDECLARE_NO_COPY_CLASS(wxWindowsPrinter);

 };
 
 // ---------------------------------------------------------------------------
 };
 
 // ---------------------------------------------------------------------------


@@ -47,7 +40,7 @@ private:
 // wxPrintout.
 // ---------------------------------------------------------------------------
 
 // wxPrintout.
 // ---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxWindowsPrintPreview : public wxPrintPreviewBase
+class WXDLLIMPEXP_CORE wxWindowsPrintPreview : public wxPrintPreviewBase

 {
 public:
     wxWindowsPrintPreview(wxPrintout *printout,
 {
 public:
     wxWindowsPrintPreview(wxPrintout *printout,


@@ -61,7 +54,11 @@ public:
     virtual bool Print(bool interactive);
     virtual void DetermineScaling();
 
     virtual bool Print(bool interactive);
     virtual void DetermineScaling();
 

-private:
+protected:
+#if wxUSE_ENH_METAFILE
+    virtual bool RenderPageIntoBitmap(wxBitmap& bmp, int pageNum);
+#endif
+

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPrintPreview)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPrintPreview)
 };