X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/27a52ff961c6f05c7701e2264ea36ebfa1290832..1f360a2db7cf095b87923ac7673d61f97fcd342c:/src/common/appcmn.cpp

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index c6e0fc945b..f1ea744608 100644
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -240,7 +240,7 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
             return FALSE;
         }
 
-        if ( !SetDisplayMode(wxDisplayModeInfo(w, h, bpp)) )
+        if ( !SetDisplayMode(wxVideoMode(w, h, bpp)) )
             return FALSE;
     }
 #endif // __WXMGL__
@@ -465,7 +465,12 @@ void wxAppBase::OnIdle(wxIdleEvent& WXUNUSED(event))
 
 wxLog *wxGUIAppTraitsBase::CreateLogTarget()
 {
+#if wxUSE_LOGGUI
     return new wxLogGui;
+#else
+    // wem ust have something!
+    return new wxLogStderr;
+#endif
 }
 
 #endif // wxUSE_LOG
@@ -521,7 +526,7 @@ bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
               wxT("You can also choose [Cancel] to suppress ")
               wxT("further warnings.");
 
-    switch ( wxMessageBox(msgDlg, wxT("wxWindows Debug Alert"),
+    switch ( wxMessageBox(msgDlg, wxT("wxWidgets Debug Alert"),
                           wxYES_NO | wxCANCEL | wxICON_STOP ) )
     {
         case wxYES:
@@ -583,6 +588,10 @@ void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object)
 
 GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable()
 {
+#if defined(__WINDOWS__) && defined(wxUSE_GSOCKET_CPLUSPLUS)
+    static GSocketGUIFunctionsTableConcrete table;
+    return &table;
+#else
 #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
@@ -603,6 +612,7 @@ GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable()
     };
     return &table;
 #endif // !__WXMAC__ || __DARWIN__
+#endif // defined(__WINDOWS__) && defined(wxUSE_GSOCKET_CPLUSPLUS)
 }
 
 #endif