correcting import/export (_adv gave linking errors)

[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 a12b983908a1697b13d0c6c9dcbaafa5eab700a4..3df2606ebf22ee890b0ddd980a4d80685bd43f51 100644 (file)
--- a/include/wx/mac/carbon/printdlg.h
+++ b/include/wx/mac/carbon/printdlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        printdlg.h
+// Name:        wx/mac/carbon/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.


@@ -24,7 +24,7 @@
  * The Mac dialog for printing
  */
 
  * The Mac dialog for printing
  */
 

-class WXDLLEXPORT wxDC;
+class WXDLLIMPEXP_FWD_CORE wxDC;

 class WXDLLEXPORT wxMacPrintDialog: public wxPrintDialogBase
 {
 public:
 class WXDLLEXPORT wxMacPrintDialog: public wxPrintDialogBase
 {
 public:


@@ -58,21 +58,55 @@ private:
 class WXDLLEXPORT wxMacPageSetupDialog: public wxPageSetupDialogBase
 {
 public:
 class WXDLLEXPORT wxMacPageSetupDialog: public wxPageSetupDialogBase
 {
 public:

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

     virtual ~wxMacPageSetupDialog();
 
     virtual wxPageSetupData& GetPageSetupDialogData();
     
     virtual ~wxMacPageSetupDialog();
 
     virtual wxPageSetupData& GetPageSetupDialogData();
     

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

     virtual int ShowModal();
   
 private:
     virtual int ShowModal();
   
 private:

-    wxPageSetupDialogData   m_pageSetupData;
+    wxPageSetupData   m_pageSetupData;

     wxWindow*               m_dialogParent;
   
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageSetupDialog)
 };
 
     wxWindow*               m_dialogParent;
   
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageSetupDialog)
 };
 

-#endif
-    // _WX_PRINTDLG_H_
+class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
+
+/*
+* wxMacPageMarginsDialog
+* A Mac dialog for setting the page margins separately from page setup since
+* (native) wxMacPageSetupDialog doesn't let you set margins.
+*/
+
+class WXDLLEXPORT wxMacPageMarginsDialog : public wxDialog
+{
+public:
+    wxMacPageMarginsDialog(wxFrame* parent, wxPageSetupData* data);
+    bool TransferToWindow();
+    bool TransferDataFromWindow();
+
+    virtual wxPageSetupData& GetPageSetupDialogData() { return *m_pageSetupDialogData; }
+
+private:
+    wxPageSetupData* m_pageSetupDialogData;
+    
+    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);
+    
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageMarginsDialog)
+};
+
+
+#endif    // _WX_PRINTDLG_H_