Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverted accidentally committed changes in previous revision

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-08-14 22:54:11 +00:00
parent 40bab631d2
commit 61721d057e
2 changed files with 0 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gtk/window.cpp
View File

@@ -251,16 +251,6 @@ static bool g_activeFrameLostFocus = FALSE;
// yet, defer setting the focus to idle time. // yet, defer setting the focus to idle time.
wxWindowGTK *g_delayedFocus = (wxWindowGTK*) NULL; wxWindowGTK *g_delayedFocus = (wxWindowGTK*) NULL;
// When GTK+ focus_in/out signal is being processed, we shouldn't do
// any focus changes
static bool gs_inFocusSignalHandler = false;
struct InFocusHandlerLock
{
InFocusHandlerLock() { gs_inFocusSignalHandler = true; }
~InFocusHandlerLock() { gs_inFocusSignalHandler = false; }
};
// if we detect that the app has got/lost the focus, we set this variable to // if we detect that the app has got/lost the focus, we set this variable to
// either TRUE or FALSE and an activate event will be sent during the next // either TRUE or FALSE and an activate event will be sent during the next
// OnIdle() call and it is reset to -1: this value means that we shouldn't // OnIdle() call and it is reset to -1: this value means that we shouldn't
@@ -1973,8 +1963,6 @@ static gint gtk_window_focus_in_callback( GtkWidget *widget,
GdkEvent *WXUNUSED(event), GdkEvent *WXUNUSED(event),
wxWindow *win ) wxWindow *win )
{ {
InFocusHandlerLock flock;
DEBUG_MAIN_THREAD DEBUG_MAIN_THREAD
if (g_isIdle) if (g_isIdle)
@@ -2070,8 +2058,6 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEventFocus *gdk
{ {
DEBUG_MAIN_THREAD DEBUG_MAIN_THREAD
InFocusHandlerLock flock;
if (g_isIdle) if (g_isIdle)
wxapp_install_idle_handler(); wxapp_install_idle_handler();
@@ -3622,14 +3608,6 @@ void wxWindowGTK::SetFocus()
return; return;
} }
if (gs_inFocusSignalHandler)
{
wxLogTrace(TRACE_FOCUS,
_T("in focus handler, delaying SetFocus(%p)"), this);
g_delayedFocus = this;
return;
}
if (m_wxwindow) if (m_wxwindow)
{ {
if (!GTK_WIDGET_HAS_FOCUS (m_wxwindow)) if (!GTK_WIDGET_HAS_FOCUS (m_wxwindow))

22
src/gtk1/window.cpp
View File

@@ -251,16 +251,6 @@ static bool g_activeFrameLostFocus = FALSE;
// yet, defer setting the focus to idle time. // yet, defer setting the focus to idle time.
wxWindowGTK *g_delayedFocus = (wxWindowGTK*) NULL; wxWindowGTK *g_delayedFocus = (wxWindowGTK*) NULL;
// When GTK+ focus_in/out signal is being processed, we shouldn't do
// any focus changes
static bool gs_inFocusSignalHandler = false;
struct InFocusHandlerLock
{
InFocusHandlerLock() { gs_inFocusSignalHandler = true; }
~InFocusHandlerLock() { gs_inFocusSignalHandler = false; }
};
// if we detect that the app has got/lost the focus, we set this variable to // if we detect that the app has got/lost the focus, we set this variable to
// either TRUE or FALSE and an activate event will be sent during the next // either TRUE or FALSE and an activate event will be sent during the next
// OnIdle() call and it is reset to -1: this value means that we shouldn't // OnIdle() call and it is reset to -1: this value means that we shouldn't
@@ -1973,8 +1963,6 @@ static gint gtk_window_focus_in_callback( GtkWidget *widget,
GdkEvent *WXUNUSED(event), GdkEvent *WXUNUSED(event),
wxWindow *win ) wxWindow *win )
{ {
InFocusHandlerLock flock;
DEBUG_MAIN_THREAD DEBUG_MAIN_THREAD
if (g_isIdle) if (g_isIdle)
@@ -2070,8 +2058,6 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEventFocus *gdk
{ {
DEBUG_MAIN_THREAD DEBUG_MAIN_THREAD
InFocusHandlerLock flock;
if (g_isIdle) if (g_isIdle)
wxapp_install_idle_handler(); wxapp_install_idle_handler();
@@ -3622,14 +3608,6 @@ void wxWindowGTK::SetFocus()
return; return;
} }
if (gs_inFocusSignalHandler)
{
wxLogTrace(TRACE_FOCUS,
_T("in focus handler, delaying SetFocus(%p)"), this);
g_delayedFocus = this;
return;
}
if (m_wxwindow) if (m_wxwindow)
{ {
if (!GTK_WIDGET_HAS_FOCUS (m_wxwindow)) if (!GTK_WIDGET_HAS_FOCUS (m_wxwindow))