Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make Univ/GTK compile again

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2002-04-23 20:16:40 +00:00
parent b1da81074c
commit cc06fe74c4
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gtk/toplevel.cpp
View File

@@ -761,7 +761,8 @@ void wxTopLevelWindowGTK::OnInternalIdle()
// set the focus if not done yet and if we can already do it // set the focus if not done yet and if we can already do it
if ( GTK_WIDGET_REALIZED(m_wxwindow) ) 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->SetFocus();
g_delayedFocus = NULL; g_delayedFocus = NULL;

4
src/gtk/window.cpp
View File

@@ -3263,7 +3263,7 @@ void wxWindowGTK::SetFocus()
} }
} }
(void)DoSendFocusEvents(this); (void)DoSendFocusEvents((wxWindow*)this);
} }
bool wxWindowGTK::AcceptsFocus() const bool wxWindowGTK::AcceptsFocus() const
@@ -3485,7 +3485,7 @@ void wxWindowGTK::GtkSendPaintEvents()
while (parent && !parent->IsTopLevel()) while (parent && !parent->IsTopLevel())
parent = parent->GetParent(); parent = parent->GetParent();
if (!parent) if (!parent)
parent = this; parent = (wxWindow*)this;
wxRegionIterator upd( m_updateRegion ); wxRegionIterator upd( m_updateRegion );
while (upd) while (upd)

3
src/gtk1/toplevel.cpp
View File

@@ -761,7 +761,8 @@ void wxTopLevelWindowGTK::OnInternalIdle()
// set the focus if not done yet and if we can already do it // set the focus if not done yet and if we can already do it
if ( GTK_WIDGET_REALIZED(m_wxwindow) ) 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->SetFocus();
g_delayedFocus = NULL; g_delayedFocus = NULL;

4
src/gtk1/window.cpp
View File

@@ -3263,7 +3263,7 @@ void wxWindowGTK::SetFocus()
} }
} }
(void)DoSendFocusEvents(this); (void)DoSendFocusEvents((wxWindow*)this);
} }
bool wxWindowGTK::AcceptsFocus() const bool wxWindowGTK::AcceptsFocus() const
@@ -3485,7 +3485,7 @@ void wxWindowGTK::GtkSendPaintEvents()
while (parent && !parent->IsTopLevel()) while (parent && !parent->IsTopLevel())
parent = parent->GetParent(); parent = parent->GetParent();
if (!parent) if (!parent)
parent = this; parent = (wxWindow*)this;
wxRegionIterator upd( m_updateRegion ); wxRegionIterator upd( m_updateRegion );
while (upd) while (upd)