merged in the small changes from the 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index e3d07b818056629265e825f6a8104b8e0d006831..eb98b73dee8f9f5544d92a7ebf01b1be49ddd3a5 100644 (file)
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -86,6 +86,13 @@ BEGIN_EVENT_TABLE(MyChild, wxMDIChildFrame)
     EVT_MENU(MDI_CHILD_QUIT, MyChild::OnQuit)
     EVT_MENU(MDI_REFRESH, MyChild::OnRefresh)
     EVT_MENU(MDI_CHANGE_TITLE, MyChild::OnChangeTitle)
     EVT_MENU(MDI_CHILD_QUIT, MyChild::OnQuit)
     EVT_MENU(MDI_REFRESH, MyChild::OnRefresh)
     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)
 END_EVENT_TABLE()
 
     EVT_CLOSE(MyChild::OnClose)
 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))
 {
     if ( canvas )
 void MyChild::OnRefresh(wxCommandEvent& WXUNUSED(event))
 {
     if ( canvas )

diff --git a/samples/mdi/mdi.h b/samples/mdi/mdi.h
index b05f205a02fc29e8fea95b525f3c6eb7f27d0801..cea871baf832bb8aeb40e15abd417076136ec828 100644 (file)
--- a/samples/mdi/mdi.h
+++ b/samples/mdi/mdi.h
@@ -68,6 +68,8 @@ public:
     void OnQuit(wxCommandEvent& event);
     void OnClose(wxCloseEvent& event);
 
     void OnQuit(wxCommandEvent& event);
     void OnClose(wxCloseEvent& event);
 

+    void OnUpdateRefresh(wxUpdateUIEvent& event);
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 2b9ff86e5e4d707a8baf8b2350dafc92733d3e56..2aa8a208f79aa56444bccdad069a41992dfbd650 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -163,25 +163,29 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
                               long style,
                               const wxString& name)
 {
                               long style,
                               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_currentChild = NULL;
 
 
   m_clientWindow = NULL;
   m_currentChild = NULL;
 

-  if (style & wxFRAME_NO_WINDOW_MENU)
-      m_windowMenu = (wxMenu*) NULL;
-  else
+  // this style can be used to prevent a window from having the standard MDI
+  // "Window" menu
+  if ( style & wxFRAME_NO_WINDOW_MENU )
+  {
+      m_windowMenu = (wxMenu *)NULL;
+  }
+  else // normal case: we have the window menu, so construct it

   {
   {

-  // m_windowMenu = (WXHMENU) ::LoadMenu(wxGetInstance(), wxT("wxWindowMenu"));

       m_windowMenu = new wxMenu;
 
       m_windowMenu = new wxMenu;
 

-
-      m_windowMenu->Append(4002, wxT("&Cascade"));
-      m_windowMenu->Append(4001, wxT("Tile &Horizontally"));
-      m_windowMenu->Append(4005, wxT("Tile &Vertically"));
+      m_windowMenu->Append(IDM_WINDOWCASCADE, wxT("&Cascade"));
+      m_windowMenu->Append(IDM_WINDOWTILEHOR, wxT("Tile &Horizontally"));
+      m_windowMenu->Append(IDM_WINDOWTILEVERT, wxT("Tile &Vertically"));

       m_windowMenu->AppendSeparator();
       m_windowMenu->AppendSeparator();

-      m_windowMenu->Append(4003, wxT("&Arrange Icons"));
-      m_windowMenu->Append(4004, wxT("&Next"));
+      m_windowMenu->Append(IDM_WINDOWICONS, wxT("&Arrange Icons"));
+      m_windowMenu->Append(IDM_WINDOWNEXT, wxT("&Next"));

   }
 
   m_parentFrameActive = TRUE;
   }
 
   m_parentFrameActive = TRUE;