Forgot to commit this one.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 6bf627c9675faf33882eb5fc93dd661f73f773da..0dd2488919cef563a492e8431fabb8f99a563ba5 100644 (file)
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -50,6 +50,14 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+#include "wx/msw/printdlg.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/printdlg.h"
+#else
+#include "wx/generic/prntdlgg.h"
+#endif
+

 #ifdef __WXMSW__
     #include "wx/msw/private.h"
     #include <commdlg.h>
 #ifdef __WXMSW__
     #include "wx/msw/private.h"
     #include <commdlg.h>


@@ -59,8 +67,6 @@
     #endif
 #endif // __WXMSW__
 
     #endif
 #endif // __WXMSW__
 

-IMPLEMENT_CLASS(wxPrintPreviewBase, wxObject)
-

 //----------------------------------------------------------------------------
 // wxPrintFactory
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // wxPrintFactory
 //----------------------------------------------------------------------------


@@ -152,6 +158,18 @@ wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent,
 #endif
 }
 
 #endif
 }
 

+wxPageSetupDialogBase *wxNativePrintFactory::CreatePageSetupDialog( wxWindow *parent, 
+                                                  wxPageSetupDialogData *data )
+{
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+    return new wxWindowsPageSetupDialog( parent, data );
+#elif defined(__WXMAC__)
+    return new wxMacPageSetupDialog( parent, data );
+#else
+    return new wxGenericPageSetupDialog( parent, data );
+#endif
+}
+

 bool wxNativePrintFactory::HasPrintSetupDialog()
 {
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
 bool wxNativePrintFactory::HasPrintSetupDialog()
 {
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)


@@ -168,7 +186,8 @@ bool wxNativePrintFactory::HasPrintSetupDialog()
     
 }
 
     
 }
 

-wxDialog *wxNativePrintFactory::CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data )
+wxDialog *wxNativePrintFactory::CreatePrintSetupDialog( wxWindow *parent, 
+                                                        wxPrintData *data )

 {
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     wxUnusedVar(parent);
 {
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     wxUnusedVar(parent);


@@ -361,10 +380,10 @@ wxPrintDialogData& wxPrinter::GetPrintDialogData() const
 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------

-// wxPrintDialogBase: the common dialog for printing.
+// wxPrintDialogBase: the dialog for printing.

 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 

-IMPLEMENT_ABSTRACT_CLASS(wxPrintDialogBase, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxPrintDialogBase, wxDialog)

 
 wxPrintDialogBase::wxPrintDialogBase(wxWindow *parent,
                                      wxWindowID id, 
 
 wxPrintDialogBase::wxPrintDialogBase(wxWindow *parent,
                                      wxWindowID id, 


@@ -372,20 +391,13 @@ wxPrintDialogBase::wxPrintDialogBase(wxWindow *parent,
                                      const wxPoint &pos,
                                      const wxSize &size,
                                      long style)
                                      const wxPoint &pos,
                                      const wxSize &size,
                                      long style)

-                 : wxDialog
-                   (
-                        parent,
-                        id,
-                        title.empty() ? wxString(_("Print")) : title,
-                        pos,
-                        size,
-                        style
-                   )
+    : wxDialog( parent, id, title.empty() ? wxString(_("Print")) : title,
+                pos, size, style )

 {
 }
 
 // ---------------------------------------------------------------------------
 {
 }
 
 // ---------------------------------------------------------------------------

-// wxPrintDialog: the common dialog for printing.
+// wxPrintDialog: the dialog for printing

 // ---------------------------------------------------------------------------
 
 IMPLEMENT_CLASS(wxPrintDialog, wxObject)
 // ---------------------------------------------------------------------------
 
 IMPLEMENT_CLASS(wxPrintDialog, wxObject)


@@ -419,11 +431,61 @@ wxPrintData& wxPrintDialog::GetPrintData()
 {
     return m_pimpl->GetPrintData();
 }
 {
     return m_pimpl->GetPrintData();
 }

+

 wxDC *wxPrintDialog::GetPrintDC()
 {
     return m_pimpl->GetPrintDC();
 }
 
 wxDC *wxPrintDialog::GetPrintDC()
 {
     return m_pimpl->GetPrintDC();
 }
 

+// ---------------------------------------------------------------------------
+// wxPageSetupDialogBase: the page setup dialog
+// ---------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxPageSetupDialogBase, wxDialog)
+
+wxPageSetupDialogBase::wxPageSetupDialogBase(wxWindow *parent,
+                                     wxWindowID id, 
+                                     const wxString &title,
+                                     const wxPoint &pos,
+                                     const wxSize &size,
+                                     long style)
+    : wxDialog( parent, id, title.empty() ? wxString(_("Page setup")) : title,
+                pos, size, style )
+{
+}
+
+// ---------------------------------------------------------------------------
+// wxPageSetupDialog: the page setup dialog
+// ---------------------------------------------------------------------------
+
+IMPLEMENT_CLASS(wxPageSetupDialog, wxObject)
+
+wxPageSetupDialog::wxPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data )
+{
+    m_pimpl = wxPrintFactory::GetFactory()->CreatePageSetupDialog( parent, data );
+}
+
+wxPageSetupDialog::~wxPageSetupDialog()
+{
+    delete m_pimpl;
+}
+
+int wxPageSetupDialog::ShowModal()
+{
+    return m_pimpl->ShowModal();
+}
+
+wxPageSetupDialogData& wxPageSetupDialog::GetPageSetupDialogData()
+{
+    return m_pimpl->GetPageSetupDialogData();
+}
+
+// old name
+wxPageSetupDialogData& wxPageSetupDialog::GetPageSetupData()
+{
+    return m_pimpl->GetPageSetupDialogData();
+}
+

 //----------------------------------------------------------------------------
 // wxPrintAbortDialog
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // wxPrintAbortDialog
 //----------------------------------------------------------------------------


@@ -952,6 +1014,8 @@ void wxPreviewFrame::CreateControlBar()
 * Print preview
 */
 
 * Print preview
 */
 

+IMPLEMENT_CLASS(wxPrintPreviewBase, wxObject)
+

 wxPrintPreviewBase::wxPrintPreviewBase(wxPrintout *printout,
                                        wxPrintout *printoutForPrinting,
                                        wxPrintData *data)
 wxPrintPreviewBase::wxPrintPreviewBase(wxPrintout *printout,
                                        wxPrintout *printoutForPrinting,
                                        wxPrintData *data)