Provide stub for wxDisplayBase::GetCount()

[wxWidgets.git] / src / common / appcmn.cpp

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 769a9d18b5e4be5e8a9a39852a4d2809af0b4347..f1ea7446085b3ee7bf5f8c78c63ae9cac9cb7912 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -465,7 +465,12 @@ void wxAppBase::OnIdle(wxIdleEvent& WXUNUSED(event))
 
 wxLog *wxGUIAppTraitsBase::CreateLogTarget()
 {
 
 wxLog *wxGUIAppTraitsBase::CreateLogTarget()
 {

+#if wxUSE_LOGGUI

     return new wxLogGui;
     return new wxLogGui;

+#else
+    // wem ust have something!
+    return new wxLogStderr;
+#endif

 }
 
 #endif // wxUSE_LOG
 }
 
 #endif // wxUSE_LOG


@@ -521,7 +526,7 @@ bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
               wxT("You can also choose [Cancel] to suppress ")
               wxT("further warnings.");
 
               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:
                           wxYES_NO | wxCANCEL | wxICON_STOP ) )
     {
         case wxYES:


@@ -583,6 +588,10 @@ void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object)
 
 GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable()
 {
 
 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
 #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__
     };
     return &table;
 #endif // !__WXMAC__ || __DARWIN__

+#endif // defined(__WINDOWS__) && defined(wxUSE_GSOCKET_CPLUSPLUS)

 }
 
 #endif
 }
 
 #endif