From cc06fe74c42e5e13c54b4d05e9526cd7be1c9331 Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Tue, 23 Apr 2002 20:16:40 +0000 Subject: [PATCH] Make Univ/GTK compile again git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/toplevel.cpp | 3 ++- src/gtk/window.cpp | 4 ++-- src/gtk1/toplevel.cpp | 3 ++- src/gtk1/window.cpp | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp index ee320bc684..534759fca7 100644 --- a/src/gtk/toplevel.cpp +++ b/src/gtk/toplevel.cpp @@ -761,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) ) { - if ( g_delayedFocus && wxGetTopLevelParent(g_delayedFocus) == this ) + if ( g_delayedFocus && + wxGetTopLevelParent((wxWindow*)g_delayedFocus) == this ) { g_delayedFocus->SetFocus(); g_delayedFocus = NULL; diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 4630c80600..bad1ac7648 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -3263,7 +3263,7 @@ void wxWindowGTK::SetFocus() } } - (void)DoSendFocusEvents(this); + (void)DoSendFocusEvents((wxWindow*)this); } bool wxWindowGTK::AcceptsFocus() const @@ -3485,7 +3485,7 @@ void wxWindowGTK::GtkSendPaintEvents() while (parent && !parent->IsTopLevel()) parent = parent->GetParent(); if (!parent) - parent = this; + parent = (wxWindow*)this; wxRegionIterator upd( m_updateRegion ); while (upd) diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp index ee320bc684..534759fca7 100644 --- a/src/gtk1/toplevel.cpp +++ b/src/gtk1/toplevel.cpp @@ -761,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) ) { - if ( g_delayedFocus && wxGetTopLevelParent(g_delayedFocus) == this ) + if ( g_delayedFocus && + wxGetTopLevelParent((wxWindow*)g_delayedFocus) == this ) { g_delayedFocus->SetFocus(); g_delayedFocus = NULL; diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 4630c80600..bad1ac7648 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -3263,7 +3263,7 @@ void wxWindowGTK::SetFocus() } } - (void)DoSendFocusEvents(this); + (void)DoSendFocusEvents((wxWindow*)this); } bool wxWindowGTK::AcceptsFocus() const @@ -3485,7 +3485,7 @@ void wxWindowGTK::GtkSendPaintEvents() while (parent && !parent->IsTopLevel()) parent = parent->GetParent(); if (!parent) - parent = this; + parent = (wxWindow*)this; wxRegionIterator upd( m_updateRegion ); while (upd) -- 2.45.2