Some wxComboCtrlBase member functions were enclosed within incorrect compatibility...

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

diff --git a/include/wx/x11/print.h b/include/wx/x11/print.h
index 64b50ef0a68b90f8b4afdc2b2f56ba6a84d01544..044938bbf8057639d66624f907addf245c27ec6d 100644 (file)
--- a/include/wx/x11/print.h
+++ b/include/wx/x11/print.h
@@ -1,35 +1,31 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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_
 #define _WX_PRINT_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PRINT_H_
 #define _WX_PRINT_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "print.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 wxPrinter: public wxPrinterBase
+class WXDLLIMPEXP_CORE wxPrinter: public wxPrinterBase

 {
     DECLARE_DYNAMIC_CLASS(wxPrinter)
 {
     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);


@@ -40,17 +36,17 @@ public:
 * Programmer creates an object of this class to preview a wxPrintout.
 */
 
 * Programmer creates an object of this class to preview a wxPrintout.
 */
 

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

 {
     DECLARE_CLASS(wxPrintPreview)
 {
     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_