#pragma hdrstop
#endif
-#include "wx/frame.h"
-#include "wx/menu.h"
-#include "wx/menuitem.h"
-#include "wx/dcclient.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"
wxFrameBase::wxFrameBase()
{
+#if wxUSE_MENUS
m_frameMenuBar = NULL;
+#endif // wxUSE_MENUS
#if wxUSE_TOOLBAR
m_frameToolBar = NULL;
void wxFrameBase::DeleteAllBars()
{
+#if wxUSE_MENUS
if ( m_frameMenuBar )
{
delete m_frameMenuBar;
m_frameMenuBar = (wxMenuBar *) NULL;
}
+#endif // wxUSE_MENUS
#if wxUSE_STATUSBAR
if ( m_frameStatusBar )
#endif // wxUSE_TOOLBAR
}
+bool wxFrameBase::IsOneOfBars(const wxWindow *win) const
+{
+#if wxUSE_MENUS
+ if ( win == GetMenuBar() )
+ return TRUE;
+#endif // wxUSE_MENUS
+
+#if wxUSE_STATUSBAR
+ if ( win == GetStatusBar() )
+ return TRUE;
+#endif // wxUSE_STATUSBAR
+
+#if wxUSE_TOOLBAR
+ if ( win == GetToolBar() )
+ return TRUE;
+#endif // wxUSE_TOOLBAR
+
+ return FALSE;
+}
+
// ----------------------------------------------------------------------------
// wxFrame size management: we exclude the areas taken by menu/status/toolbars
// from the client area, so the client area is what's really available for the
wxPoint pt(0, 0);
#if wxUSE_TOOLBAR
- if ( GetToolBar() )
+ if ( GetToolBar() && GetToolBar()->IsShown() )
{
int w, h;
GetToolBar()->GetSize(& w, & h);
bool wxFrameBase::ProcessCommand(int id)
{
+#if wxUSE_MENUS
wxMenuBar *bar = GetMenuBar();
if ( !bar )
return FALSE;
+ wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
+ commandEvent.SetEventObject(this);
+
wxMenuItem *item = bar->FindItem(id);
if ( item && item->IsCheckable() )
{
item->Toggle();
- }
- wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
- commandEvent.SetInt(id);
- commandEvent.SetEventObject(this);
+ // use the new value
+ commandEvent.SetInt(item->IsChecked());
+ }
return GetEventHandler()->ProcessEvent(commandEvent);
+#else // !wxUSE_MENUS
+ return FALSE;
+#endif // wxUSE_MENUS/!wxUSE_MENUS
}
// ----------------------------------------------------------------------------
Layout();
}
else
-#endif
+#endif // wxUSE_CONSTRAINTS
{
// do we have _exactly_ one child?
wxWindow *child = (wxWindow *)NULL;
// exclude top level and managed windows (status bar isn't
// currently in the children list except under wxMac anyhow, but
// it makes no harm to test for it)
- if ( !win->IsTopLevel()
-#if wxUSE_STATUSBAR
- && (win != GetStatusBar())
-#endif // wxUSE_STATUSBAR
-#if wxUSE_TOOLBAR
- && (win != GetToolBar())
-#endif // wxUSE_TOOLBAR
- )
+ if ( !win->IsTopLevel() && !IsOneOfBars(win) )
{
if ( child )
{
// for whatever reasons, wxGTK wants to have a small offset - it
// probably looks better with it?
#ifdef __WXGTK__
- static const int ofs = 0;
-#else
static const int ofs = 1;
+#else
+ static const int ofs = 0;
#endif
child->SetSize(ofs, ofs, clientW - 2*ofs, clientH - 2*ofs);
void wxFrameBase::OnMenuHighlight(wxMenuEvent& event)
{
#if wxUSE_STATUSBAR
- if ( GetStatusBar() )
- {
- // if no help string found, we will clear the status bar text
- wxString helpString;
+ (void)ShowMenuHelp(GetStatusBar(), event.GetMenuId());
+#endif // wxUSE_STATUSBAR
+}
- int menuId = event.GetMenuId();
- if ( menuId != wxID_SEPARATOR && menuId != -2 /* 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();
- }
- }
+bool wxFrameBase::SendIconizeEvent(bool iconized)
+{
+ wxIconizeEvent event(GetId(), iconized);
+ event.SetEventObject(this);
- // set status text even if the string is empty - this will at least
- // remove the string from the item which was previously selected
- SetStatusText(helpString);
- }
-#endif // wxUSE_STATUSBAR
+ return GetEventHandler()->ProcessEvent(event);
+}
+
+void wxFrameBase::OnIdle(wxIdleEvent& WXUNUSED(event) )
+{
+#if wxUSE_MENUS
+ DoMenuUpdates();
+#endif // wxUSE_MENUS
}
// ----------------------------------------------------------------------------
wxWindowID id,
const wxString& name)
{
- wxStatusBar *statusBar = new wxStatusBar(this, id,
- wxPoint(0, 0), wxSize(100, 20),
- style, name);
+ wxStatusBar *statusBar = new wxStatusBar(this, id, style, name);
// Set the height according to the font and the border size
wxClientDC dc(statusBar);
dc.SetFont(statusBar->GetFont());
- long y;
+ wxCoord y;
dc.GetTextExtent( "X", NULL, &y );
int height = (int)( (11*y)/10 + 2*statusBar->GetBorderY());
- statusBar->SetSize( -1, -1, 100, height );
+ statusBar->SetSize( -1, -1, -1, height );
statusBar->SetFieldsCount(number);
PositionStatusBar();
}
+bool wxFrameBase::ShowMenuHelp(wxStatusBar *statbar, int menuId)
+{
+#if wxUSE_MENUS
+ if ( !statbar )
+ return FALSE;
+
+ // if no help string found, we will clear the status bar text
+ wxString helpString;
+
+ if ( menuId != wxID_SEPARATOR && menuId != -2 /* 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();
+ }
+ }
+
+ // 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);
+
+ return !helpString.IsEmpty();
+#else // !wxUSE_MENUS
+ return FALSE;
+#endif // wxUSE_MENUS/!wxUSE_MENUS
+}
+
#endif // wxUSE_STATUSBAR
// ----------------------------------------------------------------------------
#endif // wxUSE_TOOLBAR
// ----------------------------------------------------------------------------
-// Menu UI updating
+// menus
// ----------------------------------------------------------------------------
-void wxFrameBase::OnIdle(wxIdleEvent& WXUNUSED(event) )
-{
- DoMenuUpdates();
-}
+#if wxUSE_MENUS
// update all menus
void wxFrameBase::DoMenuUpdates()
{
wxMenuBar* bar = GetMenuBar();
+#ifdef __WXMSW__
+ wxWindow* focusWin = wxFindFocusDescendant((wxWindow*) this);
+#else
+ wxWindow* focusWin = (wxWindow*) NULL;
+#endif
if ( bar != NULL )
{
int nCount = bar->GetMenuCount();
for (int n = 0; n < nCount; n++)
- DoMenuUpdates(bar->GetMenu(n), (wxWindow*) NULL);
+ DoMenuUpdates(bar->GetMenu(n), focusWin);
}
}
// update a menu and all submenus recursively
-void wxFrameBase::DoMenuUpdates(wxMenu* menu, wxWindow* WXUNUSED(focusWin))
+void wxFrameBase::DoMenuUpdates(wxMenu* menu, wxWindow* focusWin)
{
- wxEvtHandler* evtHandler = GetEventHandler();
+ wxEvtHandler* evtHandler = focusWin ? focusWin->GetEventHandler() : GetEventHandler();
wxMenuItemList::Node* node = menu->GetMenuItems().GetFirst();
while (node)
{
node = node->GetNext();
}
}
+
+void wxFrameBase::DetachMenuBar()
+{
+ if ( m_frameMenuBar )
+ {
+ m_frameMenuBar->Detach();
+ m_frameMenuBar = NULL;
+ }
+}
+
+void wxFrameBase::AttachMenuBar(wxMenuBar *menubar)
+{
+ if ( menubar )
+ {
+ m_frameMenuBar = menubar;
+ menubar->Attach((wxFrame *)this);
+ }
+}
+
+void wxFrameBase::SetMenuBar(wxMenuBar *menubar)
+{
+ if ( menubar == GetMenuBar() )
+ {
+ // nothing to do
+ return;
+ }
+
+ DetachMenuBar();
+
+ AttachMenuBar(menubar);
+}
+
+#endif // wxUSE_MENUS
projects / wxWidgets.git / blobdiff