Allow EVT_CHAR events in a wxGTK2 build for F-keys, and other

non-alphanumeric keys.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 6b8510a2e4a9819945ae489ef08ca01e4591e98a..ddd4ba38f368b22b9742a0aaa386b828391dd9ec 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -1217,6 +1217,8 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
         return true;
     }
     
         return true;
     }
     

+#endif  // #ifndef  __WXGTK20__
+

     // 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)
     // 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)


@@ -1262,7 +1264,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
             }
         }
     }
             }
         }
     }

-#endif  // #ifndef  __WXGTK20__
+

 
 
 #if wxUSE_ACCEL
 
 
 #if wxUSE_ACCEL

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 6b8510a2e4a9819945ae489ef08ca01e4591e98a..ddd4ba38f368b22b9742a0aaa386b828391dd9ec 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -1217,6 +1217,8 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
         return true;
     }
     
         return true;
     }
     

+#endif  // #ifndef  __WXGTK20__
+

     // 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)
     // 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)


@@ -1262,7 +1264,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget,
             }
         }
     }
             }
         }
     }

-#endif  // #ifndef  __WXGTK20__
+

 
 
 #if wxUSE_ACCEL
 
 
 #if wxUSE_ACCEL