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/include/wx/motif/choice.h
+++ b/include/wx/motif/choice.h
@@ -96,6 +96,8 @@ protected:
    WXWidget*     m_widgetList ;
    WXWidget      m_formWidget;
    wxStringList  m_stringList;
+    wxList        m_clientList;    // contains the client data for the items
+

    virtual void DoSetSize(int x, int y,
                           int width, int height,