From 73847506eb8117c8e116b69a9ae57a55c0c90901 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 22 Apr 2002 15:44:36 +0000 Subject: [PATCH] removed unused OnSetFocus() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/toplevel.h | 5 ----- include/wx/gtk1/toplevel.h | 5 ----- src/gtk/toplevel.cpp | 17 ----------------- src/gtk1/toplevel.cpp | 17 ----------------- 4 files changed, 44 deletions(-) diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h index 1f4a35c268..2cc960a242 100644 --- a/include/wx/gtk/toplevel.h +++ b/include/wx/gtk/toplevel.h @@ -101,9 +101,6 @@ protected: // common part of all ctors void Init(); - // focus event handler - void OnSetFocus(wxFocusEvent& event); - // override wxWindow methods to take into account tool/menu/statusbars virtual void DoSetSize(int x, int y, int width, int height, @@ -114,8 +111,6 @@ protected: // is the frame currently iconized? bool m_isIconized; - - DECLARE_EVENT_TABLE() }; #endif // __GTKTOPLEVELH__ diff --git a/include/wx/gtk1/toplevel.h b/include/wx/gtk1/toplevel.h index 1f4a35c268..2cc960a242 100644 --- a/include/wx/gtk1/toplevel.h +++ b/include/wx/gtk1/toplevel.h @@ -101,9 +101,6 @@ protected: // common part of all ctors void Init(); - // focus event handler - void OnSetFocus(wxFocusEvent& event); - // override wxWindow methods to take into account tool/menu/statusbars virtual void DoSetSize(int x, int y, int width, int height, @@ -114,8 +111,6 @@ protected: // is the frame currently iconized? bool m_isIconized; - - DECLARE_EVENT_TABLE() }; #endif // __GTKTOPLEVELH__ diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp index 9f5beeea7c..ee320bc684 100644 --- a/src/gtk/toplevel.cpp +++ b/src/gtk/toplevel.cpp @@ -248,10 +248,6 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW // wxTopLevelWindowGTK itself // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(wxTopLevelWindowGTK, wxTopLevelWindowBase) - EVT_SET_FOCUS(wxTopLevelWindowGTK::OnSetFocus) -END_EVENT_TABLE() - //----------------------------------------------------------------------------- // InsertChild for wxTopLevelWindowGTK //----------------------------------------------------------------------------- @@ -775,19 +771,6 @@ void wxTopLevelWindowGTK::OnInternalIdle() wxWindow::OnInternalIdle(); } -void wxTopLevelWindowGTK::OnSetFocus(wxFocusEvent& event) -{ -#if 0 - if ( !g_delayedFocus || wxGetTopLevelParent(g_delayedFocus) != this ) - { - // let the base class version set the focus to the first child which - // accepts it - event.Skip(); - } - //else: the focus will be really set from OnInternalIdle() later -#endif -} - // ---------------------------------------------------------------------------- // frame title/icon // ---------------------------------------------------------------------------- diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp index 9f5beeea7c..ee320bc684 100644 --- a/src/gtk1/toplevel.cpp +++ b/src/gtk1/toplevel.cpp @@ -248,10 +248,6 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW // wxTopLevelWindowGTK itself // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(wxTopLevelWindowGTK, wxTopLevelWindowBase) - EVT_SET_FOCUS(wxTopLevelWindowGTK::OnSetFocus) -END_EVENT_TABLE() - //----------------------------------------------------------------------------- // InsertChild for wxTopLevelWindowGTK //----------------------------------------------------------------------------- @@ -775,19 +771,6 @@ void wxTopLevelWindowGTK::OnInternalIdle() wxWindow::OnInternalIdle(); } -void wxTopLevelWindowGTK::OnSetFocus(wxFocusEvent& event) -{ -#if 0 - if ( !g_delayedFocus || wxGetTopLevelParent(g_delayedFocus) != this ) - { - // let the base class version set the focus to the first child which - // accepts it - event.Skip(); - } - //else: the focus will be really set from OnInternalIdle() later -#endif -} - // ---------------------------------------------------------------------------- // frame title/icon // ---------------------------------------------------------------------------- -- 2.45.2