Better fix for modal/modeless wizards.

[wxWidgets.git] / include / wx / generic / printps.h

diff --git a/include/wx/generic/printps.h b/include/wx/generic/printps.h
index 0921b4b85f5b91f86157917598c0c9bdbbbf7b78..ba97deea537b3c1e039263a9c7e1b24760801dc1 100644 (file)
--- a/include/wx/generic/printps.h
+++ b/include/wx/generic/printps.h
@@ -6,17 +6,13 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c)
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __PRINTPSH__
 #define __PRINTPSH__
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __PRINTPSH__
 #define __PRINTPSH__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "printps.h"
-#endif
-

 #include "wx/prntbase.h"
 
 #if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT
 #include "wx/prntbase.h"
 
 #if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT


@@ -27,15 +23,16 @@
 
 class WXDLLEXPORT wxPostScriptPrinter : public wxPrinterBase
 {
 
 class WXDLLEXPORT wxPostScriptPrinter : public wxPrinterBase
 {

-    DECLARE_DYNAMIC_CLASS(wxPostScriptPrinter)
-

 public:
     wxPostScriptPrinter(wxPrintDialogData *data = (wxPrintDialogData *) NULL);
     virtual ~wxPostScriptPrinter();
 
 public:
     wxPostScriptPrinter(wxPrintDialogData *data = (wxPrintDialogData *) NULL);
     virtual ~wxPostScriptPrinter();
 

-    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 bool Setup(wxWindow *parent);
     virtual wxDC* PrintDialog(wxWindow *parent);
     virtual bool Setup(wxWindow *parent);

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPostScriptPrinter)

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


@@ -45,8 +42,6 @@ public:
 
 class WXDLLEXPORT wxPostScriptPrintPreview : public wxPrintPreviewBase
 {
 
 class WXDLLEXPORT wxPostScriptPrintPreview : public wxPrintPreviewBase
 {

-    DECLARE_CLASS(wxPostScriptPrintPreview)
-

 public:
     wxPostScriptPrintPreview(wxPrintout *printout,
                              wxPrintout *printoutForPrinting = (wxPrintout *) NULL,
 public:
     wxPostScriptPrintPreview(wxPrintout *printout,
                              wxPrintout *printoutForPrinting = (wxPrintout *) NULL,


@@ -62,6 +57,9 @@ public:
 
 private:
     void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);
 
 private:
     void Init(wxPrintout *printout, wxPrintout *printoutForPrinting);

+
+private:
+    DECLARE_CLASS(wxPostScriptPrintPreview)

 };
 
 #endif
 };
 
 #endif