X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/23fba6860a0d7b2e093a64918e1da9252ed23b0d..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/msw/printdlg.h diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h index 1396ddc026..7a0101ec81 100644 --- a/include/wx/msw/printdlg.h +++ b/include/wx/msw/printdlg.h @@ -12,10 +12,6 @@ #ifndef _WX_PRINTDLG_H_ #define _WX_PRINTDLG_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "printdlg.h" -#endif - #if wxUSE_PRINTING_ARCHITECTURE #include "wx/dialog.h" @@ -23,7 +19,7 @@ #include "wx/prntbase.h" #include "wx/printdlg.h" -class WXDLLEXPORT wxDC; +class WXDLLIMPEXP_FWD_CORE wxDC; //---------------------------------------------------------------------------- // wxWindowsPrintNativeData @@ -38,23 +34,26 @@ public: virtual bool TransferTo( wxPrintData &data ); virtual bool TransferFrom( const wxPrintData &data ); - virtual bool Ok() const; + virtual bool Ok() const { return IsOk(); } + virtual bool IsOk() const; void* GetDevMode() const { return m_devMode; } void SetDevMode(void* data) { m_devMode = data; } void* GetDevNames() const { return m_devNames; } void SetDevNames(void* data) { m_devNames = data; } - + private: void* m_devMode; void* m_devNames; + short m_customWindowsPaperId; + private: DECLARE_DYNAMIC_CLASS(wxWindowsPrintNativeData) }; // --------------------------------------------------------------------------- -// wxPrinterDialog: the common dialog for printing. +// wxWindowsPrintDialog: the MSW dialog for printing // --------------------------------------------------------------------------- class WXDLLEXPORT wxWindowsPrintDialog : public wxPrintDialogBase @@ -69,11 +68,12 @@ public: wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; } wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); } + virtual wxDC *GetPrintDC(); private: wxPrintDialogData m_printDialogData; - wxDC* m_printerDC; + wxPrinterDC* m_printerDC; bool m_destroyDC; wxWindow* m_dialogParent; @@ -89,28 +89,33 @@ private: DECLARE_CLASS(wxWindowsPrintDialog) }; -class WXDLLEXPORT wxPageSetupDialog: public wxDialog -{ - DECLARE_DYNAMIC_CLASS(wxPageSetupDialog) +// --------------------------------------------------------------------------- +// wxWindowsPageSetupDialog: the MSW page setup dialog +// --------------------------------------------------------------------------- +class WXDLLEXPORT wxWindowsPageSetupDialog: public wxPageSetupDialogBase +{ public: - wxPageSetupDialog(); - wxPageSetupDialog(wxWindow *parent, wxPageSetupData *data = NULL); - virtual ~wxPageSetupDialog(); + wxWindowsPageSetupDialog(); + wxWindowsPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL); + virtual ~wxWindowsPageSetupDialog(); - bool Create(wxWindow *parent, wxPageSetupData *data = NULL); + bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL); virtual int ShowModal(); bool ConvertToNative( wxPageSetupDialogData &data ); bool ConvertFromNative( wxPageSetupDialogData &data ); - wxPageSetupData& GetPageSetupData() { return m_pageSetupData; } + virtual wxPageSetupData& GetPageSetupDialogData() { return m_pageSetupData; } private: - wxPageSetupData m_pageSetupData; - wxWindow* m_dialogParent; - void* m_pageDlg; + wxPageSetupDialogData m_pageSetupData; + wxWindow* m_dialogParent; + + // holds MSW handle + void* m_pageDlg; - DECLARE_NO_COPY_CLASS(wxPageSetupDialog) +private: + DECLARE_DYNAMIC_CLASS_NO_COPY(wxWindowsPageSetupDialog) }; #endif // wxUSE_PRINTING_ARCHITECTURE