projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added RefreshItem(s) methods
[wxWidgets.git]
/
include
/
wx
/
mac
/
printdlg.h
diff --git
a/include/wx/mac/printdlg.h
b/include/wx/mac/printdlg.h
index ac31a4909606ef557a500442171cd253779aff19..1c6eb915cb1577c4e08b52440659ec3eb77a9f61 100644
(file)
--- a/
include/wx/mac/printdlg.h
+++ b/
include/wx/mac/printdlg.h
@@
-33,18
+33,21
@@
class WXDLLEXPORT wxPrintDialog: public wxDialog
public:
wxPrintDialog();
public:
wxPrintDialog();
- wxPrintDialog(wxWindow *parent, wxPrintData* data = NULL);
+ wxPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL);
+ wxPrintDialog(wxWindow *parent, wxPrintData* data );
~wxPrintDialog();
~wxPrintDialog();
-
bool Create(wxWindow *parent, wxPrint
Data* data = NULL);
+
bool Create(wxWindow *parent, wxPrintDialog
Data* data = NULL);
virtual int ShowModal();
virtual int ShowModal();
- inline wxPrintData& GetPrintData() { return m_printData; }
+ wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; }
+ wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); }
virtual wxDC *GetPrintDC();
private:
virtual wxDC *GetPrintDC();
private:
- wxPrintD
ata m_print
Data;
+ wxPrintD
ialogData m_printDialog
Data;
wxDC* m_printerDC;
wxDC* m_printerDC;
+ bool m_destroyDC;
wxWindow* m_dialogParent;
};
wxWindow* m_dialogParent;
};
@@
-52,9
+55,6
@@
class WXDLLEXPORT wxPageSetupDialog: public wxDialog
{
DECLARE_DYNAMIC_CLASS(wxPageSetupDialog)
{
DECLARE_DYNAMIC_CLASS(wxPageSetupDialog)
- private:
- wxPageSetupData m_pageSetupData;
- wxWindow* m_dialogParent;
public:
wxPageSetupDialog();
wxPageSetupDialog(wxWindow *parent, wxPageSetupData *data = NULL);
public:
wxPageSetupDialog();
wxPageSetupDialog(wxWindow *parent, wxPageSetupData *data = NULL);
@@
-64,6
+64,9
@@
class WXDLLEXPORT wxPageSetupDialog: public wxDialog
virtual int ShowModal();
inline wxPageSetupData& GetPageSetupData() { return m_pageSetupData; }
virtual int ShowModal();
inline wxPageSetupData& GetPageSetupData() { return m_pageSetupData; }
+ private:
+ wxPageSetupData m_pageSetupData;
+ wxWindow* m_dialogParent;
};
#endif
};
#endif