use symbolic name for the shell menu bar too; include resources.h in wince.rc directl...

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

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index 45a24308472a5f420b16711e0bb68a7c44c36e2a..bb1181f4fd422802fe5cd200d79e5169ba7adf64 100644 (file)
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -1,21 +1,30 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_CHOICE
+
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#define XtParent XTPARENT

 #endif
 
 #endif
 

-// 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


@@ -30,17 +39,25 @@
 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 

+#define WIDTH_OVERHEAD 48
+#define WIDTH_OVERHEAD_SUBTRACT 40
+#define HEIGHT_OVERHEAD 15
+

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

+{
+    Init();
+}
+
+void wxChoice::Init()

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

-    m_widgetList = (WXWidget*) 0;

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


@@ -52,25 +69,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();
 


@@ -80,6 +81,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);


@@ -87,9 +90,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;


@@ -103,15 +107,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;
 


@@ -131,15 +133,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()


@@ -149,8 +166,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())
     {


@@ -166,164 +181,172 @@ wxChoice::~wxChoice()
     }
 }
 
     }
 }
 

-void wxChoice::Append(const wxString& item)
+static inline wxChar* MYcopystring(const wxChar* s)

 {
 {

-    Widget w = XtVaCreateManagedWidget (wxStripMenuCodes(item),
-#if USE_GADGETS
-        xmPushButtonGadgetClass, (Widget) m_menuWidget,
-#else
-        xmPushButtonWidgetClass, (Widget) m_menuWidget,
-#endif
-        NULL);
+    wxChar* copy = new wxChar[wxStrlen(s) + 1];
+    return wxStrcpy(copy, s);
+}

 
 

-    DoChangeBackgroundColour((WXWidget) w, m_backgroundColour);
+// TODO auto-sorting is not supported by the code
+int wxChoice::DoInsertItems(const wxArrayStringsAdapter& items,
+                            unsigned int pos,
+                            void **clientData, wxClientDataType type)
+{
+#ifndef XmNpositionIndex
+    wxCHECK_MSG( pos == GetCount(), -1, wxT("insert not implemented"));
+#endif

 
 

-    if (m_font.Ok())
-        XtVaSetValues (w,
-        XmNfontList, (XmFontList) m_font.GetFontList(1.0, XtDisplay((Widget) m_formWidget)),
-        NULL);
+    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
+            xmPushButtonWidgetClass, (Widget) m_menuWidget,
+#endif
+#ifdef XmNpositionIndex
+            XmNpositionIndex, pos,
+#endif
+            NULL);

 
 

-    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];
+        wxDoChangeBackgroundColour((WXWidget) w, m_backgroundColour);

 
 

-        new_widgetList[m_noStrings] = (WXWidget) w;
+        if( m_font.Ok() )
+            wxDoChangeFont( w, m_font );

 
 

-        if (m_widgetList)
-            delete[] m_widgetList;
-        m_widgetList = new_widgetList;
+        m_widgetArray.Insert(w, pos);

 
 

-        char mnem = wxFindMnemonic ((char*) (const char*) item);
+        char mnem = wxFindMnemonic (items[i]);

         if (mnem != 0)
             XtVaSetValues (w, XmNmnemonic, mnem, NULL);
 
         if (mnem != 0)
             XtVaSetValues (w, XmNmnemonic, mnem, NULL);
 

-        XtAddCallback (w, XmNactivateCallback, (XtCallbackProc) wxChoiceCallback, (XtPointer) this);
+        XtAddCallback (w, XmNactivateCallback,
+                       (XtCallbackProc) wxChoiceCallback,
+                       (XtPointer) this);

 
         if (m_noStrings == 0 && m_buttonWidget)
         {
             XtVaSetValues ((Widget) m_buttonWidget, XmNmenuHistory, w, NULL);
             Widget label = XmOptionButtonGadget ((Widget) m_buttonWidget);
 
         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);
+            wxXmString text( items[i] );

             XtVaSetValues (label,
             XtVaSetValues (label,

-                XmNlabelString, text,
+                XmNlabelString, text(),

                 NULL);
                 NULL);

-            XmStringFree (text);

         }
         }

-        wxNode *node = m_stringList.Add (item);
-        XtVaSetValues (w, XmNuserData, node->Data (), NULL);
-
+        // need to ditch wxStringList for wxArrayString
+        m_stringList.Insert(pos, MYcopystring(items[i]));

         m_noStrings ++;
         m_noStrings ++;

+
+        InsertNewItemClientData(pos, clientData, i, type);
+    }
+
+    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? :-)" );
-
-    // 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)
+    Widget w = (Widget)m_widgetArray[n];
+    XtRemoveCallback(w, XmNactivateCallback, (XtCallbackProc)wxChoiceCallback,
+                     (XtPointer)this);
+    m_stringList.Erase(m_stringList.Item(n));
+    m_widgetArray.RemoveAt(size_t(n));
+    wxChoiceBase::DoDeleteOneItem(n);

 
 

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

 }
 
 }
 

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

 {
     m_stringList.Clear ();
 {
     m_stringList.Clear ();

-    int i;
+    unsigned int i;

     for (i = 0; i < m_noStrings; i++)
     {
     for (i = 0; i < m_noStrings; i++)
     {

-        XtUnmanageChild ((Widget) m_widgetList[i]);
-        XtDestroyWidget ((Widget) m_widgetList[i]);
+        XtRemoveCallback((Widget) m_widgetArray[i],
+                         XmNactivateCallback, (XtCallbackProc)wxChoiceCallback,
+                         (XtPointer)this);
+        XtUnmanageChild ((Widget) m_widgetArray[i]);
+        XtDestroyWidget ((Widget) m_widgetArray[i]);

     }
     }

-    if (m_noStrings)
-        delete[] m_widgetList;
-    m_widgetList = (WXWidget*) NULL;
+    m_widgetArray.Clear();

     if (m_buttonWidget)
     if (m_buttonWidget)

-        XtVaSetValues ((Widget) m_buttonWidget, XmNmenuHistory, (Widget) NULL, NULL);
+        XtVaSetValues ((Widget) m_buttonWidget,
+                       XmNmenuHistory, (Widget) NULL,
+                       NULL);
+
+    wxChoiceBase::DoClear();
+

     m_noStrings = 0;
 }
 
 int wxChoice::GetSelection() const
 {
     XmString text;
     m_noStrings = 0;
 }
 
 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;
     {
         int i = 0;

-        for (wxNode * node = m_stringList.First (); node; node = node->Next ())
+        for (wxStringList::compatibility_iterator node = m_stringList.GetFirst ();
+             node; node = node->GetNext ())

         {
         {

-            char *s1 = (char *) node->Data ();
-            if (s1 == s || strcmp (s1, s) == 0)
+            if (wxStrcmp(node->GetData(), s.c_str()) == 0)

             {
             {

-                XmStringFree(text) ;
-                XtFree (s);

                 return i;
             }
             else
                 i++;
         }            // for()
 
                 return i;
             }
             else
                 i++;
         }            // for()
 

-        XmStringFree(text) ;
-        XtFree (s);

         return -1;
     }
         return -1;
     }

-    XmStringFree(text) ;

     return -1;
 }
 
 void wxChoice::SetSelection(int n)
 {
     return -1;
 }
 
 void wxChoice::SetSelection(int n)
 {

-    m_inSetValue = TRUE;
+    m_inSetValue = true;

 
 

-    wxNode *node = m_stringList.Nth (n);
+    wxStringList::compatibility_iterator node = m_stringList.Item(n);

     if (node)
     {
     if (node)
     {

+#if 0

         Dimension selectionWidth, selectionHeight;
         Dimension selectionWidth, selectionHeight;

-
-        char *s = (char *) node->Data ();
-        XmString text = XmStringCreateSimple (s);
-        XtVaGetValues ((Widget) m_widgetList[n], XmNwidth, &selectionWidth, XmNheight, &selectionHeight, NULL);
+#endif
+        wxXmString text( node->GetData() );
+// 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,
         Widget label = XmOptionButtonGadget ((Widget) m_buttonWidget);
         XtVaSetValues (label,

-            XmNlabelString, text,
+            XmNlabelString, text(),

             NULL);
             NULL);

-        XmStringFree (text);
+#if 0

         XtVaSetValues ((Widget) m_buttonWidget,
             XmNwidth, selectionWidth, XmNheight, selectionHeight,
         XtVaSetValues ((Widget) m_buttonWidget,
             XmNwidth, selectionWidth, XmNheight, selectionHeight,

-            XmNmenuHistory, (Widget) m_widgetList[n], NULL);
-    }
-    m_inSetValue = FALSE;
-}
-
-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++;
+            XmNmenuHistory, (Widget) m_widgetArray[n], NULL);
+#endif

     }
     }

-    return -1;
+    m_inSetValue = false;

 }
 
 }
 

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

 {
 {

-    wxNode *node = m_stringList.Nth (n);
+    wxStringList::compatibility_iterator node = m_stringList.Item(n);

     if (node)
     if (node)

-        return wxString((char *) node->Data ());
+        return node->GetData();

     else
         return wxEmptyString;
 }
     else
         return wxEmptyString;
 }


@@ -332,7 +355,7 @@ void wxChoice::SetColumns(int n)
 {
     if (n<1) n = 1 ;
 
 {
     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);


@@ -361,21 +384,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;
+        unsigned int i;

         for (i = 0; i < m_noStrings; i++)
         for (i = 0; i < m_noStrings; i++)

-            XtVaSetValues ((Widget) m_widgetList[i], XmNwidth, actualWidth, NULL);
+            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;
+#if 0
+        unsigned int i;

         for (i = 0; i < m_noStrings; i++)
         for (i = 0; i < m_noStrings; i++)

-            XtVaSetValues ((Widget) m_widgetList[i], XmNheight, actualHeight, NULL);
+            XtVaSetValues ((Widget) m_widgetArray[i],
+                           XmNheight, actualHeight,
+                           NULL);
+#endif

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


@@ -387,27 +417,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());


@@ -422,14 +431,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_COMMAND_CHOICE_SELECTED, 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)->GetData() );
+            if ( item->HasClientObjectData() )
+                event.SetClientObject( item->GetClientObject(n) );
+            else if ( item->HasClientUntypedData() )
+                event.SetClientData( item->GetClientData(n) );

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


@@ -440,118 +452,89 @@ 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.Ok())

     {
     {

+        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_noStrings; ++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;
+    wxDoChangeBackgroundColour(m_formWidget, m_backgroundColour);
+    wxDoChangeBackgroundColour(m_buttonWidget, m_backgroundColour);
+    wxDoChangeBackgroundColour(m_menuWidget, m_backgroundColour);
+    unsigned int i;

     for (i = 0; i < m_noStrings; i++)
     for (i = 0; i < m_noStrings; i++)

-        DoChangeBackgroundColour(m_widgetList[i], m_backgroundColour);
+        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;
+    wxDoChangeForegroundColour(m_formWidget, m_foregroundColour);
+    wxDoChangeForegroundColour(m_buttonWidget, m_foregroundColour);
+    wxDoChangeForegroundColour(m_menuWidget, m_foregroundColour);
+    unsigned int i;

     for (i = 0; i < m_noStrings; i++)
     for (i = 0; i < m_noStrings; i++)

-        DoChangeForegroundColour(m_widgetList[i], m_foregroundColour);
+        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_noStrings;

 }
 
 }
 

-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++ )
+    wxStringList::compatibility_iterator curr = m_stringList.GetFirst();
+    while( curr )

     {
     {

-        Append(items[n]);
+        GetTextExtent( curr->GetData(), &x, &y );
+        mx = wxMax( mx, x );
+        my = wxMax( my, y );
+        curr = curr->GetNext();

     }
     }

-}
-
-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") );
+    return wxSize( mx, my );

 }
 
 }
 

-wxClientData* wxChoice::DoGetItemClientObject(int WXUNUSED(n)) const
+wxSize wxChoice::DoGetBestSize() const

 {
 {

-    wxFAIL_MSG( wxT("wxChoice::DoGetItemClientObject not implemented") );
-    return (wxClientData*) NULL;
+    wxSize items = GetItemsSize();
+    // FIXME arbitrary constants
+    return wxSize( ( items.x ? items.x + WIDTH_OVERHEAD : 120 ),
+                     items.y + HEIGHT_OVERHEAD );

 }
 
 }
 

-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