X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6aeb6f2a5810694b5241eb267d71dab4848cf8bb..f8305cafb5a59cb2fa7bedc6e8e20e4bada60d90:/src/gtk/toplevel.cpp

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 9f5beeea7c..591e545e7c 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
 //-----------------------------------------------------------------------------
@@ -302,7 +298,6 @@ void wxTopLevelWindowGTK::Init()
     m_miniTitle = 0;
     m_mainWidget = (GtkWidget*) NULL;
     m_insertInClientArea = TRUE;
-    m_isFrame = TRUE;
     m_isIconized = FALSE;
     m_fsIsShowing = FALSE;
     m_themeEnabled = TRUE;
@@ -765,7 +760,8 @@ void wxTopLevelWindowGTK::OnInternalIdle()
     // 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;
@@ -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
 // ----------------------------------------------------------------------------