X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c33c81c30f732efcf82d682f82e94aea81878641..597a3d06bf4ec87c5298bbd01d37ba5306ea33f4:/src/motif/choice.cpp?ds=sidebyside

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index e0afa97dd9..a3e57838b9 100644
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -43,10 +43,16 @@ void wxChoiceCallback (Widget w, XtPointer clientData,
 
 wxChoice::wxChoice()
 {
+    Init();
+}
+
+void wxChoice::Init()
+{
+    InitBase();
+
     m_noStrings = 0;
     m_buttonWidget = (WXWidget) 0;
     m_menuWidget = (WXWidget) 0;
-    m_widgetList = (WXWidget*) 0;
     m_formWidget = (WXWidget) 0;
 }
 
@@ -58,25 +64,8 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
                       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();
 
@@ -93,9 +82,9 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
     /*
     * 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;
@@ -109,15 +98,13 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
     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;
 
@@ -137,11 +124,16 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
 #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);
 
-    AttachWidget (parent, m_buttonWidget, m_formWidget, pos.x, pos.y, size.x, size.y);
+    AttachWidget (parent, m_buttonWidget, m_formWidget,
+                  pos.x, pos.y, bestSize.x, bestSize.y);
 
     ChangeBackgroundColour();
 
@@ -155,8 +147,6 @@ wxChoice::~wxChoice()
     // be deleted implicitly by deleting the parent form
     // anyway.
     //  XtDestroyWidget (menuWidget);
-    if (m_widgetList)
-        delete[] m_widgetList;
 
     if (GetMainWidget())
     {
@@ -170,6 +160,8 @@ wxChoice::~wxChoice()
         m_mainWidget = (WXWidget) 0;
         m_buttonWidget = (WXWidget) 0;
     }
+    if ( HasClientObjectData() )
+        m_clientDataDict.DestroyData();
 }
 
 int wxChoice::DoAppend(const wxString& item)
@@ -189,87 +181,64 @@ int wxChoice::DoAppend(const wxString& item)
         XmNfontList, (XmFontList) m_font.GetFontList(1.0, XtDisplay((Widget) m_formWidget)),
         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];
-
-    new_widgetList[m_noStrings] = (WXWidget) w;
-
-    if (m_widgetList)
-        delete[] m_widgetList;
-    m_widgetList = new_widgetList;
+    m_widgetArray.Add(w);
 
     char mnem = wxFindMnemonic ((char*) (const char*) item);
     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);
-        XmString text = XmStringCreateSimple ((char*) (const char*) item);
+        wxXmString text( item );
         XtVaSetValues (label,
-            XmNlabelString, text,
+            XmNlabelString, text(),
             NULL);
-        XmStringFree (text);
     }
-    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_stringList.Add(item);
     m_noStrings ++;
 
-    return Number() - 1;
+    return GetCount() - 1;
 }
 
-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.DeleteNode(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 ();
-    int i;
+    size_t 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)
-        XtVaSetValues ((Widget) m_buttonWidget, XmNmenuHistory, (Widget) NULL, NULL);
+        XtVaSetValues ((Widget) m_buttonWidget,
+                       XmNmenuHistory, (Widget) NULL,
+                       NULL);
 
     if ( HasClientObjectData() )
-    {
-        // 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();
-        }
-    }
-    m_clientList.Clear();
+        m_clientDataDict.DestroyData();
 
     m_noStrings = 0;
 }
@@ -286,10 +255,10 @@ int wxChoice::GetSelection() const
     if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
     {
         int i = 0;
-        for (wxNode * node = m_stringList.First (); node; node = node->Next ())
+        for (wxStringListNode* node = m_stringList.GetFirst ();
+             node; node = node->GetNext ())
         {
-            char *s1 = (char *) node->Data ();
-            if (s1 == s || strcmp (s1, s) == 0)
+            if (strcmp(node->GetData(), s) == 0)
             {
                 XmStringFree(text) ;
                 XtFree (s);
@@ -311,22 +280,30 @@ void wxChoice::SetSelection(int n)
 {
     m_inSetValue = TRUE;
 
-    wxNode *node = m_stringList.Nth (n);
+    wxStringListNode *node = m_stringList.Item(n);
     if (node)
     {
+#if 0
         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,
-            XmNlabelString, text,
+            XmNlabelString, text(),
             NULL);
-        XmStringFree (text);
+#if 0
         XtVaSetValues ((Widget) m_buttonWidget,
             XmNwidth, selectionWidth, XmNheight, selectionHeight,
-            XmNmenuHistory, (Widget) m_widgetList[n], NULL);
+            XmNmenuHistory, (Widget) m_widgetArray[n], NULL);
+#endif
     }
     m_inSetValue = FALSE;
 }
@@ -334,24 +311,23 @@ void wxChoice::SetSelection(int n)
 int wxChoice::FindString(const wxString& s) const
 {
     int i = 0;
-    for (wxNode * node = m_stringList.First (); node; node = node->Next ())
+    for (wxStringListNode* node = m_stringList.GetFirst();
+         node; node = node->GetNext ())
     {
-        char *s1 = (char *) node->Data ();
-        if (s == s1)
-        {
+        if (s == node->GetData())
             return i;
-        }
-        else
-            i++;
+
+        i++;
     }
+
     return -1;
 }
 
 wxString wxChoice::GetString(int n) const
 {
-    wxNode *node = m_stringList.Nth (n);
+    wxStringListNode *node = m_stringList.Item(n);
     if (node)
-        return wxString((char *) node->Data ());
+        return node->GetData();
     else
         return wxEmptyString;
 }
@@ -393,17 +369,21 @@ void wxChoice::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 
     if (width > -1)
     {
-        int i;
+        size_t 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)
     {
-        int i;
+        size_t i;
         for (i = 0; i < m_noStrings; i++)
-            XtVaSetValues ((Widget) m_widgetList[i], XmNheight, actualHeight, NULL);
+            XtVaSetValues ((Widget) m_widgetArray[i],
+                           XmNheight, actualHeight,
+                           NULL);
         XtVaSetValues ((Widget) m_buttonWidget, XmNheight, actualHeight,
             NULL);
     }
@@ -415,27 +395,6 @@ void wxChoice::DoSetSize(int x, int y, int width, int height, int 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());
@@ -450,14 +409,17 @@ void wxChoiceCallback (Widget w, XtPointer clientData, XtPointer WXUNUSED(ptr))
         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.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);
         }
     }
@@ -474,14 +436,14 @@ void wxChoice::ChangeFont(bool keepOriginalSize)
         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_formWidget, 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);
-        */
+        for( size_t i = 0; i < m_noStrings; ++i )
+            XtVaSetValues( (Widget)m_widgetArray[i],
+                           XmNfontList, fontList,
+                           NULL );
+        
         GetSize(& width1, & height1);
         if (keepOriginalSize && (width != width1 || height != height1))
         {
@@ -495,9 +457,9 @@ void wxChoice::ChangeBackgroundColour()
     DoChangeBackgroundColour(m_formWidget, m_backgroundColour);
     DoChangeBackgroundColour(m_buttonWidget, m_backgroundColour);
     DoChangeBackgroundColour(m_menuWidget, m_backgroundColour);
-    int i;
+    size_t i;
     for (i = 0; i < m_noStrings; i++)
-        DoChangeBackgroundColour(m_widgetList[i], m_backgroundColour);
+        DoChangeBackgroundColour(m_widgetArray[i], m_backgroundColour);
 }
 
 void wxChoice::ChangeForegroundColour()
@@ -505,97 +467,65 @@ void wxChoice::ChangeForegroundColour()
     DoChangeForegroundColour(m_formWidget, m_foregroundColour);
     DoChangeForegroundColour(m_buttonWidget, m_foregroundColour);
     DoChangeForegroundColour(m_menuWidget, m_foregroundColour);
-    int i;
+    size_t i;
     for (i = 0; i < m_noStrings; i++)
-        DoChangeForegroundColour(m_widgetList[i], m_foregroundColour);
+        DoChangeForegroundColour(m_widgetArray[i], m_foregroundColour);
 }
 
-
-// These implement functions needed by wxControlWithItems.
-// Unfortunately, they're not all implemented yet.
-
 int wxChoice::GetCount() const
 {
-    return Number();
+    return m_noStrings;
 }
 
-/*
-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))
+void wxChoice::DoSetItemClientData(int n, void* clientData)
 {
-    size_t nItems = items.GetCount();
-
-    for ( size_t n = 0; n < nItems; n++ )
-    {
-        Append( items[n]);
-    }
+    m_clientDataDict.Set(n, (wxClientData*)clientData, FALSE);
 }
 
-void wxChoice::DoSetItems(const wxArrayString& items, void **WXUNUSED(clientData))
+void* wxChoice::DoGetItemClientData(int n) const
 {
-    Clear();
-    size_t nItems = items.GetCount();
-
-    for ( size_t n = 0; n < nItems; n++ )
-    {
-        Append(items[n]);
-    }
+    return (void*)m_clientDataDict.Get(n);
 }
 
-void wxChoice::DoSetFirstItem(int WXUNUSED(n))
+void wxChoice::DoSetItemClientObject(int n, wxClientData* clientData)
 {
-    wxFAIL_MSG( wxT("wxChoice::DoSetFirstItem not implemented") );
+    // don't delete, wxItemContainer does that for us
+    m_clientDataDict.Set(n, clientData, FALSE);
 }
 
-void wxChoice::DoSetItemClientData(int n, void* clientData)
+wxClientData* wxChoice::DoGetItemClientObject(int n) const
 {
-    wxNode *node = m_clientList.Nth( n );
-    wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientData") );
-
-    node->SetData( (wxObject*) clientData );
+    return m_clientDataDict.Get(n);
 }
 
-void* wxChoice::DoGetItemClientData(int n) const
+void wxChoice::SetString(int WXUNUSED(n), const wxString& WXUNUSED(s))
 {
-    wxNode *node = m_clientList.Nth( n );
-    wxCHECK_MSG( node, NULL, wxT("invalid index in wxChoice::DoGetItemClientData") );
-
-    return node->Data();
+    wxFAIL_MSG( wxT("wxChoice::SetString not implemented") );
 }
 
-void wxChoice::DoSetItemClientObject(int n, wxClientData* clientData)
+wxSize wxChoice::GetItemsSize() const
 {
-    wxNode *node = m_clientList.Nth( n );
-    wxCHECK_RET( node, wxT("invalid index in wxChoice::DoSetItemClientObject") );
+    int x, y, mx = 0, my = 0;
 
-    wxClientData *cd = (wxClientData*) node->Data();
-    delete cd;
+    // get my
+    GetTextExtent( "|", &x, &my );
 
-    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();
-}
+    wxStringList::Node* 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 + 50 : 120 ),
+                     items.y + 15 );
 }