X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7af1b53999ef37f99805e05df68c4d635fa4dbf8..591d01bebacf365a654a9061cddeb7fae617a2f5:/include/wx/apptrait.h diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h index ee9501af6b..5c6c9a19a4 100644 --- a/include/wx/apptrait.h +++ b/include/wx/apptrait.h @@ -5,20 +5,45 @@ // Modified by: // Created: 19.06.2003 // RCS-ID: $Id$ -// Copyright: (c) 2003 Vadim Zeitlin +// Copyright: (c) 2003 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef _WX_APPTRAIT_H_ #define _WX_APPTRAIT_H_ -class WXDLLEXPORT wxObject; +#include "wx/string.h" + +class WXDLLIMPEXP_BASE wxObject; class WXDLLEXPORT wxAppTraits; #if wxUSE_FONTMAP class WXDLLEXPORT wxFontMapper; #endif // wxUSE_FONTMAP -class WXDLLEXPORT wxLog; -class WXDLLEXPORT wxMessageOutput; +class WXDLLIMPEXP_BASE wxLog; +class WXDLLIMPEXP_BASE wxMessageOutput; +class WXDLLEXPORT wxRendererNative; +class WXDLLIMPEXP_BASE wxString; + +class GSocketGUIFunctionsTable; + +// ---------------------------------------------------------------------------- +// toolkit information +// ---------------------------------------------------------------------------- + +// Information about the toolkit that the app is running under (e.g. wxMSW): +struct WXDLLIMPEXP_BASE wxToolkitInfo +{ + // Short name of the toolkit (e.g. "msw" or "mswuniv"); empty for console: + wxString shortName; + // Descriptive name of the toolkit, human readable (e.g. "wxMSW" or + // "wxMSW/Universal"); "wxBase" for console apps: + wxString name; + // Version of the underlying toolkit or of the OS for console apps: + int versionMajor, versionMinor; + // OS mnenomics, e.g. wxGTK or wxMSW: + int os; +}; + // ---------------------------------------------------------------------------- // wxAppTraits: this class defines various configurable aspects of wxApp @@ -27,14 +52,6 @@ class WXDLLEXPORT wxMessageOutput; class WXDLLIMPEXP_BASE wxAppTraitsBase { public: - // wxAppTraits is an ABC, but we also provide 2 standard implementations of - // it, one for the console apps and the other for the GUI ones - static wxAppTraits *CreateConsole(); -#if wxUSE_GUI - static wxAppTraits *CreateGUI(); -#endif // wxUSE_GUI - - // hooks for creating the global objects, may be overridden by the user // ------------------------------------------------------------------------ @@ -51,6 +68,13 @@ public: virtual wxFontMapper *CreateFontMapper() = 0; #endif // wxUSE_FONTMAP + // get the renderer to use for drawing the generic controls (return value + // may be NULL in which case the default renderer for the current platform + // is used); this is used in GUI only and always returns NULL in console + // + // NB: returned pointer will be deleted by the caller + virtual wxRendererNative *CreateRenderer() = 0; + // functions abstracting differences between GUI and console modes // ------------------------------------------------------------------------ @@ -83,28 +107,44 @@ public: // wxBase virtual void RemoveFromPendingDelete(wxObject *object) = 0; - - // other miscellaneous helpers - // --------------------------- - - // wxGetOsVersion() behaves differently in GUI and non-GUI builds under - // Unix: in the former case it returns the information about the toolkit - // and in the latter -- about the OS, so we need to virtualize it - virtual int GetOSVersion(int *verMaj, int *verMin) = 0; +#if wxUSE_SOCKETS + // return table of GUI callbacks for GSocket code or NULL in wxBase. This + // is needed because networking classes are in their own library and so + // they can't directly call GUI functions (the same net library can be + // used in both GUI and base apps). To complicate it further, GUI library + // ("wxCore") doesn't depend on networking library and so only a functions + // table can be passed around + virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable() = 0; +#endif + + + // return information about what toolkit is running; we need for two things + // that are both contained in wxBase: + // - wxGetOsVersion() behaves differently in GUI and non-GUI builds under + // Unix: in the former case it returns the information about the toolkit + // and in the latter -- about the OS, so we need to virtualize it + // - wxDynamicLibrary::CanonicalizePluginName() must embed toolkit + // signature in DLL name + virtual wxToolkitInfo& GetToolkitInfo() = 0; }; // ---------------------------------------------------------------------------- // include the platform-specific version of the class // ---------------------------------------------------------------------------- +// NB: test for __UNIX__ before __WXMAC__ as under Darwin we want to use the +// Unix code (and otherwise __UNIX__ wouldn't be defined) #if defined(__WXMSW__) #include "wx/msw/apptbase.h" -#elif defined(__UNIX__) +#elif defined(__UNIX__) && !defined(__EMX__) #include "wx/unix/apptbase.h" +#elif defined(__WXMAC__) + #include "wx/mac/apptbase.h" +#elif defined(__OS2__) + #include "wx/os2/apptbase.h" #else // no platform-specific methods to add to wxAppTraits - typedef // wxAppTraits must be a class because it was forward declared as class - class WXDLLEXPORT wxAppTraits : public wxAppTraitsBase + class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase { }; #endif // platform @@ -127,6 +167,10 @@ public: #if wxUSE_FONTMAP virtual wxFontMapper *CreateFontMapper(); #endif // wxUSE_FONTMAP + virtual wxRendererNative *CreateRenderer(); +#if wxUSE_SOCKETS + virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable(); +#endif #ifdef __WXDEBUG__ virtual bool ShowAssertDialog(const wxString& msg); @@ -153,6 +197,10 @@ public: #if wxUSE_FONTMAP virtual wxFontMapper *CreateFontMapper(); #endif // wxUSE_FONTMAP + virtual wxRendererNative *CreateRenderer(); +#if wxUSE_SOCKETS + virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable(); +#endif #ifdef __WXDEBUG__ virtual bool ShowAssertDialog(const wxString& msg); @@ -171,13 +219,24 @@ public: #if defined(__WXMSW__) #include "wx/msw/apptrait.h" -#elif defined(__UNIX__) +#elif defined(__UNIX__) && !defined(__EMX__) #include "wx/unix/apptrait.h" -#else // no platform-specific methods to add to wxAppTraits +#elif defined(__WXMAC__) + #include "wx/mac/apptrait.h" +#elif defined(__WXPM__) + #include "wx/os2/apptrait.h" +#else + // at least, we need an implementation of GetToolkitInfo ! #if wxUSE_GUI - typedef wxGUIAppTraitsBase wxGUIAppTraits; + class wxGUIAppTraits : public wxGUIAppTraitsBase + { + virtual wxToolkitInfo& GetToolkitInfo(); + }; #endif // wxUSE_GUI - typedef wxConsoleAppTraitsBase wxConsoleAppTraits; + class wxConsoleAppTraits: public wxConsoleAppTraitsBase + { + virtual wxToolkitInfo& GetToolkitInfo(); + }; #endif // platform #endif // _WX_APPTRAIT_H_