gtk/window: cleanup dead code around wxTranslateGTKKeyEventToWx

The previous commit made wxTranslateGTKKeyEventToWx never fail, so make it void
and remove all dead code resulting from the lack of failure.
This commit is contained in:
Dominique Martinet
2021-11-02 10:09:14 +09:00
parent 33553ed141
commit 307aaf83d8

View File

@@ -961,7 +961,7 @@ static void wxFillOtherKeyEventFields(wxKeyEvent& event,
}
static bool
static void
wxTranslateGTKKeyEventToWx(wxKeyEvent& event,
wxWindowGTK *win,
GdkEventKey *gdk_event)
@@ -1090,8 +1090,6 @@ wxTranslateGTKKeyEventToWx(wxKeyEvent& event,
// now fill all the other fields
wxFillOtherKeyEventFields(event, win, gdk_event);
return true;
}
@@ -1181,10 +1179,8 @@ gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget),
wxKeyEvent event( wxEVT_KEY_DOWN );
bool ret = false;
bool return_after_IM = false;
if( wxTranslateGTKKeyEventToWx(event, win, gdk_event) )
{
wxTranslateGTKKeyEventToWx(event, win, gdk_event);
// Send the CHAR_HOOK event first
if ( SendCharHookEvent(event, win) )
{
@@ -1223,13 +1219,6 @@ gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget),
// If not an accelerator, then emit KEY_DOWN event
if ( !ret )
ret = win->HandleWindowEvent( event );
}
else
{
// Return after IM processing as we cannot do
// anything with it anyhow.
return_after_IM = true;
}
if ( !ret )
{
@@ -1252,9 +1241,6 @@ gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget),
}
}
if (return_after_IM)
return FALSE;
// Only send wxEVT_CHAR event if not processed yet. Thus, ALT-x
// will only be sent if it is not in an accelerator table.
if (!ret)
@@ -1382,11 +1368,7 @@ gtk_window_key_release_callback( GtkWidget * WXUNUSED(widget),
wxPROCESS_EVENT_ONCE(GdkEventKey, gdk_event);
wxKeyEvent event( wxEVT_KEY_UP );
if ( !wxTranslateGTKKeyEventToWx(event, win, gdk_event) )
{
// unknown key pressed, ignore (the event would be useless anyhow)
return FALSE;
}
wxTranslateGTKKeyEventToWx(event, win, gdk_event);
return win->GTKProcessEvent(event);
}