Small fixes after wxHtmlTagHandler::GetParser() addition.

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

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index 040553316233f6a45b66b88888758ba6ceaae638..7557887c05d906fcd3376998c27f532629687ef8 100644 (file)
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -14,11 +14,6 @@
 
 #if wxUSE_CHOICE
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#define XtParent XTPARENT
-#endif
-
 #include "wx/choice.h"
 
 #ifndef WX_PRECOMP
@@ -43,8 +38,6 @@
 #define WIDTH_OVERHEAD_SUBTRACT 40
 #define HEIGHT_OVERHEAD 15
 
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
-
 void wxChoiceCallback (Widget w, XtPointer clientData,
                        XtPointer ptr);
 
@@ -55,7 +48,6 @@ wxChoice::wxChoice()
 
 void wxChoice::Init()
 {
-    m_noStrings = 0;
     m_buttonWidget = (WXWidget) 0;
     m_menuWidget = (WXWidget) 0;
     m_formWidget = (WXWidget) 0;
@@ -213,7 +205,7 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter& items,
 
         wxDoChangeBackgroundColour((WXWidget) w, m_backgroundColour);
 
-        if( m_font.Ok() )
+        if( m_font.IsOk() )
             wxDoChangeFont( w, m_font );
 
         m_widgetArray.Insert(w, pos);
@@ -226,7 +218,7 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter& items,
                        (XtCallbackProc) wxChoiceCallback,
                        (XtPointer) this);
 
-        if (m_noStrings == 0 && m_buttonWidget)
+        if (m_stringArray.GetCount() == 0 && m_buttonWidget)
         {
             XtVaSetValues ((Widget) m_buttonWidget, XmNmenuHistory, w, NULL);
             Widget label = XmOptionButtonGadget ((Widget) m_buttonWidget);
@@ -235,9 +227,8 @@ int wxChoice::DoInsertItems(const wxArrayStringsAdapter& items,
                 XmNlabelString, text(),
                 NULL);
         }
-        // need to ditch wxStringList for wxArrayString
-        m_stringList.Insert(pos, MYcopystring(items[i]));
-        m_noStrings ++;
+
+        m_stringArray.Insert(items[i], pos);
 
         InsertNewItemClientData(pos, clientData, i, type);
     }
@@ -250,19 +241,20 @@ void wxChoice::DoDeleteOneItem(unsigned int n)
     Widget w = (Widget)m_widgetArray[n];
     XtRemoveCallback(w, XmNactivateCallback, (XtCallbackProc)wxChoiceCallback,
                      (XtPointer)this);
-    m_stringList.Erase(m_stringList.Item(n));
+
+    m_stringArray.RemoveAt(size_t(n));
     m_widgetArray.RemoveAt(size_t(n));
     wxChoiceBase::DoDeleteOneItem(n);
 
     XtDestroyWidget(w);
-    m_noStrings--;
 }
 
 void wxChoice::DoClear()
 {
-    m_stringList.Clear ();
+    m_stringArray.Clear();
+
     unsigned int i;
-    for (i = 0; i < m_noStrings; i++)
+    for (i = 0; i < m_stringArray.GetCount(); i++)
     {
         XtRemoveCallback((Widget) m_widgetArray[i],
                          XmNactivateCallback, (XtCallbackProc)wxChoiceCallback,
@@ -270,6 +262,7 @@ void wxChoice::DoClear()
         XtUnmanageChild ((Widget) m_widgetArray[i]);
         XtDestroyWidget ((Widget) m_widgetArray[i]);
     }
+
     m_widgetArray.Clear();
     if (m_buttonWidget)
         XtVaSetValues ((Widget) m_buttonWidget,
@@ -277,8 +270,6 @@ void wxChoice::DoClear()
                        NULL);
 
     wxChoiceBase::DoClear();
-
-    m_noStrings = 0;
 }
 
 int wxChoice::GetSelection() const
@@ -293,62 +284,48 @@ int wxChoice::GetSelection() const
 
     if (!s.empty())
     {
-        int i = 0;
-        for (wxStringList::compatibility_iterator node = m_stringList.GetFirst ();
-             node; node = node->GetNext ())
-        {
-            if (wxStrcmp(node->GetData(), s.c_str()) == 0)
-            {
+        for (size_t i=0; i<m_stringArray.GetCount(); i++)
+            if (m_stringArray[i] == s)
                 return i;
-            }
-            else
-                i++;
-        }            // for()
 
-        return -1;
+        return wxNOT_FOUND;
     }
-    return -1;
+
+    return wxNOT_FOUND;
 }
 
 void wxChoice::SetSelection(int n)
 {
     m_inSetValue = true;
 
-    wxStringList::compatibility_iterator node = m_stringList.Item(n);
-    if (node)
-    {
 #if 0
-        Dimension selectionWidth, selectionHeight;
+    Dimension selectionWidth, selectionHeight;
 #endif
-        wxXmString text( node->GetData() );
+    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);
+    XtVaGetValues ((Widget) m_widgetArray[n],
+                    XmNwidth, &selectionWidth,
+                    XmNheight, &selectionHeight,
+                    NULL);
 #endif
-        Widget label = XmOptionButtonGadget ((Widget) m_buttonWidget);
-        XtVaSetValues (label,
-            XmNlabelString, text(),
-            NULL);
+    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);
+    XtVaSetValues ((Widget) m_buttonWidget,
+        XmNwidth, selectionWidth, XmNheight, selectionHeight,
+        XmNmenuHistory, (Widget) m_widgetArray[n], NULL);
 #endif
-    }
+
     m_inSetValue = false;
 }
 
 wxString wxChoice::GetString(unsigned int n) const
 {
-    wxStringList::compatibility_iterator node = m_stringList.Item(n);
-    if (node)
-        return node->GetData();
-    else
-        return wxEmptyString;
+    return m_stringArray[n];
 }
 
 void wxChoice::SetColumns(int n)
@@ -390,7 +367,7 @@ void wxChoice::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     if (width > -1)
     {
         unsigned int i;
-        for (i = 0; i < m_noStrings; i++)
+        for (i = 0; i < m_stringArray.GetCount(); i++)
             XtVaSetValues ((Widget) m_widgetArray[i],
                            XmNwidth, actualWidth,
                            NULL);
@@ -401,7 +378,7 @@ void wxChoice::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     {
 #if 0
         unsigned int i;
-        for (i = 0; i < m_noStrings; i++)
+        for (i = 0; i < m_stringArray.GetCount(); i++)
             XtVaSetValues ((Widget) m_widgetArray[i],
                            XmNheight, actualHeight,
                            NULL);
@@ -437,7 +414,7 @@ void wxChoiceCallback (Widget w, XtPointer clientData, XtPointer WXUNUSED(ptr))
             wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, item->GetId());
             event.SetEventObject(item);
             event.SetInt(n);
-            event.SetString( item->GetStrings().Item(n)->GetData() );
+            event.SetString( item->GetStrings().Item(n) );
             if ( item->HasClientObjectData() )
                 event.SetClientObject( item->GetClientObject(n) );
             else if ( item->HasClientUntypedData() )
@@ -452,7 +429,7 @@ void wxChoice::ChangeFont(bool keepOriginalSize)
     // Note that this causes the widget to be resized back
     // to its original size! We therefore have to set the size
     // back again. TODO: a better way in Motif?
-    if (m_mainWidget && m_font.Ok())
+    if (m_mainWidget && m_font.IsOk())
     {
         Display* dpy = XtDisplay((Widget) m_mainWidget);
         int width, height, width1, height1;
@@ -467,7 +444,7 @@ void wxChoice::ChangeFont(bool keepOriginalSize)
                        fontTag, m_font.GetFontTypeC(dpy),
                        NULL);
 
-        for( unsigned int i = 0; i < m_noStrings; ++i )
+        for( unsigned int i = 0; i < m_stringArray.GetCount(); ++i )
             XtVaSetValues( (Widget)m_widgetArray[i],
                            fontTag, m_font.GetFontTypeC(dpy),
                            NULL );
@@ -486,7 +463,7 @@ void wxChoice::ChangeBackgroundColour()
     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_stringArray.GetCount(); i++)
         wxDoChangeBackgroundColour(m_widgetArray[i], m_backgroundColour);
 }
 
@@ -496,13 +473,13 @@ void wxChoice::ChangeForegroundColour()
     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_stringArray.GetCount(); i++)
         wxDoChangeForegroundColour(m_widgetArray[i], m_foregroundColour);
 }
 
 unsigned int wxChoice::GetCount() const
 {
-    return m_noStrings;
+    return m_stringArray.GetCount();
 }
 
 void wxChoice::SetString(unsigned int WXUNUSED(n), const wxString& WXUNUSED(s))
@@ -517,13 +494,11 @@ wxSize wxChoice::GetItemsSize() const
     // get my
     GetTextExtent( "|", &x, &my );
 
-    wxStringList::compatibility_iterator curr = m_stringList.GetFirst();
-    while( curr )
+    for (size_t i=0; i<m_stringArray.GetCount(); i++)
     {
-        GetTextExtent( curr->GetData(), &x, &y );
+        GetTextExtent( m_stringArray[i], &x, &y );
         mx = wxMax( mx, x );
         my = wxMax( my, y );
-        curr = curr->GetNext();
     }
 
     return wxSize( mx, my );