Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do... fixes and OnMenuHighlight correction (so MDI sample now works)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-10-28 09:15:42 +00:00
parent 2bd5bbc948
commit 449f38b57e
4 changed files with 61 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/motif/mdi.cpp
View File

@@ -47,6 +47,7 @@ BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
EVT_SIZE(wxMDIParentFrame::OnSize)
EVT_ACTIVATE(wxMDIParentFrame::OnActivate)
EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged)
EVT_MENU_HIGHLIGHT_ALL(wxMDIParentFrame::OnMenuHighlight)
END_EVENT_TABLE()
BEGIN_EVENT_TABLE(wxMDIClientWindow, wxNotebook)
@@ -131,9 +132,9 @@ void wxMDIParentFrame::OnSize(wxSizeEvent& WXUNUSED(event))
GetClientWindow()->SetSize(x, y, width, height);
}
void wxMDIParentFrame::GetClientSize(int *width, int *height) const
void wxMDIParentFrame::DoGetClientSize(int *width, int *height) const
{
wxFrame::GetClientSize(width, height);
wxFrame::DoGetClientSize(width, height);
}
void wxMDIParentFrame::OnActivate(wxActivateEvent& WXUNUSED(event))
@@ -283,6 +284,30 @@ void wxMDIParentFrame::ActivatePrevious()
// TODO
}
// Default menu selection behaviour - display a help string
void wxMDIParentFrame::OnMenuHighlight(wxMenuEvent& event)
{
if (GetStatusBar())
{
if (event.GetMenuId() == -1)
SetStatusText("");
else
{
wxMenuBar *menuBar = (wxMenuBar*) NULL;
if (GetActiveChild())
menuBar = GetActiveChild()->GetMenuBar();
else
menuBar = GetMenuBar();
if (menuBar)
{
wxString helpString(menuBar->GetHelpString(event.GetMenuId()));
if (helpString != "")
SetStatusText(helpString);
}
}
}
}
// Child frame
wxMDIChildFrame::wxMDIChildFrame()
@@ -453,9 +478,9 @@ void wxMDIChildFrame::DoSetClientSize(int width, int height)
wxWindow::DoSetClientSize(width, height);
}
void wxMDIChildFrame::GetClientSize(int* width, int* height) const
void wxMDIChildFrame::DoGetClientSize(int* width, int* height) const
{
wxWindow::GetSize(width, height);
wxWindow::DoGetSize(width, height);
}
void wxMDIChildFrame::DoSetSize(int x, int y, int width, int height, int sizeFlags)
@@ -463,14 +488,14 @@ void wxMDIChildFrame::DoSetSize(int x, int y, int width, int height, int sizeFla
wxWindow::DoSetSize(x, y, width, height, sizeFlags);
}
void wxMDIChildFrame::GetSize(int* width, int* height) const
void wxMDIChildFrame::DoGetSize(int* width, int* height) const
{
wxWindow::GetSize(width, height);
wxWindow::DoGetSize(width, height);
}
void wxMDIChildFrame::GetPosition(int *x, int *y) const
void wxMDIChildFrame::DoGetPosition(int *x, int *y) const
{
wxWindow::GetPosition(x, y);
wxWindow::DoGetPosition(x, y);
}
bool wxMDIChildFrame::Show(bool show)
@@ -614,19 +639,19 @@ void wxMDIClientWindow::DoSetClientSize(int width, int height)
wxWindow::DoSetClientSize(width, height);
}
void wxMDIClientWindow::GetClientSize(int *width, int *height) const
void wxMDIClientWindow::DoGetClientSize(int *width, int *height) const
{
wxWindow::GetClientSize(width, height);
wxWindow::DoGetClientSize(width, height);
}
void wxMDIClientWindow::GetSize(int *width, int *height) const
void wxMDIClientWindow::DoGetSize(int *width, int *height) const
{
wxWindow::GetSize(width, height);
wxWindow::DoGetSize(width, height);
}
void wxMDIClientWindow::GetPosition(int *x, int *y) const
void wxMDIClientWindow::DoGetPosition(int *x, int *y) const
{
wxWindow::GetPosition(x, y);
wxWindow::DoGetPosition(x, y);
}
// Explicitly call default scroll behaviour