removed unused OnSetFocus()

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

diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index 1f4a35c268d6317557e6b7ba0f25cd27b2c1f38a..2cc960a242a5b94fb6f83ed248ae3e80a0013ea2 100644 (file)
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -101,9 +101,6 @@ protected:
     // common part of all ctors
     void Init();
 
     // 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,
     // 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;
 
     // is the frame currently iconized?
     bool m_isIconized;

-
-    DECLARE_EVENT_TABLE()

 };
 
 #endif // __GTKTOPLEVELH__
 };
 
 #endif // __GTKTOPLEVELH__

diff --git a/include/wx/gtk1/toplevel.h b/include/wx/gtk1/toplevel.h
index 1f4a35c268d6317557e6b7ba0f25cd27b2c1f38a..2cc960a242a5b94fb6f83ed248ae3e80a0013ea2 100644 (file)
--- a/include/wx/gtk1/toplevel.h
+++ b/include/wx/gtk1/toplevel.h
@@ -101,9 +101,6 @@ protected:
     // common part of all ctors
     void Init();
 
     // 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,
     // 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;
 
     // is the frame currently iconized?
     bool m_isIconized;

-
-    DECLARE_EVENT_TABLE()

 };
 
 #endif // __GTKTOPLEVELH__
 };
 
 #endif // __GTKTOPLEVELH__

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 9f5beeea7c234aaac0c55790d7dcd81a6b83d37f..ee320bc684c25da26d2b04f17bedc1d814007714 100644 (file)
--- 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
 // ----------------------------------------------------------------------------
 
 // wxTopLevelWindowGTK itself
 // ----------------------------------------------------------------------------
 

-BEGIN_EVENT_TABLE(wxTopLevelWindowGTK, wxTopLevelWindowBase)
-    EVT_SET_FOCUS(wxTopLevelWindowGTK::OnSetFocus)
-END_EVENT_TABLE()
-

 //-----------------------------------------------------------------------------
 // InsertChild for wxTopLevelWindowGTK
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // InsertChild for wxTopLevelWindowGTK
 //-----------------------------------------------------------------------------


@@ -775,19 +771,6 @@ void wxTopLevelWindowGTK::OnInternalIdle()
     wxWindow::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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // frame title/icon
 // ----------------------------------------------------------------------------

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index 9f5beeea7c234aaac0c55790d7dcd81a6b83d37f..ee320bc684c25da26d2b04f17bedc1d814007714 100644 (file)
--- 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
 // ----------------------------------------------------------------------------
 
 // wxTopLevelWindowGTK itself
 // ----------------------------------------------------------------------------
 

-BEGIN_EVENT_TABLE(wxTopLevelWindowGTK, wxTopLevelWindowBase)
-    EVT_SET_FOCUS(wxTopLevelWindowGTK::OnSetFocus)
-END_EVENT_TABLE()
-

 //-----------------------------------------------------------------------------
 // InsertChild for wxTopLevelWindowGTK
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // InsertChild for wxTopLevelWindowGTK
 //-----------------------------------------------------------------------------


@@ -775,19 +771,6 @@ void wxTopLevelWindowGTK::OnInternalIdle()
     wxWindow::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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // frame title/icon
 // ----------------------------------------------------------------------------