projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
restored accidentally removed code which deselects the previously selected button...
[wxWidgets.git]
/
src
/
gtk1
/
evtloop.cpp
diff --git
a/src/gtk1/evtloop.cpp
b/src/gtk1/evtloop.cpp
index 7891cbacd38ef96c403260cce258d18db3161011..ac59d77edbda27c8c045cd377c0116a98b5cbf63 100644
(file)
--- a/
src/gtk1/evtloop.cpp
+++ b/
src/gtk1/evtloop.cpp
@@
-6,7
+6,7
@@
// Created: 10.07.01
// RCS-ID: $Id$
// Copyright: (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Created: 10.07.01
// RCS-ID: $Id$
// Copyright: (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License: wxWi
dget
s licence
+// License: wxWi
ndow
s licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
@@
-28,10
+28,8
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
-#ifndef WX_PRECOMP
-#endif //WX_PRECOMP
-
#include "wx/evtloop.h"
#include "wx/evtloop.h"
+#include "wx/app.h"
#include <gtk/gtk.h>
#include <gtk/gtk.h>
@@
-62,18
+60,13
@@
private:
// wxEventLoop running and exiting
// ----------------------------------------------------------------------------
// wxEventLoop running and exiting
// ----------------------------------------------------------------------------
-wxEventLoop *wxEventLoop::ms_activeLoop = NULL;
+wxEventLoop *wxEventLoop
Base
::ms_activeLoop = NULL;
wxEventLoop::~wxEventLoop()
{
wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
}
wxEventLoop::~wxEventLoop()
{
wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
}
-bool wxEventLoop::IsRunning() const
-{
- return m_impl != NULL;
-}
-
int wxEventLoop::Run()
{
// event loops are not recursive, you need to create another loop!
int wxEventLoop::Run()
{
// event loops are not recursive, you need to create another loop!
@@
-110,7
+103,14
@@
void wxEventLoop::Exit(int rc)
bool wxEventLoop::Pending() const
{
bool wxEventLoop::Pending() const
{
- return gtk_events_pending() > 0;
+ if (wxTheApp)
+ {
+ // We need to remove idle callbacks or gtk_events_pending will
+ // never return false.
+ wxTheApp->RemoveIdleTag();
+ }
+
+ return gtk_events_pending();
}
bool wxEventLoop::Dispatch()
}
bool wxEventLoop::Dispatch()