Removed warnings from ipcbase.cpp

Removed extra wxYields from progress dialog
Yield on wxX11 yields twice

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/ipcbase.cpp b/src/common/ipcbase.cpp
index 9d7c3dab2940cbd1a16260a50b8c355de7fe1c94..44ec4f166a716234f247809ce761b4c1f22e9ae4 100644 (file)
--- a/src/common/ipcbase.cpp
+++ b/src/common/ipcbase.cpp
@@ -31,8 +31,10 @@ IMPLEMENT_CLASS(wxClientBase, wxObject)
 IMPLEMENT_CLASS(wxConnectionBase, wxObject)
 
 wxConnectionBase::wxConnectionBase(wxChar *buffer, int size)
-  : m_buffer(buffer), m_buffersize(size),
-    m_deletebufferwhendone(false), m_connected(true)
+    : m_connected(true),
+      m_buffer(buffer), 
+      m_buffersize(size),
+      m_deletebufferwhendone(false)
 {
   if ( buffer == (wxChar *)NULL )
   { // behave like next constructor
@@ -42,14 +44,19 @@ wxConnectionBase::wxConnectionBase(wxChar *buffer, int size)
 }
 
 wxConnectionBase::wxConnectionBase()
-  : m_buffersize(0), m_buffer(NULL), m_deletebufferwhendone(true),
-    m_connected(true)
+    : m_connected(true),
+      m_buffer(NULL),
+      m_buffersize(0),
+      m_deletebufferwhendone(true)
 {
 }
 
 wxConnectionBase::wxConnectionBase(wxConnectionBase& copy)
-  : m_buffer(copy.m_buffer), m_buffersize(copy.m_buffersize),
-    m_deletebufferwhendone(false), m_connected(copy.m_connected)
+    : m_connected(copy.m_connected),
+      m_buffer(copy.m_buffer),
+      m_buffersize(copy.m_buffersize),
+      m_deletebufferwhendone(false)
+
 {
   // copy constructor would require ref-counted pointer to buffer
   wxFAIL_MSG( _T("Copy constructor of wxConnectionBase not implemented") );

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index ee3323037a8d4134d98a2bc1cd40cea6289755f4..169a7ea949460c18a6ecbecbb884f428ba6bfebe 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/src/generic/progdlgg.cpp
@@ -269,11 +269,6 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
     // Update the display (especially on X, GTK)
     wxYield();
 
-    // FIXME: shouldn't be needed
-#ifdef __WXX11__
-    wxYield();
-#endif
-
 #ifdef __WXMAC__
     MacUpdateImmediately();
 #endif
@@ -337,11 +332,6 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
         m_msg->SetLabel(newmsg);
 
         wxYield();
-
-        // FIXME: shouldn't be needed
-#ifdef __WXX11__
-        wxYield();
-#endif
     }
 
     if ( (m_elapsed || m_remaining || m_estimated) && (value != 0) )
@@ -382,11 +372,6 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
 
             wxYield();
 
-            // FIXME: shouldn't be needed
-#ifdef __WXX11__
-            wxYield();
-#endif
-
             (void)ShowModal();
         }
         else // auto hide
@@ -403,11 +388,6 @@ wxProgressDialog::Update(int value, const wxString& newmsg)
     {
         // update the display
         wxYield();
-
-        // FIXME: shouldn't be needed
-#ifdef __WXX11__
-        wxYield();
-#endif
     }
 
 #ifdef __WXMAC__

diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp
index 7294f94ee31d552c36a3f79fed73f73fe714fe6b..c46854c9e92608fd63e4ea49ef60dc3fe7102114 100644 (file)
--- a/src/generic/timer.cpp
+++ b/src/generic/timer.cpp
@@ -90,8 +90,8 @@ void wxTimerScheduler::QueueTimer(wxTimerDesc *desc, unsigned long when)
     desc->shotTime = when;
     desc->running = TRUE;
 
-    wxLogTrace("timer", "queued timer %p at tick %i", 
-               desc->timer, when);
+    wxLogTrace("timer", "queued timer %p at tick %ld", 
+               desc->timer, (long) when);
 
     if ( m_timers )
     {
@@ -143,8 +143,8 @@ void wxTimerScheduler::NotifyTimers()
             
             if ( !timerDeleted )
             {
-                wxLogTrace("timer", "notified timer %p sheduled for %i", 
-                           desc->timer, desc->shotTime);
+                wxLogTrace("timer", "notified timer %p sheduled for %ld", 
+                           desc->timer, (long) desc->shotTime);
 
                 desc->deleteFlag = NULL;
                 if ( !oneShot )

diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
index 08a6f769c332dd80471b2d53f2bfca41dc1d4d12..0e8aeaddd2d4750f7d1156cc15730450faafabea 100644 (file)
--- a/src/unix/fontutil.cpp
+++ b/src/unix/fontutil.cpp
@@ -1040,4 +1040,3 @@ void wxFontModule::OnExit()
 
 #endif
   // not GTK 2.0
-  
\ No newline at end of file

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 90daa58df0c2f04d597b343b70fd37565717349a..b42979accb583e38af149d29bafd22aad92196b3 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -1174,45 +1174,52 @@ void wxExit()
 
 bool wxApp::Yield(bool onlyIfNeeded)
 {
-    bool s_inYield = FALSE;
-
-    if ( s_inYield )
+    // Sometimes only 2 yields seem
+    // to do the trick, e.g. in the
+    // progress dialog
+    int i;
+    for (i = 0; i < 2; i++)
     {
-        if ( !onlyIfNeeded )
+        bool s_inYield = FALSE;
+
+        if ( s_inYield )
         {
-            wxFAIL_MSG( wxT("wxYield called recursively" ) );
-        }
+            if ( !onlyIfNeeded )
+            {
+                wxFAIL_MSG( wxT("wxYield called recursively" ) );
+            }
 
-        return FALSE;
-    }
+            return FALSE;
+        }
 
-    s_inYield = TRUE;
+        s_inYield = TRUE;
 
-    // Make sure we have an event loop object,
-    // or Pending/Dispatch will fail
-    wxEventLoop* eventLoop = wxEventLoop::GetActive();
-    wxEventLoop* newEventLoop = NULL;
-    if (!eventLoop)
-    {
-        newEventLoop = new wxEventLoop;
-        wxEventLoop::SetActive(newEventLoop);
-    }
+        // Make sure we have an event loop object,
+        // or Pending/Dispatch will fail
+        wxEventLoop* eventLoop = wxEventLoop::GetActive();
+        wxEventLoop* newEventLoop = NULL;
+        if (!eventLoop)
+        {
+            newEventLoop = new wxEventLoop;
+            wxEventLoop::SetActive(newEventLoop);
+        }
 
-    while (wxTheApp && wxTheApp->Pending())
-        wxTheApp->Dispatch();
+        while (wxTheApp && wxTheApp->Pending())
+            wxTheApp->Dispatch();
 
 #if wxUSE_TIMER
-    wxTimer::NotifyTimers();
+        wxTimer::NotifyTimers();
 #endif
-    ProcessIdle();
+        ProcessIdle();
 
-    if (newEventLoop)
-    {
-        wxEventLoop::SetActive(NULL);
-        delete newEventLoop;
-    }
+        if (newEventLoop)
+        {
+            wxEventLoop::SetActive(NULL);
+            delete newEventLoop;
+        }
 
-    s_inYield = FALSE;
+        s_inYield = FALSE;
+    }
 
     return TRUE;
 }