X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c750f949fa3915e7ee54cf060de704701000581..a721fd82b7ca8c97048453d4aaff559e8f741d69:/include/wx/generic/prntdlgg.h?ds=sidebyside diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h index 70ce01a6d0..63f8139cc6 100644 --- a/include/wx/generic/prntdlgg.h +++ b/include/wx/generic/prntdlgg.h @@ -6,17 +6,13 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __PRINTDLGH_G_ #define __PRINTDLGH_G_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "prntdlgg.h" -#endif - #include "wx/defs.h" #if wxUSE_PRINTING_ARCHITECTURE @@ -27,17 +23,18 @@ #include "wx/printdlg.h" #include "wx/listctrl.h" +#include "wx/dc.h" #if wxUSE_POSTSCRIPT #include "wx/dcps.h" #endif -class WXDLLEXPORT wxTextCtrl; -class WXDLLEXPORT wxButton; -class WXDLLEXPORT wxCheckBox; -class WXDLLEXPORT wxComboBox; -class WXDLLEXPORT wxStaticText; -class WXDLLEXPORT wxRadioBox; -class WXDLLEXPORT wxPageSetupData; +class WXDLLIMPEXP_FWD_CORE wxTextCtrl; +class WXDLLIMPEXP_FWD_CORE wxButton; +class WXDLLIMPEXP_FWD_CORE wxCheckBox; +class WXDLLIMPEXP_FWD_CORE wxComboBox; +class WXDLLIMPEXP_FWD_CORE wxStaticText; +class WXDLLIMPEXP_FWD_CORE wxRadioBox; +class WXDLLIMPEXP_FWD_CORE wxPageSetupData; // ---------------------------------------------------------------------------- // constants @@ -81,7 +78,7 @@ enum // wxPostScriptNativeData //---------------------------------------------------------------------------- -class WXDLLEXPORT wxPostScriptPrintNativeData: public wxPrintNativeDataBase +class WXDLLIMPEXP_CORE wxPostScriptPrintNativeData: public wxPrintNativeDataBase { public: wxPostScriptPrintNativeData(); @@ -90,7 +87,8 @@ public: virtual bool TransferTo( wxPrintData &data ); virtual bool TransferFrom( const wxPrintData &data ); - virtual bool Ok() const { return true; } + virtual bool Ok() const { return IsOk(); } + virtual bool IsOk() const { return true; } const wxString& GetPrinterCommand() const { return m_printerCommand; } const wxString& GetPrinterOptions() const { return m_printerOptions; } @@ -139,11 +137,11 @@ private: // Windows using PostScript print/preview) // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGenericPrintDialog : public wxPrintDialogBase +class WXDLLIMPEXP_CORE wxGenericPrintDialog : public wxPrintDialogBase { public: wxGenericPrintDialog(wxWindow *parent, - wxPrintDialogData* data = (wxPrintDialogData*)NULL); + wxPrintDialogData* data = NULL); wxGenericPrintDialog(wxWindow *parent, wxPrintData* data); virtual ~wxGenericPrintDialog(); @@ -184,7 +182,7 @@ private: DECLARE_DYNAMIC_CLASS(wxGenericPrintDialog) }; -class WXDLLEXPORT wxGenericPrintSetupDialog : public wxDialog +class WXDLLIMPEXP_CORE wxGenericPrintSetupDialog : public wxDialog { public: // There are no configuration options for the dialog, so we @@ -222,7 +220,7 @@ private: #endif // wxUSE_POSTSCRIPT -class WXDLLEXPORT wxGenericPageSetupDialog : public wxPageSetupDialogBase +class WXDLLIMPEXP_CORE wxGenericPageSetupDialog : public wxPageSetupDialogBase { public: wxGenericPageSetupDialog(wxWindow *parent = NULL,