/////////////////////////////////////////////////////////////////////////////
-// Name: common/framecmn.cpp
+// Name: src/common/framecmn.cpp
// Purpose: common (for all platforms) wxFrame functions
// Author: Julian Smart, Vadim Zeitlin
// Created: 01/02/97
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "framebase.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
+#include "wx/frame.h"
+
#ifndef WX_PRECOMP
- #include "wx/frame.h"
#include "wx/menu.h"
#include "wx/menuitem.h"
#include "wx/dcclient.h"
-#endif // WX_PRECOMP
-
-#if wxUSE_TOOLBAR
#include "wx/toolbar.h"
-#endif
-#if wxUSE_STATUSBAR
#include "wx/statusbr.h"
-#endif
+#endif // WX_PRECOMP
// ----------------------------------------------------------------------------
// event table
if (!item->IsEnabled())
return true;
+ if ((item->GetKind() == wxITEM_RADIO) && item->IsChecked() )
+ return true;
+
if (item->IsCheckable())
{
item->Toggle();
void wxFrameBase::OnMenuHighlight(wxMenuEvent& event)
{
#if wxUSE_STATUSBAR
- (void)ShowMenuHelp(GetStatusBar(), event.GetMenuId());
+ (void)ShowMenuHelp(event.GetMenuId());
#endif // wxUSE_STATUSBAR
}
void wxFrameBase::OnMenuClose(wxMenuEvent& WXUNUSED(event))
{
- // do we have real status text to restore?
- if ( !m_oldStatusText.empty() )
- {
- if ( m_statusBarPane >= 0 )
- {
- wxStatusBar *statbar = GetStatusBar();
- if ( statbar )
- statbar->SetStatusText(m_oldStatusText, m_statusBarPane);
- }
-
- m_oldStatusText.clear();
- }
+ DoGiveHelp(wxEmptyString, false);
}
#endif // wxUSE_MENUS && wxUSE_STATUSBAR
m_frameStatusBar->PopStatusText(number);
}
-bool wxFrameBase::ShowMenuHelp(wxStatusBar *WXUNUSED(statbar), int menuId)
+bool wxFrameBase::ShowMenuHelp(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 ( show )
+ if ( menuId != wxID_SEPARATOR && menuId != -3 /* wxID_TITLE */ )
{
- wxMenuBar *menuBar = GetMenuBar();
- if ( menuBar )
- {
- // it's ok if we don't find the item because it might belong
- // to the popup menu
- wxMenuItem *item = menuBar->FindItem(menuId);
- if ( item )
- helpString = item->GetHelp();
- }
+ const wxMenuItem * const item = FindItemInMenuBar(menuId);
+ if ( item )
+ helpString = item->GetHelp();
+
+ // notice that it's ok if we don't find the item because it might
+ // belong to the popup menu, so don't assert here
}
- DoGiveHelp(helpString, show);
+ DoGiveHelp(helpString, true);
return !helpString.empty();
#else // !wxUSE_MENUS
#endif // wxUSE_STATUSBAR
-void wxFrameBase::DoGiveHelp(const wxString& text, bool show)
+#if wxUSE_MENUS || wxUSE_TOOLBAR
+void wxFrameBase::DoGiveHelp(const wxString& help, bool show)
{
#if wxUSE_STATUSBAR
if ( m_statusBarPane < 0 )
if ( !statbar )
return;
- wxString help;
+ wxString text;
if ( show )
- help = text;
-
- // remember the old status bar text if this is the first time we're called
- // since the menu has been opened as we're going to overwrite it in our
- // DoGiveHelp() and we want to restore it when the menu is closed
- //
- // note that it would be logical to do this in OnMenuOpen() but under MSW
- // we get an EVT_MENU_HIGHLIGHT before EVT_MENU_OPEN, strangely enough, and
- // so this doesn't work and instead we use the ugly trick with using
- // special m_oldStatusText value as "menu opened" (but it is arguably
- // better than adding yet another member variable to wxFrame on all
- // platforms)
- if ( m_oldStatusText.empty() )
{
- m_oldStatusText = statbar->GetStatusText(m_statusBarPane);
+ // remember the old status bar text if this is the first time we're
+ // called since the menu has been opened as we're going to overwrite it
+ // in our DoGiveHelp() and we want to restore it when the menu is
+ // closed
+ //
+ // note that it would be logical to do this in OnMenuOpen() but under
+ // MSW we get an EVT_MENU_HIGHLIGHT before EVT_MENU_OPEN, strangely
+ // enough, and so this doesn't work and instead we use the ugly trick
+ // with using special m_oldStatusText value as "menu opened" (but it is
+ // arguably better than adding yet another member variable to wxFrame
+ // on all platforms)
if ( m_oldStatusText.empty() )
{
- // use special value to prevent us from doing this the next time
- m_oldStatusText += _T('\0');
+ m_oldStatusText = statbar->GetStatusText(m_statusBarPane);
+ if ( m_oldStatusText.empty() )
+ {
+ // use special value to prevent us from doing this the next time
+ m_oldStatusText += _T('\0');
+ }
}
+
+ text = help;
+ }
+ else // hide help, restore the original text
+ {
+ text = m_oldStatusText;
+ m_oldStatusText.clear();
}
- statbar->SetStatusText(help, m_statusBarPane);
+ statbar->SetStatusText(text, m_statusBarPane);
#else
wxUnusedVar(text);
wxUnusedVar(show);
#endif // wxUSE_STATUSBAR
}
+#endif // wxUSE_MENUS || wxUSE_TOOLBAR
// ----------------------------------------------------------------------------
wxWindowID id,
const wxString& name)
{
- // the main toolbar can't be recreated (unless it was explicitly deeleted
+ // the main toolbar can't be recreated (unless it was explicitly deleted
// before)
wxCHECK_MSG( !m_frameToolBar, (wxToolBar *)NULL,
wxT("recreating toolbar in wxFrame") );
wxWindowID id,
const wxString& name)
{
+#if defined(__WXWINCE__) && defined(__POCKETPC__)
+ return new wxToolMenuBar(this, id,
+ wxDefaultPosition, wxDefaultSize,
+ style, name);
+#else
return new wxToolBar(this, id,
wxDefaultPosition, wxDefaultSize,
style, name);
+#endif
}
void wxFrameBase::SetToolBar(wxToolBar *toolbar)
// update all menus
void wxFrameBase::DoMenuUpdates(wxMenu* menu)
{
- wxEvtHandler* source = GetEventHandler();
- wxMenuBar* bar = GetMenuBar();
-
if (menu)
+ {
+ wxEvtHandler* source = GetEventHandler();
menu->UpdateUI(source);
- else if ( bar != NULL )
+ }
+ else
{
- int nCount = bar->GetMenuCount();
- for (int n = 0; n < nCount; n++)
- bar->GetMenu(n)->UpdateUI(source);
+ wxMenuBar* bar = GetMenuBar();
+ if (bar != NULL)
+ bar->UpdateMenus();
}
}
this->AttachMenuBar(menubar);
}
-#endif // wxUSE_MENUS
-
-#if WXWIN_COMPATIBILITY_2_2
-
-bool wxFrameBase::Command(int winid)
+const wxMenuItem *wxFrameBase::FindItemInMenuBar(int menuId) const
{
- return ProcessCommand(winid);
+ const wxMenuBar * const menuBar = GetMenuBar();
+
+ return menuBar ? menuBar->FindItem(menuId) : NULL;
}
-#endif // WXWIN_COMPATIBILITY_2_2
+#endif // wxUSE_MENUS
projects / wxWidgets.git / blobdiff