Applied patch [ 1166587 ] [wxMSW] Removes all flicker from wxStaticBox

[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 57141635927babc411052a4655c02947ca08ac77..5ea44000980ec72afbfedc2d0f6359243d6313ca 100644 (file)
--- a/include/wx/mac/carbon/printdlg.h
+++ b/include/wx/mac/carbon/printdlg.h
@@ -21,10 +21,27 @@
 #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 TransferTo( wxPrintData &data ) { return true; }
+    virtual bool TransferFrom( const wxPrintData &data ) { return true; }
+    
+    virtual bool Ok() const { return true; }
+};
+    
 /*
- * wxPrinterDialog
- * The common dialog for printing.
+ * wxMacPrintDialog
+ * The Mac dialog for printing
  */
 
 class WXDLLEXPORT wxDC;
@@ -53,22 +70,28 @@ private:
     DECLARE_DYNAMIC_CLASS(wxPrintDialog)
 };
 
-class WXDLLEXPORT wxPageSetupDialog: public wxDialog
-{
-  DECLARE_DYNAMIC_CLASS(wxPageSetupDialog)
-
- public:
-  wxPageSetupDialog();
-  wxPageSetupDialog(wxWindow *parent, wxPageSetupData *data = NULL);
-  ~wxPageSetupDialog();
+/*
+ * wxMacPageSetupDialog
+ * The Mac page setup dialog
+ */
 
-  bool Create(wxWindow *parent, wxPageSetupData *data = NULL);
-  virtual int ShowModal();
+class WXDLLEXPORT wxMacPageSetupDialog: public wxPageSetupDialogBase
+{
+public:
+    wxMacPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL);
+    ~wxMacPageSetupDialog();
 
-  inline wxPageSetupData& GetPageSetupData() { return m_pageSetupData; }
- private:
-  wxPageSetupData   m_pageSetupData;
-  wxWindow*         m_dialogParent;
+    virtual wxPageSetupData& GetPageSetupDialogData();
+    
+    bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL);
+    virtual int ShowModal();
+  
+private:
+    wxPageSetupDialogData   m_pageSetupData;
+    wxWindow*               m_dialogParent;
+  
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageSetupDialog)
 };
 
 #endif