]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/appcmn.cpp
keep initial size from changing when frame extents become known
[wxWidgets.git] / src / common / appcmn.cpp
index 789ebaad7040b8bdfafc4ddefc1b45b5eb942ac2..fc3bdeff6211a0de955685a967d3b5ade89c2748 100644 (file)
@@ -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