Revert "Make wxMSW stack walking methods work with Unicode identifiers."

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

diff --git a/include/wx/printdlg.h b/include/wx/printdlg.h
index 4486ab32331291ae27008256a311cdbc96c21b5c..d7e7e4e26778a3e7b4576bfbc14b5635b5e132fa 100644 (file)
--- a/include/wx/printdlg.h
+++ b/include/wx/printdlg.h
@@ -1,10 +1,16 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/printdlg.h
+// Purpose:     Base header and class for print dialogs
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// 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 +25,7 @@
 // wxPrintDialogBase: interface for the dialog for printing
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPrintDialogBase : public wxDialog
+class WXDLLIMPEXP_CORE wxPrintDialogBase : public wxDialog
 {
 public:
     wxPrintDialogBase() { }
@@ -29,46 +35,46 @@ public:
                       const wxPoint &pos = wxDefaultPosition,
                       const wxSize &size = wxDefaultSize,
                       long style = wxDEFAULT_DIALOG_STYLE);
-            
+
     virtual wxPrintDialogData& GetPrintDialogData() = 0;
     virtual wxPrintData& GetPrintData() = 0;
     virtual wxDC *GetPrintDC() = 0;
-    
+
 private:
     DECLARE_ABSTRACT_CLASS(wxPrintDialogBase)
-    DECLARE_NO_COPY_CLASS(wxPrintDialogBase)
+    wxDECLARE_NO_COPY_CLASS(wxPrintDialogBase);
 };
 
 // ---------------------------------------------------------------------------
 // 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();
 
     virtual wxPrintDialogData& GetPrintDialogData();
     virtual wxPrintData& GetPrintData();
     virtual wxDC *GetPrintDC();
-    
+
 private:
     wxPrintDialogBase  *m_pimpl;
-    
+
 private:
     DECLARE_DYNAMIC_CLASS(wxPrintDialog)
-    DECLARE_NO_COPY_CLASS(wxPrintDialog)
+    wxDECLARE_NO_COPY_CLASS(wxPrintDialog);
 };
 
 // ---------------------------------------------------------------------------
 // wxPageSetupDialogBase: interface for the page setup dialog
 // ---------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPageSetupDialogBase: public wxDialog
+class WXDLLIMPEXP_CORE wxPageSetupDialogBase: public wxDialog
 {
 public:
     wxPageSetupDialogBase() { }
@@ -83,18 +89,18 @@ public:
 
 private:
     DECLARE_ABSTRACT_CLASS(wxPageSetupDialogBase)
-    DECLARE_NO_COPY_CLASS(wxPageSetupDialogBase)
+    wxDECLARE_NO_COPY_CLASS(wxPageSetupDialogBase);
 };
 
 // ---------------------------------------------------------------------------
 // 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();
@@ -103,10 +109,10 @@ public:
 
 private:
     wxPageSetupDialogBase  *m_pimpl;
-    
+
 private:
     DECLARE_DYNAMIC_CLASS(wxPageSetupDialog)
-    DECLARE_NO_COPY_CLASS(wxPageSetupDialog)
+    wxDECLARE_NO_COPY_CLASS(wxPageSetupDialog);
 };
 
 #endif