X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51fe4b60ab4fec78eb1a67473d08b1c4740d03f5..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/apptrait.h?ds=sidebyside diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h index cbc3867147..52c815bf13 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,7 +75,7 @@ public: // wxStandardPaths object is normally the same for wxBase and wxGUI // except in the case of wxMac and wxCocoa - virtual wxStandardPathsBase& GetStandardPaths(); + virtual wxStandardPaths& GetStandardPaths(); #if wxUSE_INTL // called during wxApp initialization to set the locale to correspond to @@ -87,7 +87,6 @@ public: // 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,7 +95,6 @@ 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; @@ -177,7 +175,7 @@ public: protected: -#if wxUSE_STACKWALKER && defined( __WXDEBUG__ ) +#if wxUSE_STACKWALKER // utility function: returns the stack frame as a plain wxString virtual wxString GetAssertStackTrace(); #endif @@ -232,9 +230,7 @@ public: #endif // wxUSE_FONTMAP virtual wxRendererNative *CreateRenderer(); -#ifdef __WXDEBUG__ virtual bool ShowAssertDialog(const wxString& msg); -#endif // __WXDEBUG__ virtual bool HasStderr(); virtual void ScheduleForDestroy(wxObject *object); @@ -273,9 +269,7 @@ public: #endif // wxUSE_FONTMAP virtual wxRendererNative *CreateRenderer(); -#ifdef __WXDEBUG__ virtual bool ShowAssertDialog(const wxString& msg); -#endif // __WXDEBUG__ virtual bool HasStderr(); virtual void ScheduleForDestroy(wxObject *object);