made unzip.c accept / and \ in filenames as equal

[wxWidgets.git] / src / motif / choice.cpp

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index 7012c75c0fea4216716001017388e535baa27815..45a24308472a5f420b16711e0bb68a7c44c36e2a 100644 (file)
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -17,19 +17,23 @@
 #include "wx/choice.h"
 #include "wx/utils.h"
 
 #include "wx/choice.h"
 #include "wx/utils.h"
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <Xm/PushBG.h>
 #include <Xm/PushB.h>
 #include <Xm/RowColumn.h>
 #include <Xm/Xm.h>
 #include <Xm/PushBG.h>
 #include <Xm/PushB.h>
 #include <Xm/RowColumn.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)

-#endif

 
 void wxChoiceCallback (Widget w, XtPointer clientData,
 
 void wxChoiceCallback (Widget w, XtPointer clientData,

-                 XtPointer ptr);
+                       XtPointer ptr);

 
 wxChoice::wxChoice()
 {
 
 wxChoice::wxChoice()
 {


@@ -38,52 +42,54 @@ wxChoice::wxChoice()
     m_menuWidget = (WXWidget) 0;
     m_widgetList = (WXWidget*) 0;
     m_formWidget = (WXWidget) 0;
     m_menuWidget = (WXWidget) 0;
     m_widgetList = (WXWidget*) 0;
     m_formWidget = (WXWidget) 0;

-    m_inSetValue = FALSE;

 }
 
 bool wxChoice::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxChoice::Create(wxWindow *parent, wxWindowID id,

-           const wxPoint& pos,
-           const wxSize& size,
-                  int n, const wxString choices[],
-                  long style,
-           const wxValidator& validator,
-           const wxString& name)
+                      const wxPoint& pos,
+                      const wxSize& size,
+                      int n, const wxString choices[],
+                      long style,
+                      const wxValidator& validator,
+                      const wxString& name)

 {
     SetName(name);
     SetValidator(validator);
 {
     SetName(name);
     SetValidator(validator);

-    m_noStrings = n;
+    m_noStrings = 0; // Starts off with none, incremented in Append

     m_windowStyle = style;
     m_buttonWidget = (WXWidget) 0;
     m_menuWidget = (WXWidget) 0;
     m_widgetList = (WXWidget*) 0;
     m_formWidget = (WXWidget) 0;
     m_windowStyle = style;
     m_buttonWidget = (WXWidget) 0;
     m_menuWidget = (WXWidget) 0;
     m_widgetList = (WXWidget*) 0;
     m_formWidget = (WXWidget) 0;

-    m_inSetValue = FALSE;

 
     if (parent) parent->AddChild(this);
 
     if ( id == -1 )
 
     if (parent) parent->AddChild(this);
 
     if ( id == -1 )

-       m_windowId = (int)NewControlId();
+        m_windowId = (int)NewControlId();

     else
     else

-           m_windowId = id;
+        m_windowId = id;
+
+    m_backgroundColour = parent->GetBackgroundColour();
+    m_foregroundColour = parent->GetForegroundColour();
+    m_font = parent->GetFont();

 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 

-    m_formWidget = (WXWidget) XtVaCreateManagedWidget ((char*) (const char*) name,
-                                       xmRowColumnWidgetClass, parentWidget,
-                                       XmNmarginHeight, 0,
-                                       XmNmarginWidth, 0,
-                                       XmNpacking, XmPACK_TIGHT,
-                                       XmNorientation, XmHORIZONTAL,
-                                       NULL);
+    m_formWidget = (WXWidget) XtVaCreateManagedWidget(name.c_str(),
+        xmRowColumnWidgetClass, parentWidget,
+        XmNmarginHeight, 0,
+        XmNmarginWidth, 0,
+        XmNpacking, XmPACK_TIGHT,
+        XmNorientation, XmHORIZONTAL,
+        NULL);

 
     XtVaSetValues ((Widget) m_formWidget, XmNspacing, 0, NULL);
 
 
     XtVaSetValues ((Widget) m_formWidget, XmNspacing, 0, NULL);
 

-   /*
+    /*

     * Create the popup menu
     */
     m_menuWidget = (WXWidget) XmCreatePulldownMenu ((Widget) m_formWidget, "choiceMenu", NULL, 0);
 
     * Create the popup menu
     */
     m_menuWidget = (WXWidget) XmCreatePulldownMenu ((Widget) m_formWidget, "choiceMenu", NULL, 0);
 

-    int i;
+    //    int i;

     if (n > 0)
     {
         int i;
     if (n > 0)
     {
         int i;


@@ -91,7 +97,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
             Append (choices[i]);
     }
 
             Append (choices[i]);
     }
 

-   /*
+    /*

     * Create button
     */
     Arg args[10];
     * Create button
     */
     Arg args[10];


@@ -117,89 +123,101 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
     // that I have found the code responsible for this behaviour.
 #if XmVersion >= 1002
 #if XmVersion <  2000
     // that I have found the code responsible for this behaviour.
 #if XmVersion >= 1002
 #if XmVersion <  2000

-    Widget optionLabel = XmOptionLabelGadget ((Widget) m_buttonWidget);
-    XtUnmanageChild (optionLabel);
+    // JACS, 24/1/99: this seems to cause a malloc crash later on, e.g.
+    // in controls sample.
+    //
+    // Widget optionLabel = XmOptionLabelGadget ((Widget) m_buttonWidget);
+    // XtUnmanageChild (optionLabel);

 #endif
 #endif
 
     XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
 
 #endif
 #endif
 
     XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
 

+    ChangeFont(FALSE);
+

     AttachWidget (parent, m_buttonWidget, m_formWidget, pos.x, pos.y, size.x, size.y);
 
     AttachWidget (parent, m_buttonWidget, m_formWidget, pos.x, pos.y, size.x, size.y);
 

-    SetFont(* parent->GetFont());
-    ChangeColour(m_mainWidget);
+    ChangeBackgroundColour();

 
     return TRUE;
 }
 
 wxChoice::~wxChoice()
 {
 
     return TRUE;
 }
 
 wxChoice::~wxChoice()
 {

-  // For some reason destroying the menuWidget
-  // can cause crashes on some machines. It will
-  // be deleted implicitly by deleting the parent form
-  // anyway.
-//  XtDestroyWidget (menuWidget);
+    // For some reason destroying the menuWidget
+    // can cause crashes on some machines. It will
+    // be deleted implicitly by deleting the parent form
+    // anyway.
+    //  XtDestroyWidget (menuWidget);

     if (m_widgetList)
         delete[] m_widgetList;
 
     if (m_widgetList)
         delete[] m_widgetList;
 

-    DetachWidget(GetMainWidget()); // Removes event handlers
+    if (GetMainWidget())
+    {
+        DetachWidget(GetMainWidget()); // Removes event handlers
+        DetachWidget(m_formWidget);

 
 

-    XtDestroyWidget((Widget) m_formWidget);
-    m_formWidget = (WXWidget) 0;
+        XtDestroyWidget((Widget) m_formWidget);
+        m_formWidget = (WXWidget) 0;

 
 

-    // Presumably the other widgets have been deleted now, via the form
-    m_mainWidget = (WXWidget) 0;
-    m_buttonWidget = (WXWidget) 0;
+        // Presumably the other widgets have been deleted now, via the form
+        m_mainWidget = (WXWidget) 0;
+        m_buttonWidget = (WXWidget) 0;
+    }

 }
 
 void wxChoice::Append(const wxString& item)
 {
 }
 
 void wxChoice::Append(const wxString& item)
 {

-  wxStripMenuCodes ((char *)(const char *)item, wxBuffer);
-  Widget w = XtVaCreateManagedWidget (wxBuffer,
+    Widget w = XtVaCreateManagedWidget (wxStripMenuCodes(item),

 #if USE_GADGETS
 #if USE_GADGETS

-                                     xmPushButtonGadgetClass, (Widget) m_menuWidget,
+        xmPushButtonGadgetClass, (Widget) m_menuWidget,

 #else
 #else

-                                     xmPushButtonWidgetClass, (Widget) m_menuWidget,
+        xmPushButtonWidgetClass, (Widget) m_menuWidget,

 #endif
 #endif

-                                     NULL);
+        NULL);
+
+    DoChangeBackgroundColour((WXWidget) w, m_backgroundColour);

 
 

-  if (m_windowFont.Ok())
-    XtVaSetValues (w,
-                  XmNfontList, (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay((Widget) m_formWidget)),
-                  NULL);
+    if (m_font.Ok())
+        XtVaSetValues (w,
+        XmNfontList, (XmFontList) m_font.GetFontList(1.0, XtDisplay((Widget) m_formWidget)),
+        NULL);

 
 

-  WXWidget *new_widgetList = new WXWidget[m_noStrings + 1];
-  int i;
-  for (i = 0; i < m_noStrings; i++)
-    new_widgetList[i] = m_widgetList[i];
-  new_widgetList[m_noStrings] = (WXWidget) w;
-  if (m_widgetList)
-    delete[] m_widgetList;
-  m_widgetList = new_widgetList;
+    WXWidget *new_widgetList = new WXWidget[m_noStrings + 1];
+    int i;
+    if (m_widgetList)
+        for (i = 0; i < m_noStrings; i++)
+            new_widgetList[i] = m_widgetList[i];

 
 

-  char mnem = wxFindMnemonic ((char*) (const char*) item);
-  if (mnem != 0)
-    XtVaSetValues (w, XmNmnemonic, mnem, NULL);
+        new_widgetList[m_noStrings] = (WXWidget) w;

 
 

-  XtAddCallback (w, XmNactivateCallback, (XtCallbackProc) wxChoiceCallback, (XtPointer) this);
+        if (m_widgetList)
+            delete[] m_widgetList;
+        m_widgetList = new_widgetList;

 
 

-  if (m_noStrings == 0 && m_buttonWidget)
-    {
-      XtVaSetValues ((Widget) m_buttonWidget, XmNmenuHistory, w, NULL);
-      Widget label = XmOptionButtonGadget ((Widget) m_buttonWidget);
-      XmString text = XmStringCreateSimple ((char*) (const char*) item);
-      XtVaSetValues (label,
-                    XmNlabelString, text,
-                    NULL);
-      XmStringFree (text);
-    }
-  wxNode *node = m_stringList.Add (item);
-  XtVaSetValues (w, XmNuserData, node->Data (), NULL);
+        char mnem = wxFindMnemonic ((char*) (const char*) item);
+        if (mnem != 0)
+            XtVaSetValues (w, XmNmnemonic, mnem, NULL);
+
+        XtAddCallback (w, XmNactivateCallback, (XtCallbackProc) wxChoiceCallback, (XtPointer) this);

 
 

-  m_noStrings ++;
+        if (m_noStrings == 0 && m_buttonWidget)
+        {
+            XtVaSetValues ((Widget) m_buttonWidget, XmNmenuHistory, w, NULL);
+            Widget label = XmOptionButtonGadget ((Widget) m_buttonWidget);
+            XmString text = XmStringCreateSimple ((char*) (const char*) item);
+            XtVaSetValues (label,
+                XmNlabelString, text,
+                NULL);
+            XmStringFree (text);
+        }
+        wxNode *node = m_stringList.Add (item);
+        XtVaSetValues (w, XmNuserData, node->Data (), NULL);
+
+        m_noStrings ++;

 }
 
 }
 

-void wxChoice::Delete(int n)
+void wxChoice::Delete(int WXUNUSED(n))

 {
     wxFAIL_MSG( "Sorry, wxChoice::Delete isn't implemented yet. Maybe you'd like to volunteer? :-)" );
 
 {
     wxFAIL_MSG( "Sorry, wxChoice::Delete isn't implemented yet. Maybe you'd like to volunteer? :-)" );
 


@@ -230,59 +248,59 @@ void wxChoice::Clear()
 
 int wxChoice::GetSelection() const
 {
 
 int wxChoice::GetSelection() const
 {

-  XmString text;
-  char *s;
-  Widget label = XmOptionButtonGadget ((Widget) m_buttonWidget);
-  XtVaGetValues (label,
-         XmNlabelString, &text,
-         NULL);
-
-  if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
-  {
-      int i = 0;
-      for (wxNode * node = m_stringList.First (); node; node = node->Next ())
-      {
-        char *s1 = (char *) node->Data ();
-        if (s1 == s || strcmp (s1, s) == 0)
+    XmString text;
+    char *s;
+    Widget label = XmOptionButtonGadget ((Widget) m_buttonWidget);
+    XtVaGetValues (label,
+        XmNlabelString, &text,
+        NULL);
+
+    if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
+    {
+        int i = 0;
+        for (wxNode * node = m_stringList.First (); node; node = node->Next ())

         {
         {

-          XmStringFree(text) ;
-          XtFree (s);
-          return i;
-        }
-        else
-            i++;
-      }            // for()
-
-      XmStringFree(text) ;
-      XtFree (s);
-      return -1;
-  }
-  XmStringFree(text) ;
-  return -1;
+            char *s1 = (char *) node->Data ();
+            if (s1 == s || strcmp (s1, s) == 0)
+            {
+                XmStringFree(text) ;
+                XtFree (s);
+                return i;
+            }
+            else
+                i++;
+        }            // for()
+
+        XmStringFree(text) ;
+        XtFree (s);
+        return -1;
+    }
+    XmStringFree(text) ;
+    return -1;

 }
 
 void wxChoice::SetSelection(int n)
 {
 }
 
 void wxChoice::SetSelection(int n)
 {

-  m_inSetValue = TRUE;
-  
-  wxNode *node = m_stringList.Nth (n);
-  if (node)
+    m_inSetValue = TRUE;
+
+    wxNode *node = m_stringList.Nth (n);
+    if (node)

     {
     {

-      Dimension selectionWidth, selectionHeight;
-
-      char *s = (char *) node->Data ();
-      XmString text = XmStringCreateSimple (s);
-      XtVaGetValues ((Widget) m_widgetList[n], XmNwidth, &selectionWidth, XmNheight, &selectionHeight, NULL);
-      Widget label = XmOptionButtonGadget ((Widget) m_buttonWidget);
-      XtVaSetValues (label,
-                     XmNlabelString, text,
-                     NULL);
-      XmStringFree (text);
-      XtVaSetValues ((Widget) m_buttonWidget,
-                     XmNwidth, selectionWidth, XmNheight, selectionHeight,
-                     XmNmenuHistory, (Widget) m_widgetList[n], NULL);
+        Dimension selectionWidth, selectionHeight;
+
+        char *s = (char *) node->Data ();
+        XmString text = XmStringCreateSimple (s);
+        XtVaGetValues ((Widget) m_widgetList[n], XmNwidth, &selectionWidth, XmNheight, &selectionHeight, NULL);
+        Widget label = XmOptionButtonGadget ((Widget) m_buttonWidget);
+        XtVaSetValues (label,
+            XmNlabelString, text,
+            NULL);
+        XmStringFree (text);
+        XtVaSetValues ((Widget) m_buttonWidget,
+            XmNwidth, selectionWidth, XmNheight, selectionHeight,
+            XmNmenuHistory, (Widget) m_widgetList[n], NULL);

     }
     }

-  m_inSetValue = FALSE;
+    m_inSetValue = FALSE;

 }
 
 int wxChoice::FindString(const wxString& s) const
 }
 
 int wxChoice::FindString(const wxString& s) const


@@ -303,39 +321,39 @@ int wxChoice::FindString(const wxString& s) const
 
 wxString wxChoice::GetString(int n) const
 {
 
 wxString wxChoice::GetString(int n) const
 {

-  wxNode *node = m_stringList.Nth (n);
-  if (node)
-    return wxString((char *) node->Data ());
-  else
-    return wxEmptyString;
+    wxNode *node = m_stringList.Nth (n);
+    if (node)
+        return wxString((char *) node->Data ());
+    else
+        return wxEmptyString;

 }
 
 void wxChoice::SetColumns(int n)
 {
 }
 
 void wxChoice::SetColumns(int n)
 {

-  if (n<1) n = 1 ;
+    if (n<1) n = 1 ;

 
 

-  short numColumns = n ;
-  Arg args[3];
+    short numColumns = n ;
+    Arg args[3];

 
 

-  XtSetArg(args[0], XmNnumColumns, numColumns);
-  XtSetArg(args[1], XmNpacking, XmPACK_COLUMN);
-  XtSetValues((Widget) m_menuWidget,args,2) ;
+    XtSetArg(args[0], XmNnumColumns, numColumns);
+    XtSetArg(args[1], XmNpacking, XmPACK_COLUMN);
+    XtSetValues((Widget) m_menuWidget,args,2) ;

 }
 
 int wxChoice::GetColumns(void) const
 {
 }
 
 int wxChoice::GetColumns(void) const
 {

-  short numColumns ;
+    short numColumns ;

 
 

-  XtVaGetValues((Widget) m_menuWidget,XmNnumColumns,&numColumns,NULL) ;
-  return numColumns ;
+    XtVaGetValues((Widget) m_menuWidget,XmNnumColumns,&numColumns,NULL) ;
+    return numColumns ;

 }
 
 void wxChoice::SetFocus()
 {
 }
 
 void wxChoice::SetFocus()
 {

-  XmProcessTraversal(XtParent((Widget)m_mainWidget), XmTRAVERSE_CURRENT);
+    XmProcessTraversal(XtParent((Widget)m_mainWidget), XmTRAVERSE_CURRENT);

 }
 
 }
 

-void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxChoice::DoSetSize(int x, int y, int width, int height, int sizeFlags)

 {
     XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_ANY, NULL);
     bool managed = XtIsManaged((Widget) m_formWidget);
 {
     XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_ANY, NULL);
     bool managed = XtIsManaged((Widget) m_formWidget);


@@ -351,7 +369,7 @@ void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
         for (i = 0; i < m_noStrings; i++)
             XtVaSetValues ((Widget) m_widgetList[i], XmNwidth, actualWidth, NULL);
         XtVaSetValues ((Widget) m_buttonWidget, XmNwidth, actualWidth,
         for (i = 0; i < m_noStrings; i++)
             XtVaSetValues ((Widget) m_widgetList[i], XmNwidth, actualWidth, NULL);
         XtVaSetValues ((Widget) m_buttonWidget, XmNwidth, actualWidth,

-             NULL);
+            NULL);

     }
     if (height > -1)
     {
     }
     if (height > -1)
     {


@@ -359,14 +377,14 @@ void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
         for (i = 0; i < m_noStrings; i++)
             XtVaSetValues ((Widget) m_widgetList[i], XmNheight, actualHeight, NULL);
         XtVaSetValues ((Widget) m_buttonWidget, XmNheight, actualHeight,
         for (i = 0; i < m_noStrings; i++)
             XtVaSetValues ((Widget) m_widgetList[i], XmNheight, actualHeight, NULL);
         XtVaSetValues ((Widget) m_buttonWidget, XmNheight, actualHeight,

-             NULL);
+            NULL);

     }
 
     if (managed)
         XtManageChild ((Widget) m_formWidget);
     XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
 
     }
 
     if (managed)
         XtManageChild ((Widget) m_formWidget);
     XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
 

-    wxControl::SetSize (x, y, width, height, sizeFlags);
+    wxControl::DoSetSize (x, y, width, height, sizeFlags);

 }
 
 wxString wxChoice::GetStringSelection () const
 }
 
 wxString wxChoice::GetStringSelection () const


@@ -382,10 +400,10 @@ bool wxChoice::SetStringSelection (const wxString& s)
 {
     int sel = FindString (s);
     if (sel > -1)
 {
     int sel = FindString (s);
     if (sel > -1)

-        {
-            SetSelection (sel);
-            return TRUE;
-        }
+    {
+        SetSelection (sel);
+        return TRUE;
+    }

     else
         return FALSE;
 }
     else
         return FALSE;
 }


@@ -396,24 +414,144 @@ void wxChoice::Command(wxCommandEvent & event)
     ProcessCommand (event);
 }
 
     ProcessCommand (event);
 }
 

-void wxChoiceCallback (Widget w, XtPointer clientData,
-          XtPointer ptr)
+void wxChoiceCallback (Widget w, XtPointer clientData, XtPointer WXUNUSED(ptr))

 {
     wxChoice *item = (wxChoice *) clientData;
     if (item)
     {
 {
     wxChoice *item = (wxChoice *) clientData;
     if (item)
     {

-        if (item->m_inSetValue)
+        if (item->InSetValue())

             return;
             return;

-        
+

         char *s = NULL;
         XtVaGetValues (w, XmNuserData, &s, NULL);
         if (s)
         {
         char *s = NULL;
         XtVaGetValues (w, XmNuserData, &s, NULL);
         if (s)
         {

-            wxCommandEvent event (wxEVT_COMMAND_CHOICE_SELECTED);
+            wxCommandEvent event (wxEVT_COMMAND_CHOICE_SELECTED, item->GetId());
+            event.SetEventObject(item);

             event.m_commandInt = item->FindString (s);
             event.m_commandInt = item->FindString (s);

-//            event.m_commandString = s;
+            //            event.m_commandString = s;

             item->ProcessCommand (event);
         }
     }
 }
 
             item->ProcessCommand (event);
         }
     }
 }
 

+void wxChoice::ChangeFont(bool keepOriginalSize)
+{
+    // Note that this causes the widget to be resized back
+    // to its original size! We therefore have to set the size
+    // back again. TODO: a better way in Motif?
+    if (m_font.Ok())
+    {
+        int width, height, width1, height1;
+        GetSize(& width, & height);
+
+        XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay((Widget) m_mainWidget));
+        XtVaSetValues ((Widget) m_mainWidget, XmNfontList, fontList, NULL);
+        XtVaSetValues ((Widget) m_buttonWidget, XmNfontList, fontList, NULL);
+
+        /* TODO: why does this cause a crash in XtWidgetToApplicationContext?
+        int i;
+        for (i = 0; i < m_noStrings; i++)
+        XtVaSetValues ((Widget) m_widgetList[i], XmNfontList, fontList, NULL);
+        */
+        GetSize(& width1, & height1);
+        if (keepOriginalSize && (width != width1 || height != height1))
+        {
+            SetSize(-1, -1, width, height);
+        }
+    }
+}
+
+void wxChoice::ChangeBackgroundColour()
+{
+    DoChangeBackgroundColour(m_formWidget, m_backgroundColour);
+    DoChangeBackgroundColour(m_buttonWidget, m_backgroundColour);
+    DoChangeBackgroundColour(m_menuWidget, m_backgroundColour);
+    int i;
+    for (i = 0; i < m_noStrings; i++)
+        DoChangeBackgroundColour(m_widgetList[i], m_backgroundColour);
+}
+
+void wxChoice::ChangeForegroundColour()
+{
+    DoChangeForegroundColour(m_formWidget, m_foregroundColour);
+    DoChangeForegroundColour(m_buttonWidget, m_foregroundColour);
+    DoChangeForegroundColour(m_menuWidget, m_foregroundColour);
+    int i;
+    for (i = 0; i < m_noStrings; i++)
+        DoChangeForegroundColour(m_widgetList[i], m_foregroundColour);
+}
+
+
+// These implement functions needed by wxControlWithItems.
+// Unfortunately, they're not all implemented yet.
+
+int wxChoice::GetCount() const
+{
+    return Number();
+}
+
+int wxChoice::DoAppend(const wxString& item)
+{
+    Append(item);
+    return GetCount() - 1;
+}
+
+// Just appends, doesn't yet insert
+void wxChoice::DoInsertItems(const wxArrayString& items, int WXUNUSED(pos))
+{
+    size_t nItems = items.GetCount();
+
+    for ( size_t n = 0; n < nItems; n++ )
+    {
+        Append( items[n]);
+    }
+}
+
+void wxChoice::DoSetItems(const wxArrayString& items, void **WXUNUSED(clientData))
+{
+    Clear();
+    size_t nItems = items.GetCount();
+
+    for ( size_t n = 0; n < nItems; n++ )
+    {
+        Append(items[n]);
+    }
+}
+
+void wxChoice::DoSetFirstItem(int WXUNUSED(n))
+{
+    wxFAIL_MSG( wxT("wxChoice::DoSetFirstItem not implemented") );
+}
+
+void wxChoice::DoSetItemClientData(int WXUNUSED(n), void* WXUNUSED(clientData))
+{
+    wxFAIL_MSG( wxT("wxChoice::DoSetItemClientData not implemented") );
+}
+
+void* wxChoice::DoGetItemClientData(int WXUNUSED(n)) const
+{
+    wxFAIL_MSG( wxT("wxChoice::DoGetItemClientData not implemented") );
+    return (void*) NULL;
+}
+
+void wxChoice::DoSetItemClientObject(int WXUNUSED(n), wxClientData* WXUNUSED(clientData))
+{
+    wxFAIL_MSG( wxT("wxChoice::DoSetItemClientObject not implemented") );
+}
+
+wxClientData* wxChoice::DoGetItemClientObject(int WXUNUSED(n)) const
+{
+    wxFAIL_MSG( wxT("wxChoice::DoGetItemClientObject not implemented") );
+    return (wxClientData*) NULL;
+}
+
+void wxChoice::Select(int n)
+{
+    SetSelection(n);
+}
+
+void wxChoice::SetString(int WXUNUSED(n), const wxString& WXUNUSED(s))
+{
+    wxFAIL_MSG( wxT("wxChoice::SetString not implemented") );
+}