X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/657a8a359826e46a7fc458216403f54deca34989..6968a3b87cee46f5c5af9b46e1ef97f17133cef7:/include/wx/apptrait.h?ds=sidebyside diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h index 4775f4b9de..59861fbfec 100644 --- a/include/wx/apptrait.h +++ b/include/wx/apptrait.h @@ -25,7 +25,7 @@ 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; @@ -75,13 +75,7 @@ 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 @@ -99,20 +93,6 @@ public: // 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 // 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 @@ -191,9 +171,7 @@ private: // 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" @@ -233,9 +211,6 @@ public: virtual bool ShowAssertDialog(const wxString& msg); 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 = NULL, int *verMin = NULL) const { @@ -272,9 +247,6 @@ public: virtual bool ShowAssertDialog(const wxString& msg); virtual bool HasStderr(); - virtual void ScheduleForDestroy(wxObject *object); - virtual void RemoveFromPendingDelete(wxObject *object); - virtual bool IsUsingUniversalWidgets() const { #ifdef __WXUNIVERSAL__ @@ -294,9 +266,7 @@ 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"