Don't show focus rectangle if wxNO_BORDER specified

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

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index 1647c35bc1bf3811010431f3194f00a204f79170..6a24190b8e82e5be67efabe7cdfae90b9b0e4ec9 100644 (file)
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -9,34 +9,56 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "choice.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #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
+
+#include "wx/defs.h"
+

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

+#include "wx/arrstr.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
+#define WIDTH_OVERHEAD 48
+#define WIDTH_OVERHEAD_SUBTRACT 40
+#define HEIGHT_OVERHEAD 15
+

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

-#endif

 
 void wxChoiceCallback (Widget w, XtPointer clientData,
                        XtPointer ptr);
 
 wxChoice::wxChoice()
 
 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;
 }
 


@@ -48,25 +70,8 @@ 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;

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


@@ -76,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);


@@ -83,9 +90,9 @@ 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,
+                                                    "choiceMenu", NULL, 0);

 
 

-    //    int i;

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


@@ -99,15 +106,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,
+                                                    "choiceButton",
+                                                    args, argcnt);

 
     m_mainWidget = m_buttonWidget;
 
 
     m_mainWidget = m_buttonWidget;
 


@@ -127,17 +132,34 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
 #endif
 #endif
 
 #endif
 #endif
 

+    wxSize bestSize = GetBestSize();
+    if( size.x > 0 ) bestSize.x = size.x;
+    if( size.y > 0 ) bestSize.y = size.y;
+

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

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

     ChangeBackgroundColour();
 
     ChangeBackgroundColour();
 

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

     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()
 {
     // For some reason destroying the menuWidget
 wxChoice::~wxChoice()
 {
     // For some reason destroying the menuWidget


@@ -145,8 +167,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())
     {


@@ -160,9 +180,11 @@ wxChoice::~wxChoice()
         m_mainWidget = (WXWidget) 0;
         m_buttonWidget = (WXWidget) 0;
     }
         m_mainWidget = (WXWidget) 0;
         m_buttonWidget = (WXWidget) 0;
     }

+    if ( HasClientObjectData() )
+        m_clientDataDict.DestroyData();

 }
 
 }
 

-void wxChoice::Append(const wxString& item)
+int wxChoice::DoAppend(const wxString& item)

 {
     Widget w = XtVaCreateManagedWidget (wxStripMenuCodes(item),
 #if USE_GADGETS
 {
     Widget w = XtVaCreateManagedWidget (wxStripMenuCodes(item),
 #if USE_GADGETS


@@ -172,106 +194,107 @@ void wxChoice::Append(const wxString& item)
 #endif
         NULL);
 
 #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.Ok() )
+        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.Add(w);

 
 

-        new_widgetList[m_noStrings] = (WXWidget) w;
+    char mnem = wxFindMnemonic (item);
+    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_noStrings == 0 && m_buttonWidget)
+    {
+        XtVaSetValues ((Widget) m_buttonWidget, XmNmenuHistory, w, NULL);
+        Widget label = XmOptionButtonGadget ((Widget) m_buttonWidget);
+        wxXmString text( item );
+        XtVaSetValues (label,
+            XmNlabelString, text(),
+            NULL);
+    }
+    m_stringList.Add(item);
+    m_noStrings ++;

 
 

-        XtAddCallback (w, XmNactivateCallback, (XtCallbackProc) wxChoiceCallback, (XtPointer) this);
+    return GetCount() - 1;
+}

 
 

-        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);
+int wxChoice::DoInsert(const wxString& item, int pos)
+{
+    wxCHECK_MSG(FALSE, -1, wxT("insert not implemented"));

 
 

-        m_noStrings ++;
+//    wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
+//    if (pos == GetCount()) return DoAppend(item);

 }
 
 }
 

-void wxChoice::Delete(int WXUNUSED(n))
+void wxChoice::Delete(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);
+    m_stringList.Erase(m_stringList.Item(n));
+    m_widgetArray.RemoveAt(size_t(n));
+    m_clientDataDict.Delete(n, HasClientObjectData());

 
 

-    // 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)
-
-    // TODO
+    XtDestroyWidget(w);

     m_noStrings --;
 }
 
 void wxChoice::Clear()
 {
     m_stringList.Clear ();
     m_noStrings --;
 }
 
 void wxChoice::Clear()
 {
     m_stringList.Clear ();

-    int i;
+    size_t 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);
+
+    if ( HasClientObjectData() )
+        m_clientDataDict.DestroyData();
+

     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.IsEmpty())

     {
         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;
 }
 
     return -1;
 }
 


@@ -279,22 +302,30 @@ 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);
+            XmNmenuHistory, (Widget) m_widgetArray[n], NULL);
+#endif

     }
     m_inSetValue = FALSE;
 }
     }
     m_inSetValue = FALSE;
 }


@@ -302,24 +333,23 @@ void wxChoice::SetSelection(int n)
 int wxChoice::FindString(const wxString& s) const
 {
     int i = 0;
 int wxChoice::FindString(const wxString& s) const
 {
     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 (s == s1)
-        {
+        if (s == node->GetData())

             return i;
             return i;

-        }
-        else
-            i++;
+
+        i++;

     }
     }

+

     return -1;
 }
 
 wxString wxChoice::GetString(int n) const
 {
     return -1;
 }
 
 wxString wxChoice::GetString(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;
 }


@@ -357,21 +387,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;
+        size_t 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
+        size_t 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);
     }


@@ -383,27 +420,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());


@@ -418,14 +434,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.m_commandInt = n;
+            event.m_commandString = 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);
         }
     }


@@ -441,15 +460,18 @@ void wxChoice::ChangeFont(bool keepOriginalSize)
         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);
+        WXFontType fontType =
+            m_font.GetFontType(XtDisplay((Widget) m_mainWidget));
+        WXString fontTag = wxFont::GetFontTag();

 
 

-        /* 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);
-        */
+        XtVaSetValues ((Widget) m_formWidget, fontTag, fontType, NULL);
+        XtVaSetValues ((Widget) m_buttonWidget, fontTag, fontType, NULL);
+
+        for( size_t i = 0; i < m_noStrings; ++i )
+            XtVaSetValues( (Widget)m_widgetArray[i],
+                           fontTag, fontType,
+                           NULL );
+        

         GetSize(& width1, & height1);
         if (keepOriginalSize && (width != width1 || height != height1))
         {
         GetSize(& width1, & height1);
         if (keepOriginalSize && (width != width1 || height != height1))
         {


@@ -460,94 +482,78 @@ void wxChoice::ChangeFont(bool keepOriginalSize)
 
 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);
+    size_t 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);
+    size_t 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
 {
 int wxChoice::GetCount() const
 {

-    return Number();
+    return m_noStrings;

 }
 
 }
 

-int wxChoice::DoAppend(const wxString& item)
+void wxChoice::DoSetItemClientData(int n, void* clientData)

 {
 {

-    Append(item);
-    return GetCount() - 1;
+    m_clientDataDict.Set(n, (wxClientData*)clientData, FALSE);

 }
 
 }
 

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

 {
 {

-    size_t nItems = items.GetCount();
-
-    for ( size_t n = 0; n < nItems; n++ )
-    {
-        Append( items[n]);
-    }
+    return (void*)m_clientDataDict.Get(n);

 }
 
 }
 

-void wxChoice::DoSetItems(const wxArrayString& items, void **WXUNUSED(clientData))
+void wxChoice::DoSetItemClientObject(int n, wxClientData* clientData)

 {
 {

-    Clear();
-    size_t nItems = items.GetCount();
-
-    for ( size_t n = 0; n < nItems; n++ )
-    {
-        Append(items[n]);
-    }
+    // don't delete, wxItemContainer does that for us
+    m_clientDataDict.Set(n, clientData, FALSE);

 }
 
 }
 

-void wxChoice::DoSetFirstItem(int WXUNUSED(n))
+wxClientData* wxChoice::DoGetItemClientObject(int n) const

 {
 {

-    wxFAIL_MSG( wxT("wxChoice::DoSetFirstItem not implemented") );
+    return m_clientDataDict.Get(n);

 }
 
 }
 

-void wxChoice::DoSetItemClientData(int WXUNUSED(n), void* WXUNUSED(clientData))
+void wxChoice::SetString(int WXUNUSED(n), const wxString& WXUNUSED(s))

 {
 {

-    wxFAIL_MSG( wxT("wxChoice::DoSetItemClientData not implemented") );
+    wxFAIL_MSG( wxT("wxChoice::SetString not implemented") );

 }
 
 }
 

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

 {
 {

-    wxFAIL_MSG( wxT("wxChoice::DoGetItemClientData not implemented") );
-    return (void*) NULL;
-}
+    int x, y, mx = 0, my = 0;

 
 

-void wxChoice::DoSetItemClientObject(int WXUNUSED(n), wxClientData* WXUNUSED(clientData))
-{
-    wxFAIL_MSG( wxT("wxChoice::DoSetItemClientObject not implemented") );
-}
+    // get my
+    GetTextExtent( "|", &x, &my );

 
 

-wxClientData* wxChoice::DoGetItemClientObject(int WXUNUSED(n)) const
-{
-    wxFAIL_MSG( wxT("wxChoice::DoGetItemClientObject not implemented") );
-    return (wxClientData*) NULL;
-}
+    wxStringList::compatibility_iterator curr = m_stringList.GetFirst();
+    while( curr )
+    {
+        GetTextExtent( curr->GetData(), &x, &y );
+        mx = wxMax( mx, x );
+        my = wxMax( my, y );
+        curr = curr->GetNext();
+    }

 
 

-void wxChoice::Select(int n)
-{
-    SetSelection(n);
+    return wxSize( mx, my );

 }
 
 }
 

-void wxChoice::SetString(int WXUNUSED(n), const wxString& WXUNUSED(s))
+wxSize wxChoice::DoGetBestSize() const

 {
 {

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

 }
 }