merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
--- a/samples/mdi/mdi.h
+++ b/samples/mdi/mdi.h
@@ -64,6 +64,7 @@ public:
    void OnActivate(wxActivateEvent& event);

    void OnRefresh(wxCommandEvent& event);
+    void OnChangeTitle(wxCommandEvent& event);
    void OnQuit(wxCommandEvent& event);
    void OnClose(wxCloseEvent& event);

@@ -76,6 +77,7 @@ enum
    MDI_QUIT = 100,
    MDI_NEW_WINDOW,
    MDI_REFRESH,
+    MDI_CHANGE_TITLE,
    MDI_CHILD_QUIT,
    MDI_ABOUT
 };