reverted Julian's r44600, it broke help window behavior so that it prevented apps...

[wxWidgets.git] / include / wx / x11 / print.h

diff --git a/include/wx/x11/print.h b/include/wx/x11/print.h
index a814a64dcc093ec4fc4112686f224c6f20840b57..f67284c8b5a9846b12b2c8b4d0225c2fe9c5117a 100644 (file)
--- a/include/wx/x11/print.h
+++ b/include/wx/x11/print.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        print.h
+// Name:        wx/x11/print.h

 // Purpose:     wxPrinter, wxPrintPreview classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxPrinter, wxPrintPreview classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRINT_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRINT_H_


@@ -21,11 +21,11 @@
 class WXDLLEXPORT wxPrinter: public wxPrinterBase
 {
     DECLARE_DYNAMIC_CLASS(wxPrinter)
 class WXDLLEXPORT wxPrinter: public wxPrinterBase
 {
     DECLARE_DYNAMIC_CLASS(wxPrinter)

-        
+

 public:
     wxPrinter(wxPrintData *data = NULL);
 public:
     wxPrinter(wxPrintData *data = NULL);

-    ~wxPrinter();
-    
+    virtual ~wxPrinter();
+

     virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE);
     virtual bool PrintDialog(wxWindow *parent);
     virtual bool Setup(wxWindow *parent);
     virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE);
     virtual bool PrintDialog(wxWindow *parent);
     virtual bool Setup(wxWindow *parent);


@@ -39,14 +39,14 @@ public:
 class WXDLLEXPORT wxPrintPreview: public wxPrintPreviewBase
 {
     DECLARE_CLASS(wxPrintPreview)
 class WXDLLEXPORT wxPrintPreview: public wxPrintPreviewBase
 {
     DECLARE_CLASS(wxPrintPreview)

-        
+

 public:
     wxPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintData *data = NULL);
 public:
     wxPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintData *data = NULL);

-    ~wxPrintPreview();
-    
+    virtual ~wxPrintPreview();
+

     virtual bool Print(bool interactive);
     virtual void DetermineScaling();
 };
 
 #endif
     virtual bool Print(bool interactive);
     virtual void DetermineScaling();
 };
 
 #endif

-// _WX_PRINT_H_
+    // _WX_PRINT_H_