Patch 559673 and 561053

[wxWidgets.git] / src / gtk1 / toplevel.cpp

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index 9f5beeea7c234aaac0c55790d7dcd81a6b83d37f..534759fca72e488ae3bfdf05fba230ba484c4375 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
 //-----------------------------------------------------------------------------


@@ -765,7 +761,8 @@ void wxTopLevelWindowGTK::OnInternalIdle()
     // set the focus if not done yet and if we can already do it
     if ( GTK_WIDGET_REALIZED(m_wxwindow) )
     {
     // set the focus if not done yet and if we can already do it
     if ( GTK_WIDGET_REALIZED(m_wxwindow) )
     {

-        if ( g_delayedFocus && wxGetTopLevelParent(g_delayedFocus) == this )
+        if ( g_delayedFocus &&
+             wxGetTopLevelParent((wxWindow*)g_delayedFocus) == this )

         {
             g_delayedFocus->SetFocus();
             g_delayedFocus = NULL;
         {
             g_delayedFocus->SetFocus();
             g_delayedFocus = NULL;


@@ -775,19 +772,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
 // ----------------------------------------------------------------------------