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

Left click only focuses if the event wasn't handled

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@48155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-08-18 11:02:42 +00:00
parent 814495f08b
commit 6850d91fa4
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gtk/window.cpp
View File

@@ -1464,11 +1464,6 @@ gtk_window_button_press_callback( GtkWidget *widget,
g_lastButtonNumber = gdk_event->button; g_lastButtonNumber = gdk_event->button;
if (win->m_wxwindow && (g_focusWindow != win) && win->AcceptsFocus())
{
gtk_widget_grab_focus( win->m_wxwindow );
}
// GDK sends surplus button down events // GDK sends surplus button down events
// before a double click event. We // before a double click event. We
// need to filter these out. // need to filter these out.
@@ -1599,6 +1594,12 @@ gtk_window_button_press_callback( GtkWidget *widget,
if ( ret ) if ( ret )
return TRUE; return TRUE;
if ((event_type == wxEVT_LEFT_DOWN) &&
(g_focusWindow != win) && win->AcceptsFocus())
{
win->SetFocus();
}
if (event_type == wxEVT_RIGHT_DOWN) if (event_type == wxEVT_RIGHT_DOWN)
{ {
// generate a "context menu" event: this is similar to right mouse // generate a "context menu" event: this is similar to right mouse