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

merged in the small changes from the 2.2 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-12-10 12:04:19 +00:00
parent d015713e78
commit 3d8dea7e2e
3 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
samples/mdi/mdi.cpp
View File

@@ -86,6 +86,13 @@ BEGIN_EVENT_TABLE(MyChild, wxMDIChildFrame)
EVT_MENU(MDI_CHILD_QUIT, MyChild::OnQuit) EVT_MENU(MDI_CHILD_QUIT, MyChild::OnQuit)
EVT_MENU(MDI_REFRESH, MyChild::OnRefresh) EVT_MENU(MDI_REFRESH, MyChild::OnRefresh)
EVT_MENU(MDI_CHANGE_TITLE, MyChild::OnChangeTitle) EVT_MENU(MDI_CHANGE_TITLE, MyChild::OnChangeTitle)
EVT_MENU(MDI_CHANGE_POSITION, MyChild::OnChangePosition)
EVT_MENU(MDI_CHANGE_SIZE, MyChild::OnChangeSize)
EVT_UPDATE_UI(MDI_REFRESH, MyChild::OnUpdateRefresh)
EVT_SIZE(MyChild::OnSize)
EVT_MOVE(MyChild::OnMove)
EVT_CLOSE(MyChild::OnClose) EVT_CLOSE(MyChild::OnClose)
END_EVENT_TABLE() END_EVENT_TABLE()
@@ -421,6 +428,11 @@ void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event))
Close(TRUE); Close(TRUE);
} }
void MyChild::OnUpdateRefresh(wxUpdateUIEvent& event)
{
event.Enable( canvas && canvas->IsDirty() );
}
void MyChild::OnRefresh(wxCommandEvent& WXUNUSED(event)) void MyChild::OnRefresh(wxCommandEvent& WXUNUSED(event))
{ {
if ( canvas ) if ( canvas )

2
samples/mdi/mdi.h
View File

@@ -68,6 +68,8 @@ public:
void OnQuit(wxCommandEvent& event); void OnQuit(wxCommandEvent& event);
void OnClose(wxCloseEvent& event); void OnClose(wxCloseEvent& event);
void OnUpdateRefresh(wxUpdateUIEvent& event);
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };

24
src/msw/mdi.cpp
View File

@@ -163,25 +163,29 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
long style, long style,
const wxString& name) const wxString& name)
{ {
m_defaultIcon = (WXHICON) (wxSTD_MDIPARENTFRAME_ICON ? wxSTD_MDIPARENTFRAME_ICON : wxDEFAULT_MDIPARENTFRAME_ICON); m_defaultIcon = (WXHICON) (wxSTD_MDIPARENTFRAME_ICON
? wxSTD_MDIPARENTFRAME_ICON
: wxDEFAULT_MDIPARENTFRAME_ICON);
m_clientWindow = NULL; m_clientWindow = NULL;
m_currentChild = NULL; m_currentChild = NULL;
// this style can be used to prevent a window from having the standard MDI
// "Window" menu
if ( style & wxFRAME_NO_WINDOW_MENU ) if ( style & wxFRAME_NO_WINDOW_MENU )
m_windowMenu = (wxMenu*) NULL;
else
{ {
// m_windowMenu = (WXHMENU) ::LoadMenu(wxGetInstance(), wxT("wxWindowMenu")); m_windowMenu = (wxMenu *)NULL;
}
else // normal case: we have the window menu, so construct it
{
m_windowMenu = new wxMenu; m_windowMenu = new wxMenu;
m_windowMenu->Append(IDM_WINDOWCASCADE, wxT("&Cascade"));
m_windowMenu->Append(4002, wxT("&Cascade")); m_windowMenu->Append(IDM_WINDOWTILEHOR, wxT("Tile &Horizontally"));
m_windowMenu->Append(4001, wxT("Tile &Horizontally")); m_windowMenu->Append(IDM_WINDOWTILEVERT, wxT("Tile &Vertically"));
m_windowMenu->Append(4005, wxT("Tile &Vertically"));
m_windowMenu->AppendSeparator(); m_windowMenu->AppendSeparator();
m_windowMenu->Append(4003, wxT("&Arrange Icons")); m_windowMenu->Append(IDM_WINDOWICONS, wxT("&Arrange Icons"));
m_windowMenu->Append(4004, wxT("&Next")); m_windowMenu->Append(IDM_WINDOWNEXT, wxT("&Next"));
} }
m_parentFrameActive = TRUE; m_parentFrameActive = TRUE;