Corrected bug in DoSetSize() (wxALLOW_MINUS_ONE)

[wxWidgets.git] / src / gtk1 / app.cpp

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index a6b21a616b7886bab13ce5a59fa8bfd6e9c4dd6d..85b8b53fb619e5b144e139501b28bde9bada3e21 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -213,7 +213,7 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 
 void wxapp_install_idle_handler()
 {
-    wxASSERT_MSG( wxTheApp->m_idleTag == 0, "attempt to install idle handler twice" );
+    wxASSERT_MSG( wxTheApp->m_idleTag == 0, _T("attempt to install idle handler twice") );
 
     /* this routine gets called by all event handlers
        indicating that the idle is over. */
@@ -250,7 +250,7 @@ static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
     GDK_THREADS_LEAVE ();
 #endif
     
-    wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 10, wxapp_wakeup_timerout_callback, (gpointer) NULL );
+    wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 20, wxapp_wakeup_timerout_callback, (gpointer) NULL );
     
     return TRUE;
 }
@@ -276,7 +276,7 @@ wxApp::wxApp()
     m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
     
 #if wxUSE_THREADS
-    m_wakeUpTimerTag = gtk_timeout_add( 10, wxapp_wakeup_timerout_callback, (gpointer) NULL );
+    m_wakeUpTimerTag = gtk_timeout_add( 20, wxapp_wakeup_timerout_callback, (gpointer) NULL );
 #endif
 
     m_colorCube = (unsigned char*) NULL;
@@ -406,9 +406,11 @@ void wxApp::OnIdle( wxIdleEvent &event )
     DeletePendingObjects();
 
     /* flush the logged messages if any */
+#if wxUSE_LOG
     wxLog *log = wxLog::GetActiveTarget();
     if (log != NULL && log->HasPendingMessages())
         log->Flush();
+#endif // wxUSE_LOG
 
     /* Send OnIdle events to all windows */
     bool needMore = SendIdleEvents();
@@ -635,6 +637,7 @@ void wxApp::CleanUp()
     }
 #endif // Debug
 
+#if wxUSE_LOG
     // do this as the very last thing because everything else can log messages
     wxLog::DontCreateOnDemand();
 
@@ -647,6 +650,7 @@ wxLog *wxApp::CreateLogTarget()
 {
     return new wxLogGui;
 }
+#endif // wxUSE_LOG
 
 //-----------------------------------------------------------------------------
 // wxEntry
@@ -730,6 +734,7 @@ int wxEntry( int argc, char *argv[] )
         }
     }
 
+#if wxUSE_LOG
     // flush the logged messages if any
     wxLog *log = wxLog::GetActiveTarget();
     if (log != NULL && log->HasPendingMessages())
@@ -741,6 +746,7 @@ int wxEntry( int argc, char *argv[] )
     wxLog *oldlog = wxLog::SetActiveTarget(new wxLogStderr);
     if ( oldlog )
         delete oldlog;
+#endif // wxUSE_LOG
 
     wxApp::CleanUp();