Applied a few old patches,
Changed dclick handling in wxFileDialog, Added cursor code to wxToolBar git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -32,7 +32,8 @@ extern bool g_isIdle;
|
||||
// data
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
extern bool g_blockEventsOnDrag;
|
||||
extern bool g_blockEventsOnDrag;
|
||||
extern wxCursor g_globalCursor;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// "clicked" (internal from gtk_toolbar)
|
||||
@@ -598,4 +599,35 @@ void wxToolBar::OnIdle( wxIdleEvent &WXUNUSED(ievent) )
|
||||
}
|
||||
}
|
||||
|
||||
void wxToolBar::OnInternalIdle()
|
||||
{
|
||||
wxCursor cursor = m_cursor;
|
||||
if (g_globalCursor.Ok()) cursor = g_globalCursor;
|
||||
|
||||
if (cursor.Ok() && m_currentGdkCursor != cursor)
|
||||
{
|
||||
wxCursor oldGdkCursor = m_currentGdkCursor;
|
||||
m_currentGdkCursor = cursor;
|
||||
|
||||
wxNode *node = m_tools.First();
|
||||
while (node)
|
||||
{
|
||||
wxToolBarTool *tool = (wxToolBarTool*)node->Data();
|
||||
if (!tool->m_item->window)
|
||||
{
|
||||
/* windows not yet realized. come back later. */
|
||||
m_currentGdkCursor = oldGdkCursor;
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
gdk_window_set_cursor( tool->m_item->window, m_currentGdkCursor.GetCursor() );
|
||||
}
|
||||
node = node->Next();
|
||||
}
|
||||
}
|
||||
|
||||
UpdateWindowUI();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user