Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/printdlg.h b/include/wx/printdlg.h
index 6079f4a1001e08de177c4c886d9f068669dd4321..cd21282f1303373e2898c450f80b595054a65661 100644 (file)
--- a/include/wx/printdlg.h
+++ b/include/wx/printdlg.h
@@ -26,7 +26,7 @@
 // wxPrintDialogBase: interface for the dialog for printing
 // ---------------------------------------------------------------------------
 
 // wxPrintDialogBase: interface for the dialog for printing
 // ---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPrintDialogBase : public wxDialog
+class WXDLLIMPEXP_CORE wxPrintDialogBase : public wxDialog

 {
 public:
     wxPrintDialogBase() { }
 {
 public:
     wxPrintDialogBase() { }


@@ -36,21 +36,21 @@ public:
                       const wxPoint &pos = wxDefaultPosition,
                       const wxSize &size = wxDefaultSize,
                       long style = wxDEFAULT_DIALOG_STYLE);
                       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;
     virtual wxPrintDialogData& GetPrintDialogData() = 0;
     virtual wxPrintData& GetPrintData() = 0;
     virtual wxDC *GetPrintDC() = 0;

-    
+

 private:
     DECLARE_ABSTRACT_CLASS(wxPrintDialogBase)
 private:
     DECLARE_ABSTRACT_CLASS(wxPrintDialogBase)

-    DECLARE_NO_COPY_CLASS(wxPrintDialogBase)
+    wxDECLARE_NO_COPY_CLASS(wxPrintDialogBase);

 };
 
 // ---------------------------------------------------------------------------
 // wxPrintDialog: the dialog for printing.
 // ---------------------------------------------------------------------------
 
 };
 
 // ---------------------------------------------------------------------------
 // wxPrintDialog: the dialog for printing.
 // ---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPrintDialog : public wxObject
+class WXDLLIMPEXP_CORE wxPrintDialog : public wxObject

 {
 public:
     wxPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL);
 {
 public:
     wxPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL);


@@ -62,20 +62,20 @@ public:
     virtual wxPrintDialogData& GetPrintDialogData();
     virtual wxPrintData& GetPrintData();
     virtual wxDC *GetPrintDC();
     virtual wxPrintDialogData& GetPrintDialogData();
     virtual wxPrintData& GetPrintData();
     virtual wxDC *GetPrintDC();

-    
+

 private:
     wxPrintDialogBase  *m_pimpl;
 private:
     wxPrintDialogBase  *m_pimpl;

-    
+

 private:
     DECLARE_DYNAMIC_CLASS(wxPrintDialog)
 private:
     DECLARE_DYNAMIC_CLASS(wxPrintDialog)

-    DECLARE_NO_COPY_CLASS(wxPrintDialog)
+    wxDECLARE_NO_COPY_CLASS(wxPrintDialog);

 };
 
 // ---------------------------------------------------------------------------
 // wxPageSetupDialogBase: interface for the page setup dialog
 // ---------------------------------------------------------------------------
 
 };
 
 // ---------------------------------------------------------------------------
 // wxPageSetupDialogBase: interface for the page setup dialog
 // ---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPageSetupDialogBase: public wxDialog
+class WXDLLIMPEXP_CORE wxPageSetupDialogBase: public wxDialog

 {
 public:
     wxPageSetupDialogBase() { }
 {
 public:
     wxPageSetupDialogBase() { }


@@ -90,14 +90,14 @@ public:
 
 private:
     DECLARE_ABSTRACT_CLASS(wxPageSetupDialogBase)
 
 private:
     DECLARE_ABSTRACT_CLASS(wxPageSetupDialogBase)

-    DECLARE_NO_COPY_CLASS(wxPageSetupDialogBase)
+    wxDECLARE_NO_COPY_CLASS(wxPageSetupDialogBase);

 };
 
 // ---------------------------------------------------------------------------
 // wxPageSetupDialog: the page setup dialog
 // ---------------------------------------------------------------------------
 
 };
 
 // ---------------------------------------------------------------------------
 // wxPageSetupDialog: the page setup dialog
 // ---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPageSetupDialog: public wxObject
+class WXDLLIMPEXP_CORE wxPageSetupDialog: public wxObject

 {
 public:
     wxPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL);
 {
 public:
     wxPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL);


@@ -110,10 +110,10 @@ public:
 
 private:
     wxPageSetupDialogBase  *m_pimpl;
 
 private:
     wxPageSetupDialogBase  *m_pimpl;

-    
+

 private:
     DECLARE_DYNAMIC_CLASS(wxPageSetupDialog)
 private:
     DECLARE_DYNAMIC_CLASS(wxPageSetupDialog)

-    DECLARE_NO_COPY_CLASS(wxPageSetupDialog)
+    wxDECLARE_NO_COPY_CLASS(wxPageSetupDialog);

 };
 
 #endif
 };
 
 #endif