missing commit

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

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index a43d00a38a1185e9f709e2fdd3b8ade01b944430..39b0f030860affe7ab284632d64ed05241fc6624 100644 (file)
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -1,26 +1,25 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        choice.cpp
+// Name:        src/motif/choice.cpp

 // Purpose:     wxChoice
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxChoice
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "choice.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

-#ifdef VMS
-#define XtDisplay XTDISPLAY
-#define XtParent XTPARENT
-#endif
+#if wxUSE_CHOICE

 
 

-// For compilers that support precompilation, includes "wx.h".

 #include "wx/choice.h"
 #include "wx/choice.h"

-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/arrstr.h"
+#endif

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -35,17 +34,22 @@
 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 

-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
+#define WIDTH_OVERHEAD 48
+#define WIDTH_OVERHEAD_SUBTRACT 40
+#define HEIGHT_OVERHEAD 15

 
 void wxChoiceCallback (Widget w, XtPointer clientData,
                        XtPointer ptr);
 
 wxChoice::wxChoice()
 {
 
 void wxChoiceCallback (Widget w, XtPointer clientData,
                        XtPointer ptr);
 
 wxChoice::wxChoice()
 {

-    m_noStrings = 0;
+    Init();
+}
+
+void wxChoice::Init()
+{

     m_buttonWidget = (WXWidget) 0;
     m_menuWidget = (WXWidget) 0;
     m_buttonWidget = (WXWidget) 0;
     m_menuWidget = (WXWidget) 0;

-    m_widgetList = (WXWidget*) 0;

     m_formWidget = (WXWidget) 0;
 }
 
     m_formWidget = (WXWidget) 0;
 }
 


@@ -57,25 +61,9 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
                       const wxValidator& validator,
                       const wxString& name)
 {
                       const wxValidator& validator,
                       const wxString& name)
 {

-    SetName(name);
-    SetValidator(validator);
-    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;
-
-    if (parent) parent->AddChild(this);
-
-    if ( id == -1 )
-        m_windowId = (int)NewControlId();
-    else
-        m_windowId = id;
-
-    m_backgroundColour = parent->GetBackgroundColour();
-    m_foregroundColour = parent->GetForegroundColour();
-    m_font = parent->GetFont();
+    if ( !CreateControl(parent, id, pos, size, style, validator, name) )
+        return false;
+    PreCreation();

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


@@ -85,6 +73,8 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
         XmNmarginWidth, 0,
         XmNpacking, XmPACK_TIGHT,
         XmNorientation, XmHORIZONTAL,
         XmNmarginWidth, 0,
         XmNpacking, XmPACK_TIGHT,
         XmNorientation, XmHORIZONTAL,

+        XmNresizeWidth, False,
+        XmNresizeHeight, False,

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


@@ -92,9 +82,10 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
     /*
     * Create the popup menu
     */
     /*
     * Create the popup menu
     */

-    m_menuWidget = (WXWidget) XmCreatePulldownMenu ((Widget) m_formWidget, "choiceMenu", NULL, 0);
+    m_menuWidget = (WXWidget) XmCreatePulldownMenu ((Widget) m_formWidget,
+                                                    wxMOTIF_STR("choiceMenu"),
+                                                    NULL, 0);

 
 

-    //    int i;

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


@@ -108,15 +99,13 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
     Arg args[10];
     Cardinal argcnt = 0;
 
     Arg args[10];
     Cardinal argcnt = 0;
 

-    XtSetArg (args[argcnt], XmNsubMenuId, (Widget) m_menuWidget);
-    argcnt++;
-    XtSetArg (args[argcnt], XmNmarginWidth, 0);
-    argcnt++;
-    XtSetArg (args[argcnt], XmNmarginHeight, 0);
-    argcnt++;
-    XtSetArg (args[argcnt], XmNpacking, XmPACK_TIGHT);
-    argcnt++;
-    m_buttonWidget = (WXWidget) XmCreateOptionMenu ((Widget) m_formWidget, "choiceButton", args, argcnt);
+    XtSetArg (args[argcnt], XmNsubMenuId, (Widget) m_menuWidget); ++argcnt;
+    XtSetArg (args[argcnt], XmNmarginWidth, 0); ++argcnt;
+    XtSetArg (args[argcnt], XmNmarginHeight, 0); ++argcnt;
+    XtSetArg (args[argcnt], XmNpacking, XmPACK_TIGHT); ++argcnt;
+    m_buttonWidget = (WXWidget) XmCreateOptionMenu ((Widget) m_formWidget,
+                                                    wxMOTIF_STR("choiceButton"),
+                                                    args, argcnt);

 
     m_mainWidget = m_buttonWidget;
 
 
     m_mainWidget = m_buttonWidget;
 


@@ -136,15 +125,30 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
 #endif
 #endif
 
 #endif
 #endif
 

-    XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
+    wxSize bestSize = GetBestSize();
+    if( size.x > 0 ) bestSize.x = size.x;
+    if( size.y > 0 ) bestSize.y = size.y;

 
 

-    ChangeFont(FALSE);
+    XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);

 
 

-    AttachWidget (parent, m_buttonWidget, m_formWidget, pos.x, pos.y, size.x, size.y);
+    PostCreation();
+    AttachWidget (parent, m_buttonWidget, m_formWidget,
+                  pos.x, pos.y, bestSize.x, bestSize.y);

 
 

-    ChangeBackgroundColour();
+    return true;
+}

 
 

-    return TRUE;
+bool wxChoice::Create(wxWindow *parent, wxWindowID id,
+                      const wxPoint& pos,
+                      const wxSize& size,
+                      const wxArrayString& choices,
+                      long style,
+                      const wxValidator& validator,
+                      const wxString& name)
+{
+    wxCArrayString chs(choices);
+    return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+                  style, validator, name);

 }
 
 wxChoice::~wxChoice()
 }
 
 wxChoice::~wxChoice()


@@ -154,8 +158,6 @@ wxChoice::~wxChoice()
     // be deleted implicitly by deleting the parent form
     // anyway.
     //  XtDestroyWidget (menuWidget);
     // be deleted implicitly by deleting the parent form
     // anyway.
     //  XtDestroyWidget (menuWidget);

-    if (m_widgetList)
-        delete[] m_widgetList;

 
     if (GetMainWidget())
     {
 
     if (GetMainWidget())
     {


@@ -171,193 +173,166 @@ wxChoice::~wxChoice()
     }
 }
 
     }
 }
 

-void wxChoice::Append(const wxString& item)
+static inline wxChar* MYcopystring(const wxChar* s)
+{
+    wxChar* copy = new wxChar[wxStrlen(s) + 1];
+    return wxStrcpy(copy, s);
+}
+
+// TODO auto-sorting is not supported by the code
+int wxChoice::DoInsertItems(const wxArrayStringsAdapter& items,
+                            unsigned int pos,
+                            void **clientData, wxClientDataType type)

 {
 {

-    Widget w = XtVaCreateManagedWidget (wxStripMenuCodes(item),
-#if USE_GADGETS
-        xmPushButtonGadgetClass, (Widget) m_menuWidget,
+#ifndef XmNpositionIndex
+    wxCHECK_MSG( pos == GetCount(), -1, wxT("insert not implemented"));
+#endif
+
+    const unsigned int numItems = items.GetCount();
+    AllocClientData(numItems);
+    for( unsigned int i = 0; i < numItems; ++i, ++pos )
+    {
+        Widget w = XtVaCreateManagedWidget (GetLabelText(items[i]),
+#if wxUSE_GADGETS
+            xmPushButtonGadgetClass, (Widget) m_menuWidget,

 #else
 #else

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

 #endif
 #endif

-        NULL);
+#ifdef XmNpositionIndex
+            XmNpositionIndex, pos,
+#endif
+            NULL);

 
 

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

 
 

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

 
 

-    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];
+        m_widgetArray.Insert(w, pos);

 
 

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

 
 

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

 
 

-    char mnem = wxFindMnemonic ((char*) (const char*) item);
-    if (mnem != 0)
-        XtVaSetValues (w, XmNmnemonic, mnem, NULL);
+        if (m_stringArray.GetCount() == 0 && m_buttonWidget)
+        {
+            XtVaSetValues ((Widget) m_buttonWidget, XmNmenuHistory, w, NULL);
+            Widget label = XmOptionButtonGadget ((Widget) m_buttonWidget);
+            wxXmString text( items[i] );
+            XtVaSetValues (label,
+                XmNlabelString, text(),
+                NULL);
+        }

 
 

-    XtAddCallback (w, XmNactivateCallback, (XtCallbackProc) wxChoiceCallback, (XtPointer) this);
+        m_stringArray.Insert(items[i], pos);

 
 

-    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);
+        InsertNewItemClientData(pos, clientData, i, type);

     }
     }

-    wxNode *node = m_stringList.Add (item);
-    XtVaSetValues (w, XmNuserData, node->Data (), NULL);
-
-    if (m_noStrings == 0)
-        m_clientList.Append((wxObject*) NULL);
-    else
-        m_clientList.Insert( m_clientList.Item(m_noStrings-1),
-                                 (wxObject*) NULL );
-    m_noStrings ++;
+
+    return pos - 1;

 }
 
 }
 

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

 {
 {

-    wxFAIL_MSG( "Sorry, wxChoice::Delete isn't implemented yet. Maybe you'd like to volunteer? :-)" );
+    Widget w = (Widget)m_widgetArray[n];
+    XtRemoveCallback(w, XmNactivateCallback, (XtCallbackProc)wxChoiceCallback,
+                     (XtPointer)this);

 
 

-    // What should we do -- remove the callback for this button widget,
-    // delete the m_stringList entry, delete the button widget, construct a new widget list
-    // (see Append)
+    m_stringArray.RemoveAt(size_t(n));
+    m_widgetArray.RemoveAt(size_t(n));
+    wxChoiceBase::DoDeleteOneItem(n);

 
 

-    // TODO
-    m_noStrings --;
+    XtDestroyWidget(w);

 }
 
 }
 

-void wxChoice::Clear()
+void wxChoice::DoClear()

 {
 {

-    m_stringList.Clear ();
-    int i;
-    for (i = 0; i < m_noStrings; i++)
-    {
-        XtUnmanageChild ((Widget) m_widgetList[i]);
-        XtDestroyWidget ((Widget) m_widgetList[i]);
-    }
-    if (m_noStrings)
-        delete[] m_widgetList;
-    m_widgetList = (WXWidget*) NULL;
-    if (m_buttonWidget)
-        XtVaSetValues ((Widget) m_buttonWidget, XmNmenuHistory, (Widget) NULL, NULL);
+    m_stringArray.Clear();

 
 

-    if ( HasClientObjectData() )
+    unsigned int i;
+    for (i = 0; i < m_stringArray.GetCount(); i++)

     {
     {

-        // destroy the data (due to Robert's idea of using wxList<wxObject>
-        // and not wxList<wxClientData> we can't just say
-        // m_clientList.DeleteContents(TRUE) - this would crash!
-        wxNode *node = m_clientList.First();
-        while ( node )
-        {
-            delete (wxClientData *)node->Data();
-            node = node->Next();
-        }
+        XtRemoveCallback((Widget) m_widgetArray[i],
+                         XmNactivateCallback, (XtCallbackProc)wxChoiceCallback,
+                         (XtPointer)this);
+        XtUnmanageChild ((Widget) m_widgetArray[i]);
+        XtDestroyWidget ((Widget) m_widgetArray[i]);

     }
     }

-    m_clientList.Clear();

 
 

-    m_noStrings = 0;
+    m_widgetArray.Clear();
+    if (m_buttonWidget)
+        XtVaSetValues ((Widget) m_buttonWidget,
+                       XmNmenuHistory, (Widget) NULL,
+                       NULL);
+
+    wxChoiceBase::DoClear();

 }
 
 int wxChoice::GetSelection() const
 {
     XmString text;
 }
 
 int wxChoice::GetSelection() const
 {
     XmString text;

-    char *s;

     Widget label = XmOptionButtonGadget ((Widget) m_buttonWidget);
     XtVaGetValues (label,
         XmNlabelString, &text,
         NULL);
     Widget label = XmOptionButtonGadget ((Widget) m_buttonWidget);
     XtVaGetValues (label,
         XmNlabelString, &text,
         NULL);

+    wxXmString freeMe(text);
+    wxString s = wxXmStringToString( text );

 
 

-    if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
+    if (!s.empty())

     {
     {

-        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)
-            {
-                XmStringFree(text) ;
-                XtFree (s);
+        for (size_t i=0; i<m_stringArray.GetCount(); i++)
+            if (m_stringArray[i] == s)

                 return i;
                 return i;

-            }
-            else
-                i++;
-        }            // for()
-
-        XmStringFree(text) ;
-        XtFree (s);
-        return -1;
+
+        return wxNOT_FOUND;

     }
     }

-    XmStringFree(text) ;
-    return -1;
+
+    return wxNOT_FOUND;

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

-    m_inSetValue = TRUE;
+    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);
-    }
-    m_inSetValue = FALSE;
-}
+#if 0
+    Dimension selectionWidth, selectionHeight;
+#endif
+    wxXmString text( m_stringArray[n] );
+// MBN: this seems silly, at best, and causes wxChoices to be clipped:
+//      will remove "soon"
+#if 0
+    XtVaGetValues ((Widget) m_widgetArray[n],
+                    XmNwidth, &selectionWidth,
+                    XmNheight, &selectionHeight,
+                    NULL);
+#endif
+    Widget label = XmOptionButtonGadget ((Widget) m_buttonWidget);
+    XtVaSetValues (label,
+        XmNlabelString, text(),
+        NULL);
+#if 0
+    XtVaSetValues ((Widget) m_buttonWidget,
+        XmNwidth, selectionWidth, XmNheight, selectionHeight,
+        XmNmenuHistory, (Widget) m_widgetArray[n], NULL);
+#endif

 
 

-int wxChoice::FindString(const wxString& s) const
-{
-    int i = 0;
-    for (wxNode * node = m_stringList.First (); node; node = node->Next ())
-    {
-        char *s1 = (char *) node->Data ();
-        if (s == s1)
-        {
-            return i;
-        }
-        else
-            i++;
-    }
-    return -1;
+    m_inSetValue = false;

 }
 
 }
 

-wxString wxChoice::GetString(int n) const
+wxString wxChoice::GetString(unsigned int n) const

 {
 {

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

 }
 
 void wxChoice::SetColumns(int n)
 {
     if (n<1) n = 1 ;
 
 }
 
 void wxChoice::SetColumns(int n)
 {
     if (n<1) n = 1 ;
 

-    short numColumns = n ;
+    short numColumns = (short)n ;

     Arg args[3];
 
     XtSetArg(args[0], XmNnumColumns, numColumns);
     Arg args[3];
 
     XtSetArg(args[0], XmNnumColumns, numColumns);


@@ -386,21 +361,28 @@ void wxChoice::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     if (managed)
         XtUnmanageChild ((Widget) m_formWidget);
 
     if (managed)
         XtUnmanageChild ((Widget) m_formWidget);
 

-    int actualWidth = width, actualHeight = height;
+    int actualWidth = width - WIDTH_OVERHEAD_SUBTRACT,
+        actualHeight = height - HEIGHT_OVERHEAD;

 
     if (width > -1)
     {
 
     if (width > -1)
     {

-        int i;
-        for (i = 0; i < m_noStrings; i++)
-            XtVaSetValues ((Widget) m_widgetList[i], XmNwidth, actualWidth, NULL);
+        unsigned int i;
+        for (i = 0; i < m_stringArray.GetCount(); i++)
+            XtVaSetValues ((Widget) m_widgetArray[i],
+                           XmNwidth, actualWidth,
+                           NULL);

         XtVaSetValues ((Widget) m_buttonWidget, XmNwidth, actualWidth,
             NULL);
     }
     if (height > -1)
     {
         XtVaSetValues ((Widget) m_buttonWidget, XmNwidth, actualWidth,
             NULL);
     }
     if (height > -1)
     {

-        int i;
-        for (i = 0; i < m_noStrings; i++)
-            XtVaSetValues ((Widget) m_widgetList[i], XmNheight, actualHeight, NULL);
+#if 0
+        unsigned int i;
+        for (i = 0; i < m_stringArray.GetCount(); i++)
+            XtVaSetValues ((Widget) m_widgetArray[i],
+                           XmNheight, actualHeight,
+                           NULL);
+#endif

         XtVaSetValues ((Widget) m_buttonWidget, XmNheight, actualHeight,
             NULL);
     }
         XtVaSetValues ((Widget) m_buttonWidget, XmNheight, actualHeight,
             NULL);
     }


@@ -412,27 +394,6 @@ void wxChoice::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     wxControl::DoSetSize (x, y, width, height, sizeFlags);
 }
 
     wxControl::DoSetSize (x, y, width, height, sizeFlags);
 }
 

-wxString wxChoice::GetStringSelection () const
-{
-    int sel = GetSelection ();
-    if (sel > -1)
-        return wxString(this->GetString (sel));
-    else
-        return wxEmptyString;
-}
-
-bool wxChoice::SetStringSelection (const wxString& s)
-{
-    int sel = FindString (s);
-    if (sel > -1)
-    {
-        SetSelection (sel);
-        return TRUE;
-    }
-    else
-        return FALSE;
-}
-

 void wxChoice::Command(wxCommandEvent & event)
 {
     SetSelection (event.GetInt());
 void wxChoice::Command(wxCommandEvent & event)
 {
     SetSelection (event.GetInt());


@@ -447,14 +408,17 @@ void wxChoiceCallback (Widget w, XtPointer clientData, XtPointer WXUNUSED(ptr))
         if (item->InSetValue())
             return;
 
         if (item->InSetValue())
             return;
 

-        char *s = NULL;
-        XtVaGetValues (w, XmNuserData, &s, NULL);
-        if (s)
+        int n = item->GetWidgets().Index(w);
+        if (n != wxNOT_FOUND)

         {
         {

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

             event.SetEventObject(item);
             event.SetEventObject(item);

-            event.m_commandInt = item->FindString (s);
-            //            event.m_commandString = s;
+            event.SetInt(n);
+            event.SetString( item->GetStrings().Item(n) );
+            if ( item->HasClientObjectData() )
+                event.SetClientObject( item->GetClientObject(n) );
+            else if ( item->HasClientUntypedData() )
+                event.SetClientData( item->GetClientData(n) );

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


@@ -465,132 +429,87 @@ 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?
     // 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())
+    if (m_mainWidget && m_font.IsOk())

     {
     {

+        Display* dpy = XtDisplay((Widget) m_mainWidget);

         int width, height, width1, height1;
         GetSize(& width, & height);
 
         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);
+        WXString fontTag = wxFont::GetFontTag();
+
+        XtVaSetValues ((Widget) m_formWidget,
+                       fontTag, m_font.GetFontTypeC(dpy),
+                       NULL);
+        XtVaSetValues ((Widget) m_buttonWidget,
+                       fontTag, m_font.GetFontTypeC(dpy),
+                       NULL);
+
+        for( unsigned int i = 0; i < m_stringArray.GetCount(); ++i )
+            XtVaSetValues( (Widget)m_widgetArray[i],
+                           fontTag, m_font.GetFontTypeC(dpy),
+                           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))
         {
         GetSize(& width1, & height1);
         if (keepOriginalSize && (width != width1 || height != height1))
         {

-            SetSize(-1, -1, width, height);
+            SetSize(wxDefaultCoord, wxDefaultCoord, width, height);

         }
     }
 }
 
 void wxChoice::ChangeBackgroundColour()
 {
         }
     }
 }
 
 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);
+    wxDoChangeBackgroundColour(m_formWidget, m_backgroundColour);
+    wxDoChangeBackgroundColour(m_buttonWidget, m_backgroundColour);
+    wxDoChangeBackgroundColour(m_menuWidget, m_backgroundColour);
+    unsigned int i;
+    for (i = 0; i < m_stringArray.GetCount(); i++)
+        wxDoChangeBackgroundColour(m_widgetArray[i], m_backgroundColour);

 }
 
 void wxChoice::ChangeForegroundColour()
 {
 }
 
 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);
+    wxDoChangeForegroundColour(m_formWidget, m_foregroundColour);
+    wxDoChangeForegroundColour(m_buttonWidget, m_foregroundColour);
+    wxDoChangeForegroundColour(m_menuWidget, m_foregroundColour);
+    unsigned int i;
+    for (i = 0; i < m_stringArray.GetCount(); i++)
+        wxDoChangeForegroundColour(m_widgetArray[i], m_foregroundColour);

 }
 
 }
 

-
-// These implement functions needed by wxControlWithItems.
-// Unfortunately, they're not all implemented yet.
-
-int wxChoice::GetCount() const
+unsigned int wxChoice::GetCount() const

 {
 {

-    return Number();
+    return m_stringArray.GetCount();

 }
 
 }
 

-int wxChoice::DoAppend(const wxString& item)
+void wxChoice::SetString(unsigned int WXUNUSED(n), const wxString& WXUNUSED(s))

 {
 {

-    Append(item);
-    return GetCount() - 1;
+    wxFAIL_MSG( wxT("wxChoice::SetString not implemented") );

 }
 
 }
 

-// Just appends, doesn't yet insert
-void wxChoice::DoInsertItems(const wxArrayString& items, int WXUNUSED(pos))
+wxSize wxChoice::GetItemsSize() const

 {
 {

-    size_t nItems = items.GetCount();
+    int x, y, mx = 0, my = 0;

 
 

-    for ( size_t n = 0; n < nItems; n++ )
-    {
-        Append( items[n]);
-    }
-}
+    // get my
+    GetTextExtent( "|", &x, &my );

 
 

-void wxChoice::DoSetItems(const wxArrayString& items, void **WXUNUSED(clientData))
-{
-    Clear();
-    size_t nItems = items.GetCount();
-
-    for ( size_t n = 0; n < nItems; n++ )
+    for (size_t i=0; i<m_stringArray.GetCount(); i++)

     {
     {

-        Append(items[n]);
+        GetTextExtent( m_stringArray[i], &x, &y );
+        mx = wxMax( mx, x );
+        my = wxMax( my, y );

     }
     }

-}
-
-void wxChoice::DoSetFirstItem(int WXUNUSED(n))
-{
-    wxFAIL_MSG( wxT("wxChoice::DoSetFirstItem not implemented") );
-}
-
-void wxChoice::DoSetItemClientData(int n, void* clientData)
-{
-    wxNode *node = m_clientList.Nth( n );
-    wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientData") );

 
 

-    node->SetData( (wxObject*) clientData );
+    return wxSize( mx, my );

 }
 
 }
 

-void* wxChoice::DoGetItemClientData(int n) const
+wxSize wxChoice::DoGetBestSize() const

 {
 {

-    wxNode *node = m_clientList.Nth( n );
-    wxCHECK_MSG( node, NULL, wxT("invalid index in wxChoice::DoGetItemClientData") );
-
-    return node->Data();
+    wxSize items = GetItemsSize();
+    // FIXME arbitrary constants
+    return wxSize( ( items.x ? items.x + WIDTH_OVERHEAD : 120 ),
+                     items.y + HEIGHT_OVERHEAD );

 }
 
 }
 

-void wxChoice::DoSetItemClientObject(int n, wxClientData* clientData)
-{
-    wxNode *node = m_clientList.Nth( n );
-    wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientObject") );
-
-    wxClientData *cd = (wxClientData*) node->Data();
-    delete cd;
-
-    node->SetData( (wxObject*) clientData );
-}
-
-wxClientData* wxChoice::DoGetItemClientObject(int n) const
-{
-    wxNode *node = m_clientList.Nth( n );
-    wxCHECK_MSG( node, (wxClientData *)NULL,
-                 wxT("invalid index in wxChoice::DoGetItemClientObject") );
-
-    return (wxClientData*) node->Data();
-}
-
-void wxChoice::Select(int n)
-{
-    SetSelection(n);
-}
-
-void wxChoice::SetString(int WXUNUSED(n), const wxString& WXUNUSED(s))
-{
-    wxFAIL_MSG( wxT("wxChoice::SetString not implemented") );
-}
+#endif // wxUSE_CHOICE