X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3a0a0eeab1965fcf85d15123c32a8f3a1900351..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/apptrait.h diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h index 213ccc01e8..322b047c8e 100644 --- a/include/wx/apptrait.h +++ b/include/wx/apptrait.h @@ -15,17 +15,20 @@ #include "wx/string.h" #include "wx/platinfo.h" -class WXDLLIMPEXP_BASE wxObject; -class WXDLLEXPORT wxAppTraits; +class WXDLLIMPEXP_FWD_BASE wxArrayString; +class WXDLLIMPEXP_FWD_BASE wxConfigBase; +class WXDLLIMPEXP_FWD_BASE wxEventLoopBase; #if wxUSE_FONTMAP - class WXDLLEXPORT wxFontMapper; + class WXDLLIMPEXP_FWD_CORE wxFontMapper; #endif // wxUSE_FONTMAP -class WXDLLIMPEXP_BASE wxLog; -class WXDLLIMPEXP_BASE wxMessageOutput; -class WXDLLEXPORT wxRendererNative; -class WXDLLIMPEXP_BASE wxString; -class WXDLLIMPEXP_BASE wxTimer; -class WXDLLIMPEXP_BASE wxTimerImpl; +class WXDLLIMPEXP_FWD_BASE wxLog; +class WXDLLIMPEXP_FWD_BASE wxMessageOutput; +class WXDLLIMPEXP_FWD_BASE wxObject; +class WXDLLIMPEXP_FWD_CORE wxRendererNative; +class WXDLLIMPEXP_FWD_BASE wxStandardPathsBase; +class WXDLLIMPEXP_FWD_BASE wxString; +class WXDLLIMPEXP_FWD_BASE wxTimer; +class WXDLLIMPEXP_FWD_BASE wxTimerImpl; class GSocketGUIFunctionsTable; @@ -34,8 +37,6 @@ class GSocketGUIFunctionsTable; // wxAppTraits: this class defines various configurable aspects of wxApp // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_BASE wxStandardPathsBase; - class WXDLLIMPEXP_BASE wxAppTraitsBase { public: @@ -45,6 +46,13 @@ public: // hooks for working with the global objects, may be overridden by the user // ------------------------------------------------------------------------ +#if wxUSE_CONFIG + // create the default configuration object (base class version is + // implemented in config.cpp and creates wxRegConfig for wxMSW and + // wxFileConfig for all the other platforms) + virtual wxConfigBase *CreateConfig(); +#endif // wxUSE_CONFIG + #if wxUSE_LOG // create the default log target virtual wxLog *CreateLogTarget() = 0; @@ -65,11 +73,9 @@ public: // NB: returned pointer will be deleted by the caller virtual wxRendererNative *CreateRenderer() = 0; -#if wxUSE_STDPATHS // wxStandardPaths object is normally the same for wxBase and wxGUI // except in the case of wxMac and wxCocoa virtual wxStandardPathsBase& GetStandardPaths(); -#endif // wxUSE_STDPATHS #if wxUSE_INTL // called during wxApp initialization to set the locale to correspond to @@ -119,6 +125,9 @@ public: virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable() = 0; #endif + // create a new, port specific, instance of the event loop used by wxApp + virtual wxEventLoopBase *CreateEventLoop() = 0; + #if wxUSE_TIMER // return platform and toolkit dependent wxTimer implementation virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) = 0; @@ -196,6 +205,10 @@ protected: class WXDLLIMPEXP_BASE wxConsoleAppTraitsBase : public wxAppTraits { public: +#if !wxUSE_CONSOLE_EVENTLOOP + virtual wxEventLoopBase *CreateEventLoop() { return NULL; } +#endif // !wxUSE_CONSOLE_EVENTLOOP + #if wxUSE_LOG virtual wxLog *CreateLogTarget(); #endif // wxUSE_LOG