#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"
#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, wxWindow)
+BEGIN_EVENT_TABLE(wxFrameBase, wxTopLevelWindow)
EVT_IDLE(wxFrameBase::OnIdle)
- EVT_CLOSE(wxFrameBase::OnCloseWindow)
EVT_MENU_HIGHLIGHT_ALL(wxFrameBase::OnMenuHighlight)
- EVT_SIZE(wxFrameBase::OnSize)
END_EVENT_TABLE()
// ============================================================================
wxFrameBase::wxFrameBase()
{
+#if wxUSE_MENUS
m_frameMenuBar = NULL;
+#endif // wxUSE_MENUS
#if wxUSE_TOOLBAR
m_frameToolBar = NULL;
#endif // wxUSE_STATUSBAR
}
-bool wxFrameBase::Destroy()
-{
- // delayed destruction: the frame will be deleted during the next idle
- // loop iteration
- if ( !wxPendingDelete.Member(this) )
- wxPendingDelete.Append(this);
-
- return TRUE;
-}
-
wxFrame *wxFrameBase::New(wxWindow *parent,
wxWindowID id,
const wxString& title,
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
// get the origin of the client area in the client coordinates
wxPoint wxFrameBase::GetClientAreaOrigin() const
{
- wxPoint pt(0, 0);
+ wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin();
#if wxUSE_TOOLBAR
if ( GetToolBar() && GetToolBar()->IsShown() )
return pt;
}
-void wxFrameBase::DoScreenToClient(int *x, int *y) const
-{
- wxWindow::DoScreenToClient(x, y);
-
- // We may be faking the client origin.
- // So a window that's really at (0, 30) may appear
- // (to wxWin apps) to be at (0, 0).
- wxPoint pt(GetClientAreaOrigin());
- *x -= pt.x;
- *y -= pt.y;
-}
-
-void wxFrameBase::DoClientToScreen(int *x, int *y) const
-{
- // We may be faking the client origin.
- // So a window that's really at (0, 30) may appear
- // (to wxWin apps) to be at (0, 0).
- wxPoint pt1(GetClientAreaOrigin());
- *x += pt1.x;
- *y += pt1.y;
-
- wxWindow::DoClientToScreen(x, y);
-}
-
// ----------------------------------------------------------------------------
// misc
// ----------------------------------------------------------------------------
-// make the window modal (all other windows unresponsive)
-void wxFrameBase::MakeModal(bool modal)
-{
- if ( modal )
- {
- wxEnableTopLevelWindows(FALSE);
- Enable(TRUE); // keep this window enabled
- }
- else
- {
- wxEnableTopLevelWindows(TRUE);
- }
-}
-
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
}
// ----------------------------------------------------------------------------
// event handlers
// ----------------------------------------------------------------------------
-// default resizing behaviour - if only ONE subwindow, resize to fill the
-// whole client area
-void wxFrameBase::OnSize(wxSizeEvent& WXUNUSED(event))
+void wxFrameBase::OnMenuHighlight(wxMenuEvent& event)
{
- // if we're using constraints - do use them
-#if wxUSE_CONSTRAINTS
- if ( GetAutoLayout() )
- {
- Layout();
- }
- else
-#endif
- {
- // do we have _exactly_ one child?
- wxWindow *child = (wxWindow *)NULL;
- for ( wxWindowList::Node *node = GetChildren().GetFirst();
- node;
- node = node->GetNext() )
- {
- wxWindow *win = node->GetData();
-
- // 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())
+ (void)ShowMenuHelp(GetStatusBar(), event.GetMenuId());
#endif // wxUSE_STATUSBAR
-#if wxUSE_TOOLBAR
- && (win != GetToolBar())
-#endif // wxUSE_TOOLBAR
- )
- {
- if ( child )
- {
- return; // it's our second subwindow - nothing to do
- }
-
- child = win;
- }
- }
-
- // do we have any children at all?
- if ( child )
- {
- // exactly one child - set it's size to fill the whole frame
- int clientW, clientH;
- DoGetClientSize(&clientW, &clientH);
-
- // for whatever reasons, wxGTK wants to have a small offset - it
- // probably looks better with it?
-#ifdef __WXGTK__
- static const int ofs = 1;
-#else
- static const int ofs = 0;
-#endif
-
- child->SetSize(ofs, ofs, clientW - 2*ofs, clientH - 2*ofs);
- }
- }
}
-// The default implementation for the close window event.
-void wxFrameBase::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
-{
- Destroy();
-}
-
-void wxFrameBase::OnMenuHighlight(wxMenuEvent& event)
+void wxFrameBase::OnIdle(wxIdleEvent& WXUNUSED(event) )
{
-#if wxUSE_STATUSBAR
- (void)ShowMenuHelp(GetStatusBar(), event.GetMenuId());
-#endif // wxUSE_STATUSBAR
+#if wxUSE_MENUS
+ DoMenuUpdates();
+#endif // wxUSE_MENUS
}
// ----------------------------------------------------------------------------
bool wxFrameBase::ShowMenuHelp(wxStatusBar *statbar, int menuId)
{
+#if wxUSE_MENUS
if ( !statbar )
return FALSE;
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