The return types for enter/leave-notify-event and focus-in/out-event handlers are gboolean, not gint
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1835,9 +1835,9 @@ static bool DoSendFocusEvents(wxWindow *win)
|
|||||||
}
|
}
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
static gint gtk_window_focus_in_callback( GtkWidget *widget,
|
static gboolean gtk_window_focus_in_callback( GtkWidget *widget,
|
||||||
GdkEvent *WXUNUSED(event),
|
GdkEvent *WXUNUSED(event),
|
||||||
wxWindow *win )
|
wxWindow *win )
|
||||||
{
|
{
|
||||||
DEBUG_MAIN_THREAD
|
DEBUG_MAIN_THREAD
|
||||||
|
|
||||||
@@ -1894,7 +1894,9 @@ static gint gtk_window_focus_in_callback( GtkWidget *widget,
|
|||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEventFocus *gdk_event, wxWindowGTK *win )
|
static gboolean gtk_window_focus_out_callback( GtkWidget *widget,
|
||||||
|
GdkEventFocus *gdk_event,
|
||||||
|
wxWindowGTK *win )
|
||||||
{
|
{
|
||||||
DEBUG_MAIN_THREAD
|
DEBUG_MAIN_THREAD
|
||||||
|
|
||||||
@@ -1958,10 +1960,10 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEventFocus *gdk
|
|||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
static
|
static gboolean
|
||||||
gint gtk_window_enter_callback( GtkWidget *widget,
|
gtk_window_enter_callback( GtkWidget *widget,
|
||||||
GdkEventCrossing *gdk_event,
|
GdkEventCrossing *gdk_event,
|
||||||
wxWindowGTK *win )
|
wxWindowGTK *win )
|
||||||
{
|
{
|
||||||
DEBUG_MAIN_THREAD
|
DEBUG_MAIN_THREAD
|
||||||
|
|
||||||
@@ -2003,7 +2005,10 @@ gint gtk_window_enter_callback( GtkWidget *widget,
|
|||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
static gint gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxWindowGTK *win )
|
static gboolean
|
||||||
|
gtk_window_leave_callback( GtkWidget *widget,
|
||||||
|
GdkEventCrossing *gdk_event,
|
||||||
|
wxWindowGTK *win )
|
||||||
{
|
{
|
||||||
DEBUG_MAIN_THREAD
|
DEBUG_MAIN_THREAD
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user