added \newsince command

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

diff --git a/include/wx/mac/carbon/printdlg.h b/include/wx/mac/carbon/printdlg.h
index 6bb45dad2f485963b446df36e0b6a77918eb88f5..6c895d24346f5c00bb7ef8fa9e321f42664efacb 100644 (file)
--- a/include/wx/mac/carbon/printdlg.h
+++ b/include/wx/mac/carbon/printdlg.h
@@ -20,35 +20,54 @@
 
 #include "wx/dialog.h"
 #include "wx/cmndata.h"
 
 #include "wx/dialog.h"
 #include "wx/cmndata.h"

+#include "wx/printdlg.h"
+#include "wx/prntbase.h"

 
 

+//----------------------------------------------------------------------------
+// wxMacPrintNativeData
+//----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxMacPrintNativeData: public wxPrintNativeDataBase
+{
+public:
+    wxMacPrintNativeData() {};
+    virtual ~wxMacPrintNativeData() {};
+    
+    virtual bool ConvertTo( wxPrintData &data ) { return true; }
+    virtual bool ConvertFrom( const wxPrintData &data ) { return true; }
+    
+    virtual bool Ok() const { return true; }
+};
+    

 /*
  * wxPrinterDialog
  * The common dialog for printing.
  */
 
 class WXDLLEXPORT wxDC;
 /*
  * wxPrinterDialog
  * The common dialog for printing.
  */
 
 class WXDLLEXPORT wxDC;

-class WXDLLEXPORT wxPrintDialog: public wxDialog
+class WXDLLEXPORT wxMacPrintDialog: public wxPrintDialogBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxPrintDialog)
-
- public:
-  wxPrintDialog();
-    wxPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL);
-  wxPrintDialog(wxWindow *parent, wxPrintData* data );
-  ~wxPrintDialog();
+public:
+    wxMacPrintDialog();
+    wxMacPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL);
+    wxMacPrintDialog(wxWindow *parent, wxPrintData* data );
+    ~wxMacPrintDialog();

 
     bool Create(wxWindow *parent, wxPrintDialogData* data = NULL);
 
     bool Create(wxWindow *parent, wxPrintDialogData* data = NULL);

-  virtual int ShowModal();
+    virtual int ShowModal();

 
 

-  wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; }
-  wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); }
-  virtual wxDC *GetPrintDC();
+    virtual wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; }
+    virtual wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); }
+    virtual wxDC *GetPrintDC();

 
 

- private:
-  wxPrintDialogData   m_printDialogData;
-  wxDC*             m_printerDC;
-  bool              m_destroyDC;
-  wxWindow*         m_dialogParent;
+private:
+    wxPrintDialogData   m_printDialogData;
+    wxDC*               m_printerDC;
+    bool                m_destroyDC;
+    wxWindow*           m_dialogParent;
+  
+private:
+    DECLARE_DYNAMIC_CLASS(wxPrintDialog)

 };
 
 class WXDLLEXPORT wxPageSetupDialog: public wxDialog
 };
 
 class WXDLLEXPORT wxPageSetupDialog: public wxDialog