Source cleaning: whitespaces, tabs, -1/wxID_ANY/wxDefaultCoord/wxNOT_FOUND, TRUE...

[wxWidgets.git] / src / gtk1 / toplevel.cpp

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index d5fff696dd247c683f636880743875e9c1bfd666..6aec1647c8bc679f1db67b85051ded5faf6e141b 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -1067,13 +1067,18 @@ bool wxTopLevelWindowGTK::SetShape(const wxRegion& region)
     return do_shape_combine_region(window, region);
 }
 
-bool wxTopLevelWindowGTK::HasFocus()
+bool wxTopLevelWindowGTK::IsActive()
 {
 #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;
 #else
-    return ( wxGetTopLevelParent(FindFocus()) = this );
+    return wxTopLevelWindowBase::IsActive();
+#endif
+#else
+    return wxTopLevelWindowBase::IsActive();
 #endif
 }
 
-// vi:sts=4:sw=4:et