Make Univ/GTK compile again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
b1da81074c
commit
cc06fe74c4
@ -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;
|
||||
|
@ -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)
|
||||
|
@ -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;
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user