X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d7a7bd6d27cf2d3bb23c5ceeccbcbe74cf83b4ec..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/generic/prntdlgg.h diff --git a/include/wx/generic/prntdlgg.h b/include/wx/generic/prntdlgg.h index 18a8997583..f687fb38b6 100644 --- a/include/wx/generic/prntdlgg.h +++ b/include/wx/generic/prntdlgg.h @@ -13,7 +13,7 @@ #ifndef __PRINTDLGH_G_ #define __PRINTDLGH_G_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "prntdlgg.h" #endif @@ -35,7 +35,7 @@ class WXDLLEXPORT wxComboBox; class WXDLLEXPORT wxStaticText; class WXDLLEXPORT wxRadioBox; class WXDLLEXPORT wxPrintSetupData; - +class WXDLLEXPORT wxPageSetupData; // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -78,8 +78,6 @@ enum #if wxUSE_POSTSCRIPT class WXDLLEXPORT wxGenericPrintDialog : public wxDialog { - DECLARE_DYNAMIC_CLASS(wxGenericPrintDialog) - public: wxGenericPrintDialog(wxWindow *parent, wxPrintDialogData* data = (wxPrintDialogData*)NULL); @@ -122,12 +120,11 @@ protected: private: DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS(wxGenericPrintDialog) }; class WXDLLEXPORT wxGenericPrintSetupDialog : public wxDialog { - DECLARE_CLASS(wxGenericPrintSetupDialog) - public: // There are no configuration options for the dialog, so we // just pass the wxPrintData object (no wxPrintSetupDialogData class needed) @@ -153,14 +150,15 @@ public: wxPrintData m_printData; wxPrintData& GetPrintData() { return m_printData; } #endif // wxUSE_POSTSCRIPT + +private: + DECLARE_CLASS(wxGenericPrintSetupDialog) }; #endif // wxUSE_POSTSCRIPT class WXDLLEXPORT wxGenericPageSetupDialog : public wxDialog { - DECLARE_CLASS(wxGenericPageSetupDialog) - public: wxGenericPageSetupDialog(wxWindow *parent, wxPageSetupData* data = (wxPageSetupData*) NULL); virtual ~wxGenericPageSetupDialog(); @@ -188,6 +186,7 @@ public: private: DECLARE_EVENT_TABLE() + DECLARE_CLASS(wxGenericPageSetupDialog) }; #endif