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/demos/life/life.h
+++ b/demos/life/life.h
@@ -137,8 +137,9 @@ private:
    DECLARE_EVENT_TABLE()

    // event handlers
-    void OnSamples(wxCommandEvent& event);
    void OnMenu(wxCommandEvent& event);
+    void OnOpen(wxCommandEvent& event);
+    void OnSamples(wxCommandEvent& event);
    void OnNavigate(wxCommandEvent& event);
    void OnZoom(wxCommandEvent& event);
    void OnSlider(wxScrollEvent& event);