Move wxBell() from base to core library.

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

diff --git a/include/wx/osx/printdlg.h b/include/wx/osx/printdlg.h
index d6ec1ce09bfa9abd3f24559c9bcc8345c9622a85..98de9f4e136e98ed3b8723fc1938f0b515668e1d 100644 (file)
--- a/include/wx/osx/printdlg.h
+++ b/include/wx/osx/printdlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/mac/carbon/printdlg.h
+// Name:        wx/osx/printdlg.h

 // Purpose:     wxPrintDialog, wxPageSetupDialog classes.
 //              Use generic, PostScript version if no
 //              platform-specific implementation.
 // Purpose:     wxPrintDialog, wxPageSetupDialog classes.
 //              Use generic, PostScript version if no
 //              platform-specific implementation.


@@ -18,7 +18,7 @@
 #include "wx/cmndata.h"
 #include "wx/printdlg.h"
 #include "wx/prntbase.h"
 #include "wx/cmndata.h"
 #include "wx/printdlg.h"
 #include "wx/prntbase.h"

-    
+

 /*
  * wxMacPrintDialog
  * The Mac dialog for printing
 /*
  * wxMacPrintDialog
  * The Mac dialog for printing


@@ -45,7 +45,7 @@ private:
     wxDC*               m_printerDC;
     bool                m_destroyDC;
     wxWindow*           m_dialogParent;
     wxDC*               m_printerDC;
     bool                m_destroyDC;
     wxWindow*           m_dialogParent;

-  
+

 private:
     DECLARE_DYNAMIC_CLASS(wxPrintDialog)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxPrintDialog)
 };


@@ -58,18 +58,18 @@ private:
 class WXDLLIMPEXP_CORE wxMacPageSetupDialog: public wxPageSetupDialogBase
 {
 public:
 class WXDLLIMPEXP_CORE wxMacPageSetupDialog: public wxPageSetupDialogBase
 {
 public:

-    wxMacPageSetupDialog(wxWindow *parent, wxPageSetupData *data = NULL);
+    wxMacPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL);

     virtual ~wxMacPageSetupDialog();
 
     virtual ~wxMacPageSetupDialog();
 

-    virtual wxPageSetupData& GetPageSetupDialogData();
-    
-    bool Create(wxWindow *parent, wxPageSetupData *data = NULL);
+    virtual wxPageSetupDialogData& GetPageSetupDialogData();
+
+    bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL);

     virtual int ShowModal();
     virtual int ShowModal();

-  
+

 private:
 private:

-    wxPageSetupData   m_pageSetupData;
+    wxPageSetupDialogData   m_pageSetupData;

     wxWindow*               m_dialogParent;
     wxWindow*               m_dialogParent;

-  
+

 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageSetupDialog)
 };
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageSetupDialog)
 };


@@ -85,25 +85,25 @@ class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 class WXDLLIMPEXP_CORE wxMacPageMarginsDialog : public wxDialog
 {
 public:
 class WXDLLIMPEXP_CORE wxMacPageMarginsDialog : public wxDialog
 {
 public:

-    wxMacPageMarginsDialog(wxFrame* parent, wxPageSetupData* data);
+    wxMacPageMarginsDialog(wxFrame* parent, wxPageSetupDialogData* data);

     bool TransferToWindow();
     bool TransferDataFromWindow();
 
     bool TransferToWindow();
     bool TransferDataFromWindow();
 

-    virtual wxPageSetupData& GetPageSetupDialogData() { return *m_pageSetupDialogData; }
+    virtual wxPageSetupDialogData& GetPageSetupDialogData() { return *m_pageSetupDialogData; }

 
 private:
 
 private:

-    wxPageSetupData* m_pageSetupDialogData;
-    
+    wxPageSetupDialogData* m_pageSetupDialogData;
+

     wxPoint m_MinMarginTopLeft;
     wxPoint m_MinMarginBottomRight;
     wxTextCtrl *m_LeftMargin;
     wxTextCtrl *m_TopMargin;
     wxTextCtrl *m_RightMargin;
     wxTextCtrl *m_BottomMargin;
     wxPoint m_MinMarginTopLeft;
     wxPoint m_MinMarginBottomRight;
     wxTextCtrl *m_LeftMargin;
     wxTextCtrl *m_TopMargin;
     wxTextCtrl *m_RightMargin;
     wxTextCtrl *m_BottomMargin;

-    
+

     void GetMinMargins();
     bool CheckValue(wxTextCtrl* textCtrl, int *value, int minValue, const wxString& name);
     void GetMinMargins();
     bool CheckValue(wxTextCtrl* textCtrl, int *value, int minValue, const wxString& name);

-    
+

 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageMarginsDialog)
 };
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageMarginsDialog)
 };