X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/apptrait.h?ds=sidebyside diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h index aca979f67a..59861fbfec 100644 --- a/include/wx/apptrait.h +++ b/include/wx/apptrait.h @@ -25,12 +25,12 @@ 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 wxStandardPaths; class WXDLLIMPEXP_FWD_BASE wxString; class WXDLLIMPEXP_FWD_BASE wxTimer; class WXDLLIMPEXP_FWD_BASE wxTimerImpl; -class GSocketGUIFunctionsTable; +class wxSocketManager; // ---------------------------------------------------------------------------- @@ -75,19 +75,12 @@ public: // wxStandardPaths object is normally the same for wxBase and wxGUI // except in the case of wxMac and wxCocoa - virtual wxStandardPathsBase& GetStandardPaths(); - -#if wxUSE_INTL - // called during wxApp initialization to set the locale to correspond to - // the user default (i.e. system locale under Windows, LC_ALL under Unix) - virtual void SetLocale(); -#endif // wxUSE_INTL + virtual wxStandardPaths& GetStandardPaths(); // functions abstracting differences between GUI and console modes // ------------------------------------------------------------------------ -#ifdef __WXDEBUG__ // show the assert dialog with the specified message in GUI or just print // the string to stderr in console mode // @@ -96,33 +89,26 @@ public: // // return true to suppress subsequent asserts, false to continue as before virtual bool ShowAssertDialog(const wxString& msg) = 0; -#endif // __WXDEBUG__ // return true if fprintf(stderr) goes somewhere, false otherwise virtual bool HasStderr() = 0; - // managing "pending delete" list: in GUI mode we can't immediately delete - // some objects because there may be unprocessed events for them and so we - // only do it during the next idle loop iteration while this is, of course, - // unnecessary in wxBase, so we have a few functions to abstract these - // operations - - // add the object to the pending delete list in GUI, delete it immediately - // in wxBase - virtual void ScheduleForDestroy(wxObject *object) = 0; - - // remove this object from the pending delete list in GUI, do nothing in - // wxBase - virtual void RemoveFromPendingDelete(wxObject *object) = 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; + // this function is used by wxNet library to set the default socket manager + // to use: doing it like this allows us to keep all socket-related code in + // wxNet instead of having to pull it in wxBase itself as we'd have to do + // if we really implemented wxSocketManager here + // + // we don't take ownership of this pointer, it should have a lifetime + // greater than that of any socket (e.g. be a pointer to a static object) + static void SetDefaultSocketManager(wxSocketManager *manager) + { + ms_manager = manager; + } + + // return socket manager: this is usually different for console and GUI + // applications (although some ports use the same implementation for both) + virtual wxSocketManager *GetSocketManager() { return ms_manager; } #endif // create a new, port specific, instance of the event loop used by wxApp @@ -133,6 +119,11 @@ public: virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer) = 0; #endif +#if wxUSE_THREADS + virtual void MutexGuiEnter(); + virtual void MutexGuiLeave(); +#endif + // functions returning port-specific information // ------------------------------------------------------------------------ @@ -140,7 +131,7 @@ public: // runtime (not compile-time) version. // returns wxPORT_BASE for console applications and one of the remaining // wxPORT_* values for GUI applications. - virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const = 0; + virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const = 0; // return true if the port is using wxUniversal for the GUI, false if not virtual bool IsUsingUniversalWidgets() const = 0; @@ -164,10 +155,13 @@ public: protected: -#if wxUSE_STACKWALKER && defined( __WXDEBUG__ ) +#if wxUSE_STACKWALKER // utility function: returns the stack frame as a plain wxString virtual wxString GetAssertStackTrace(); #endif + +private: + static wxSocketManager *ms_manager; }; // ---------------------------------------------------------------------------- @@ -177,14 +171,10 @@ protected: // NB: test for __UNIX__ before __WXMAC__ as under Darwin we want to use the // Unix code (and otherwise __UNIX__ wouldn't be defined) // ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port -#if defined(__WXPALMOS__) - #include "wx/palmos/apptbase.h" -#elif defined(__WIN32__) +#if defined(__WIN32__) #include "wx/msw/apptbase.h" #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 @@ -205,6 +195,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 @@ -213,20 +207,12 @@ public: virtual wxFontMapper *CreateFontMapper(); #endif // wxUSE_FONTMAP virtual wxRendererNative *CreateRenderer(); -#if wxUSE_SOCKETS - virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable(); -#endif -#ifdef __WXDEBUG__ virtual bool ShowAssertDialog(const wxString& msg); -#endif // __WXDEBUG__ virtual bool HasStderr(); - virtual void ScheduleForDestroy(wxObject *object); - virtual void RemoveFromPendingDelete(wxObject *object); - // the GetToolkitVersion for console application is always the same - virtual wxPortId GetToolkitVersion(int *verMaj, int *verMin) const + virtual wxPortId GetToolkitVersion(int *verMaj = NULL, int *verMin = NULL) const { // no toolkits (wxBase is for console applications without GUI support) // NB: zero means "no toolkit", -1 means "not initialized yet" @@ -246,7 +232,7 @@ public: #if wxUSE_GUI -class WXDLLEXPORT wxGUIAppTraitsBase : public wxAppTraits +class WXDLLIMPEXP_CORE wxGUIAppTraitsBase : public wxAppTraits { public: #if wxUSE_LOG @@ -257,18 +243,10 @@ public: virtual wxFontMapper *CreateFontMapper(); #endif // wxUSE_FONTMAP virtual wxRendererNative *CreateRenderer(); -#if wxUSE_SOCKETS - virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable(); -#endif -#ifdef __WXDEBUG__ virtual bool ShowAssertDialog(const wxString& msg); -#endif // __WXDEBUG__ virtual bool HasStderr(); - virtual void ScheduleForDestroy(wxObject *object); - virtual void RemoveFromPendingDelete(wxObject *object); - virtual bool IsUsingUniversalWidgets() const { #ifdef __WXUNIVERSAL__ @@ -288,16 +266,12 @@ public: // ---------------------------------------------------------------------------- // ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port -#if defined(__WXPALMOS__) - #include "wx/palmos/apptrait.h" -#elif defined(__WIN32__) +#if defined(__WIN32__) #include "wx/msw/apptrait.h" #elif defined(__OS2__) #include "wx/os2/apptrait.h" #elif defined(__UNIX__) #include "wx/unix/apptrait.h" -#elif defined(__WXMAC__) - #include "wx/mac/apptrait.h" #elif defined(__DOS__) #include "wx/msdos/apptrait.h" #else