// 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
/////////////////////////////////////////////////////////////////////////////
#include "wx/statusbr.h"
#endif
-// FIXME - temporary hack in absence of wxTLW in all ports!
-#ifndef wxTopLevelWindowNative
- #define wxTopLevelWindow wxTopLevelWindowBase
-#endif
-
// ----------------------------------------------------------------------------
// event table
// ----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxFrameBase, wxTopLevelWindow)
- EVT_IDLE(wxFrameBase::OnIdle)
+#if wxUSE_MENUS && !wxUSE_IDLEMENUUPDATES
+ EVT_MENU_OPEN(wxFrameBase::OnMenuOpen)
+#endif
EVT_MENU_HIGHLIGHT_ALL(wxFrameBase::OnMenuHighlight)
END_EVENT_TABLE()
#if wxUSE_STATUSBAR
m_frameStatusBar = NULL;
#endif // wxUSE_STATUSBAR
+
+ m_statusBarPane = 0;
+}
+
+wxFrameBase::~wxFrameBase()
+{
+ // this destructor is required for Darwin
}
wxFrame *wxFrameBase::New(wxWindow *parent,
{
wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin();
-#if wxUSE_TOOLBAR
+#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__) && !defined(__WXWINCE__)
wxToolBar *toolbar = GetToolBar();
if ( toolbar && toolbar->IsShown() )
{
if (item->IsCheckable())
{
item->Toggle();
+
// use the new value
commandEvent.SetInt(item->IsChecked());
}
}
- return GetEventHandler()->ProcessEvent(commandEvent);
+ GetEventHandler()->ProcessEvent(commandEvent);
+ return TRUE;
#else // !wxUSE_MENUS
return FALSE;
#endif // wxUSE_MENUS/!wxUSE_MENUS
}
+// Do the UI update processing for this window. This is
+// provided for the application to call if it wants to
+// force a UI update, particularly for the menus and toolbar.
+void wxFrameBase::UpdateWindowUI(long flags)
+{
+ wxWindowBase::UpdateWindowUI(flags);
+
+#if wxUSE_TOOLBAR
+ if (GetToolBar())
+ GetToolBar()->UpdateWindowUI(flags);
+#endif
+
+#if wxUSE_MENUS
+ if (GetMenuBar())
+ {
+ if ((flags & wxUPDATE_UI_FROMIDLE) && !wxUSE_IDLEMENUUPDATES)
+ {
+ // If coming from an idle event, we only
+ // want to update the menus if we're
+ // in the wxUSE_IDLEMENUUPDATES configuration:
+ // so if we're not, do nothing
+ }
+ else
+ DoMenuUpdates();
+ }
+#endif
+}
+
// ----------------------------------------------------------------------------
// event handlers
// ----------------------------------------------------------------------------
#endif // wxUSE_STATUSBAR
}
-void wxFrameBase::OnIdle(wxIdleEvent& WXUNUSED(event) )
+// Implement internal behaviour (menu updating on some platforms)
+void wxFrameBase::OnInternalIdle()
{
-#if wxUSE_MENUS
- DoMenuUpdates();
-#endif // wxUSE_MENUS
+ wxTopLevelWindow::OnInternalIdle();
+
+#if wxUSE_MENUS && wxUSE_IDLEMENUUPDATES
+ if (wxUpdateUIEvent::CanUpdate(this))
+ DoMenuUpdates();
+#endif
+}
+
+void wxFrameBase::OnMenuOpen(wxMenuEvent& event)
+{
+#if wxUSE_MENUS && !wxUSE_IDLEMENUUPDATES
+ DoMenuUpdates(event.GetMenu());
+#endif
}
// ----------------------------------------------------------------------------
PositionStatusBar();
}
-bool wxFrameBase::ShowMenuHelp(wxStatusBar *statbar, int menuId)
+void wxFrameBase::PushStatusText(const wxString& text, int number)
{
-#if wxUSE_MENUS
- if ( !statbar )
- return FALSE;
+ wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") );
+
+ m_frameStatusBar->PushStatusText(text, number);
+}
+
+void wxFrameBase::PopStatusText(int number)
+{
+ wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") );
+
+ m_frameStatusBar->PopStatusText(number);
+}
+bool wxFrameBase::ShowMenuHelp(wxStatusBar *WXUNUSED(statbar), int menuId)
+{
+#if wxUSE_MENUS
// if no help string found, we will clear the status bar text
wxString helpString;
+ bool show = menuId != wxID_SEPARATOR && menuId != -2 /* wxID_TITLE */;
- if ( menuId != wxID_SEPARATOR && menuId != -2 /* wxID_TITLE */ )
+ if ( show )
{
wxMenuBar *menuBar = GetMenuBar();
if ( menuBar )
}
}
- // set status text even if the string is empty - this will at least
- // remove the string from the item which was previously selected
- statbar->SetStatusText(helpString);
+ DoGiveHelp(helpString, show);
return !helpString.IsEmpty();
#else // !wxUSE_MENUS
#endif // wxUSE_STATUSBAR
+void wxFrameBase::DoGiveHelp(const wxString& text, bool show)
+{
+#if wxUSE_STATUSBAR
+ if ( m_statusBarPane < 0 ) return;
+ wxStatusBar* statbar = GetStatusBar();
+ if ( !statbar ) return;
+
+ wxString help = show ? text : wxString();
+ statbar->SetStatusText( help, m_statusBarPane );
+#endif // wxUSE_STATUSBAR
+}
+
+
// ----------------------------------------------------------------------------
// toolbar stuff
// ----------------------------------------------------------------------------
wxCHECK_MSG( !m_frameToolBar, (wxToolBar *)NULL,
wxT("recreating toolbar in wxFrame") );
+ if ( style == -1 )
+ {
+ // use default style
+ //
+ // NB: we don't specify the default value in the method declaration
+ // because
+ // a) this allows us to have different defaults for different
+ // platforms (even if we don't have them right now)
+ // b) we don't need to include wx/toolbar.h in the header then
+ style = wxBORDER_NONE | wxTB_HORIZONTAL | wxTB_FLAT;
+ }
+
m_frameToolBar = OnCreateToolBar(style, id, name);
return m_frameToolBar;
#if wxUSE_MENUS
// update all menus
-void wxFrameBase::DoMenuUpdates()
+void wxFrameBase::DoMenuUpdates(wxMenu* menu)
{
+ wxEvtHandler* source = GetEventHandler();
wxMenuBar* bar = GetMenuBar();
-#ifdef __WXMSW__
- wxWindow* focusWin = wxFindFocusDescendant((wxWindow*) this);
-#else
- wxWindow* focusWin = (wxWindow*) NULL;
-#endif
- if ( bar != NULL )
+ if (menu)
+ menu->UpdateUI(source);
+ else if ( bar != NULL )
{
int nCount = bar->GetMenuCount();
for (int n = 0; n < nCount; n++)
- DoMenuUpdates(bar->GetMenu(n), focusWin);
- }
-}
-
-// update a menu and all submenus recursively
-void wxFrameBase::DoMenuUpdates(wxMenu* menu, wxWindow* focusWin)
-{
- wxEvtHandler* evtHandler = focusWin ? focusWin->GetEventHandler() : GetEventHandler();
- wxMenuItemList::Node* node = menu->GetMenuItems().GetFirst();
- while (node)
- {
- wxMenuItem* item = node->GetData();
- if ( !item->IsSeparator() )
- {
- wxWindowID id = item->GetId();
- wxUpdateUIEvent event(id);
- event.SetEventObject( this );
-
- if (evtHandler->ProcessEvent(event))
- {
- if (event.GetSetText())
- menu->SetLabel(id, event.GetText());
- if (event.GetSetChecked())
- menu->Check(id, event.GetChecked());
- if (event.GetSetEnabled())
- menu->Enable(id, event.GetEnabled());
- }
-
- if (item->GetSubMenu())
- DoMenuUpdates(item->GetSubMenu(), (wxWindow*) NULL);
- }
- node = node->GetNext();
+ bar->GetMenu(n)->UpdateUI(source);
}
}
{
if ( menubar )
{
- m_frameMenuBar = menubar;
menubar->Attach((wxFrame *)this);
+ m_frameMenuBar = menubar;
}
}
projects / wxWidgets.git / blobdiff