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

Early versions of GTK+2 don't have has_toplevel_focus

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-09-27 12:20:21 +00:00
parent ed7e3b9a69
commit 9f4ccdd739
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/toplevel.cpp
View File

@@ -1070,9 +1070,15 @@ bool wxTopLevelWindowGTK::SetShape(const wxRegion& region)
bool wxTopLevelWindowGTK::IsActive() bool wxTopLevelWindowGTK::IsActive()
{ {
#ifdef __WXGTK20__ #ifdef __WXGTK20__
// Order the conditions like this so we don't
// have to decide how to include version for GTK+ 1 versus 2
#if GTK_CHECK_VERSION(2,2,0)
return GTK_WINDOW( m_widget )->has_toplevel_focus; return GTK_WINDOW( m_widget )->has_toplevel_focus;
#else #else
return wxTopLevelWindowBase::IsActive(); return wxTopLevelWindowBase::IsActive();
#endif #endif
#else
return wxTopLevelWindowBase::IsActive();
#endif
} }

6
src/gtk1/toplevel.cpp
View File

@@ -1070,9 +1070,15 @@ bool wxTopLevelWindowGTK::SetShape(const wxRegion& region)
bool wxTopLevelWindowGTK::IsActive() bool wxTopLevelWindowGTK::IsActive()
{ {
#ifdef __WXGTK20__ #ifdef __WXGTK20__
// Order the conditions like this so we don't
// have to decide how to include version for GTK+ 1 versus 2
#if GTK_CHECK_VERSION(2,2,0)
return GTK_WINDOW( m_widget )->has_toplevel_focus; return GTK_WINDOW( m_widget )->has_toplevel_focus;
#else #else
return wxTopLevelWindowBase::IsActive(); return wxTopLevelWindowBase::IsActive();
#endif #endif
#else
return wxTopLevelWindowBase::IsActive();
#endif
} }