X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d5ab92f849923daa1418661aaf55135cddd4e47..d475dd224790d3fcd530492228eee431a1e44356:/src/common/appcmn.cpp diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index 789ebaad70..fc3bdeff62 100644 --- a/src/common/appcmn.cpp +++ b/src/common/appcmn.cpp @@ -189,8 +189,8 @@ wxLayoutDirection wxAppBase::GetLayoutDirection() const // GUI-specific command line options handling // ---------------------------------------------------------------------------- -#define OPTION_THEME _T("theme") -#define OPTION_MODE _T("mode") +#define OPTION_THEME "theme" +#define OPTION_MODE "mode" void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser) { @@ -565,14 +565,8 @@ void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object) GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable() { -#if defined(__WXMAC__) && !defined(__DARWIN__) - // NB: wxMac CFM does not have any GUI-specific functions in gsocket.c and - // so it doesn't need this table at all - return NULL; -#else // !__WXMAC__ || __DARWIN__ static GSocketGUIFunctionsTableConcrete table; return &table; -#endif // !__WXMAC__ || __DARWIN__ } #endif