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

Applied patch, fixes #12090: wxGTK cursor handling revamp

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2010-05-26 17:37:55 +00:00
parent 443fbbf7ae
commit c2246a3881
8 changed files with 55 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gtk/cursor.cpp
View File

@@ -374,7 +374,7 @@ const wxCursor wxBusyCursor::GetBusyCursor()
return wxCursor(wxCURSOR_WATCH);
}
static void InternalIdle(const wxWindowList& list, GdkDisplay*& display)
static void UpdateCursors(const wxWindowList& list, GdkDisplay*& display)
{
wxWindowList::const_iterator i = list.begin();
for (size_t n = list.size(); n--; ++i)
@@ -382,8 +382,8 @@ static void InternalIdle(const wxWindowList& list, GdkDisplay*& display)
wxWindow* win = *i;
if (display == NULL && win->m_widget && win->m_widget->window)
display = gdk_drawable_get_display(win->m_widget->window);
win->OnInternalIdle();
InternalIdle(win->GetChildren(), display);
win->GTKUpdateCursor(true, false);
UpdateCursors(win->GetChildren(), display);
}
}
@@ -395,7 +395,7 @@ void wxEndBusyCursor()
g_globalCursor = gs_savedCursor;
gs_savedCursor = wxNullCursor;
GdkDisplay* unused = NULL;
InternalIdle(wxTopLevelWindows, unused);
UpdateCursors(wxTopLevelWindows, unused);
}
void wxBeginBusyCursor(const wxCursor* cursor)
@@ -409,7 +409,7 @@ void wxBeginBusyCursor(const wxCursor* cursor)
gs_savedCursor = g_globalCursor;
g_globalCursor = *cursor;
GdkDisplay* display = NULL;
InternalIdle(wxTopLevelWindows, display);
UpdateCursors(wxTopLevelWindows, display);
if (display)
gdk_display_flush(display);
}
@@ -422,5 +422,6 @@ bool wxIsBusy()
void wxSetCursor( const wxCursor& cursor )
{
g_globalCursor = cursor;
wxTheApp->WakeUpIdle();
GdkDisplay* unused = NULL;
UpdateCursors(wxTopLevelWindows, unused);
}