use global operator new to fix compilation errors if type T overloads new (as wxObjec...

[wxWidgets.git] / include / wx / printdlg.h

diff --git a/include/wx/printdlg.h b/include/wx/printdlg.h
index 4486ab32331291ae27008256a311cdbc96c21b5c..18892799046cfd5f50fd4231c9a88ab557bfa78b 100644 (file)
--- a/include/wx/printdlg.h
+++ b/include/wx/printdlg.h
@@ -1,10 +1,17 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/printdlg.h
+// Purpose:     Base header and class for print dialogs
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows Licence
+/////////////////////////////////////////////////////////////////////////////
+
 #ifndef _WX_PRINTDLG_H_BASE_
 #define _WX_PRINTDLG_H_BASE_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "printdlg.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_PRINTING_ARCHITECTURE
@@ -19,7 +26,7 @@
 // wxPrintDialogBase: interface for the dialog for printing
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPrintDialogBase : public wxDialog
+class WXDLLIMPEXP_CORE wxPrintDialogBase : public wxDialog
 {
 public:
     wxPrintDialogBase() { }
@@ -43,12 +50,12 @@ private:
 // wxPrintDialog: the dialog for printing.
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPrintDialog : public wxObject
+class WXDLLIMPEXP_CORE wxPrintDialog : public wxObject
 {
 public:
     wxPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL);
     wxPrintDialog(wxWindow *parent, wxPrintData* data);
-    ~wxPrintDialog();
+    virtual ~wxPrintDialog();
 
     virtual int ShowModal();
 
@@ -68,7 +75,7 @@ private:
 // wxPageSetupDialogBase: interface for the page setup dialog
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPageSetupDialogBase: public wxDialog
+class WXDLLIMPEXP_CORE wxPageSetupDialogBase: public wxDialog
 {
 public:
     wxPageSetupDialogBase() { }
@@ -90,11 +97,11 @@ private:
 // wxPageSetupDialog: the page setup dialog
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPageSetupDialog: public wxObject
+class WXDLLIMPEXP_CORE wxPageSetupDialog: public wxObject
 {
 public:
     wxPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL);
-    ~wxPageSetupDialog();
+    virtual ~wxPageSetupDialog();
 
     int ShowModal();
     wxPageSetupDialogData& GetPageSetupDialogData();