X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2404ce8d8aec4de1b892034be47a3c2e0a2d47af..6edd8829ef3d6f29a73590d99abb121942e77100:/include/wx/unix/apptrait.h diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h index 0161332ce4..cd46c08eb5 100644 --- a/include/wx/unix/apptrait.h +++ b/include/wx/unix/apptrait.h @@ -62,7 +62,7 @@ public: #endif #if (defined(__WXMAC__) || defined(__WXCOCOA__)) && wxUSE_STDPATHS - virtual wxStandardPathsBase& GetStandardPaths(); + virtual wxStandardPaths& GetStandardPaths(); #endif virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const; @@ -76,12 +76,12 @@ public: wxArrayString& desc) const; #endif // __WXGTK20____ -#if defined(__WXDEBUG__) && defined(__WXGTK20__) +#if defined(__WXGTK20__) virtual bool ShowAssertDialog(const wxString& msg); #endif #if wxUSE_SOCKETS && defined(wxHAS_GUI_SOCKET_MANAGER) - virtual GSocketManager *GetSocketManager(); + virtual wxSocketManager *GetSocketManager(); #endif };