Ensure that key events are sent to focused window first in wxGTK.

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

diff --git a/include/wx/generic/printps.h b/include/wx/generic/printps.h
index 5934eaf40a8dfbb8dd6a5ed850604998950a65bc..290f8942fa91dd6cc1c9b240956aba14cd688d38 100644 (file)
--- a/include/wx/generic/printps.h
+++ b/include/wx/generic/printps.h
@@ -1,41 +1,38 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        printps.h
+// Name:        wx/generic/printps.h

 // Purpose:     wxPostScriptPrinter, wxPostScriptPrintPreview
 //              wxGenericPageSetupDialog
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Purpose:     wxPostScriptPrinter, wxPostScriptPrintPreview
 //              wxGenericPageSetupDialog
 // Author:      Julian Smart
 // 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__
 

-#ifdef __GNUG__
-    #pragma interface "printps.h"
-#endif
-

 #include "wx/prntbase.h"
 
 #include "wx/prntbase.h"
 

-#if wxUSE_PRINTING_ARCHITECTURE
+#if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT

 
 // ----------------------------------------------------------------------------
 // Represents the printer: manages printing a wxPrintout object
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // Represents the printer: manages printing a wxPrintout object
 // ----------------------------------------------------------------------------
 

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

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxPostScriptPrinter)
-

 public:
 public:

-    wxPostScriptPrinter(wxPrintDialogData *data = (wxPrintDialogData *) NULL);
+    wxPostScriptPrinter(wxPrintDialogData *data = NULL);

     virtual ~wxPostScriptPrinter();
 
     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)

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


@@ -43,14 +40,12 @@ public:
 // wxPrintout.
 // ----------------------------------------------------------------------------
 
 // wxPrintout.
 // ----------------------------------------------------------------------------
 

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

 {
 {

-    DECLARE_CLASS(wxPostScriptPrintPreview)
-

 public:
     wxPostScriptPrintPreview(wxPrintout *printout,
 public:
     wxPostScriptPrintPreview(wxPrintout *printout,

-                             wxPrintout *printoutForPrinting = (wxPrintout *) NULL,
-                             wxPrintDialogData *data = (wxPrintDialogData *) NULL);
+                             wxPrintout *printoutForPrinting = NULL,
+                             wxPrintDialogData *data = NULL);

     wxPostScriptPrintPreview(wxPrintout *printout,
                              wxPrintout *printoutForPrinting,
                              wxPrintData *data);
     wxPostScriptPrintPreview(wxPrintout *printout,
                              wxPrintout *printoutForPrinting,
                              wxPrintData *data);


@@ -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