X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c36387841c031243be77d24881801e8a8a28018..066f1b7a9580fc6c487efa753d61e3683de61407:/src/common/toplvcmn.cpp?ds=sidebyside diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp index f5386f9835..d5d6bb27fe 100644 --- a/src/common/toplvcmn.cpp +++ b/src/common/toplvcmn.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart, Vadim Zeitlin // Created: 01/02/97 // Id: $Id$ -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Copyright: (c) 1998 Robert Roebling and Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -28,9 +28,9 @@ #endif #ifndef WX_PRECOMP - #include "wx/app.h" #include "wx/toplevel.h" #include "wx/dcclient.h" + #include "wx/app.h" #endif // WX_PRECOMP // ---------------------------------------------------------------------------- @@ -46,10 +46,7 @@ END_EVENT_TABLE() // implementation // ============================================================================ -// FIXME: some platforms don't have wxTopLevelWindow yet -#ifdef wxTopLevelWindowNative - IMPLEMENT_DYNAMIC_CLASS(wxTopLevelWindow, wxWindow) -#endif +IMPLEMENT_DYNAMIC_CLASS(wxTopLevelWindow, wxWindow) // ---------------------------------------------------------------------------- // construction/destruction @@ -164,7 +161,7 @@ void wxTopLevelWindowBase::OnSize(wxSizeEvent& WXUNUSED(event)) { // do we have _exactly_ one child? wxWindow *child = (wxWindow *)NULL; - for ( wxWindowList::Node *node = GetChildren().GetFirst(); + for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); node; node = node->GetNext() ) { @@ -218,4 +215,17 @@ bool wxTopLevelWindowBase::SendIconizeEvent(bool iconized) return GetEventHandler()->ProcessEvent(event); } +// do the window-specific processing after processing the update event +void wxTopLevelWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event) +{ + if ( event.GetSetEnabled() ) + Enable(event.GetEnabled()); + + if ( event.GetSetText() ) + { + if ( event.GetText() != GetTitle() ) + SetTitle(event.GetText()); + } +} + // vi:sts=4:sw=4:et