correct GetBestSize() to return correct best size, i.e. the same size as AutoSize...

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index d78d893db2d4ab665c181dea535849f02c726617..e68e9654d6e07a13627cefececabd69214588ded 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -135,7 +135,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
     // We need to remove idle callbacks or the loop will
     // never finish.
 
     // We need to remove idle callbacks or the loop will
     // never finish.

-    RemoveIdleSource();
+    SuspendIdleCallback();

 
 #if wxUSE_LOG
     // disable log flushing from here because a call to wxYield() shouldn't
 
 #if wxUSE_LOG
     // disable log flushing from here because a call to wxYield() shouldn't


@@ -208,31 +208,32 @@ static inline void wxAddEmissionHook()
 
 static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {
 
 static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {

+    // this does not look possible, but just in case...

     if (!wxTheApp)
         return false;
 
     if (!wxTheApp)
         return false;
 

+    bool moreIdles = false;
+

 #ifdef __WXDEBUG__
     // don't generate the idle events while the assert modal dialog is shown,
 #ifdef __WXDEBUG__
     // don't generate the idle events while the assert modal dialog is shown,

-    // this completely confuses the apps which don't expect to be reentered
-    // from some safely-looking functions
-    if ( wxTheApp->IsInAssert() )
-        return false;
+    // this matches the behavior of wxMSW
+    if (!wxTheApp->IsInAssert())

 #endif // __WXDEBUG__
 #endif // __WXDEBUG__

-
-    // When getting called from GDK's time-out handler
-    // we are no longer within GDK's grab on the GUI
-    // thread so we must lock it here ourselves.
-    gdk_threads_enter();
-
-    bool moreIdles;
-
-    // Send idle event to all who request them as long as
-    // no events have popped up in the event queue.
-    while ( (moreIdles = wxTheApp->ProcessIdle()) && gtk_events_pending() == 0)
-        ;
-
-    // Release lock again
-    gdk_threads_leave();
+    {
+        // When getting called from GDK's time-out handler
+        // we are no longer within GDK's grab on the GUI
+        // thread so we must lock it here ourselves.
+        gdk_threads_enter();
+
+        // Send idle event to all who request them as long as
+        // no events have popped up in the event queue.
+        do {
+            moreIdles = wxTheApp->ProcessIdle();
+        } while (moreIdles && gtk_events_pending() == 0);
+
+        // Release lock again
+        gdk_threads_leave();
+    }

 
     if (!moreIdles)
     {
 
     if (!moreIdles)
     {


@@ -508,7 +509,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     //     of the filenames for GTK+ programs, so use it if it is set
     wxString encName(wxGetenv(_T("G_FILENAME_ENCODING")));
     encName = encName.BeforeFirst(_T(','));
     //     of the filenames for GTK+ programs, so use it if it is set
     wxString encName(wxGetenv(_T("G_FILENAME_ENCODING")));
     encName = encName.BeforeFirst(_T(','));

-    if (encName == _T("@locale"))
+    if (encName.CmpNoCase(_T("@locale")) == 0)

         encName.clear();
     encName.MakeUpper();
 #if wxUSE_INTL
         encName.clear();
     encName.MakeUpper();
 #if wxUSE_INTL


@@ -616,6 +617,8 @@ void wxApp::OnAssertFailure(const wxChar *file,
                             const wxChar* cond,
                             const wxChar *msg)
 {
                             const wxChar* cond,
                             const wxChar *msg)
 {

+
+    // block wx idle events while assert dialog is showing

     m_isInAssert = true;
 
     wxAppBase::OnAssertFailure(file, line, func, cond, msg);
     m_isInAssert = true;
 
     wxAppBase::OnAssertFailure(file, line, func, cond, msg);


@@ -625,7 +628,7 @@ void wxApp::OnAssertFailure(const wxChar *file,
 
 #endif // __WXDEBUG__
 
 
 #endif // __WXDEBUG__
 

-void wxApp::RemoveIdleSource()
+void wxApp::SuspendIdleCallback()

 {
 #if wxUSE_THREADS
     wxMutexLocker lock(gs_idleTagsMutex);
 {
 #if wxUSE_THREADS
     wxMutexLocker lock(gs_idleTagsMutex);