fixing bug 1841377

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

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index d8f2533de4fa76bf9ebd61a8965ba3cd8309aba7..040553316233f6a45b66b88888758ba6ceaae638 100644 (file)
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -1,27 +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"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_CHOICE

 
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #define XtParent XTPARENT
 #endif
 
 
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #define XtParent XTPARENT
 #endif
 

-#include "wx/defs.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


@@ -40,7 +43,7 @@
 #define WIDTH_OVERHEAD_SUBTRACT 40
 #define HEIGHT_OVERHEAD 15
 
 #define WIDTH_OVERHEAD_SUBTRACT 40
 #define HEIGHT_OVERHEAD 15
 

-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)

 
 void wxChoiceCallback (Widget w, XtPointer clientData,
                        XtPointer ptr);
 
 void wxChoiceCallback (Widget w, XtPointer clientData,
                        XtPointer ptr);


@@ -52,8 +55,6 @@ wxChoice::wxChoice()
 
 void wxChoice::Init()
 {
 
 void wxChoice::Init()
 {

-    InitBase();
-

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


@@ -69,7 +70,8 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
                       const wxString& name)
 {
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
                       const wxString& name)
 {
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )

-        return FALSE;
+        return false;
+    PreCreation();

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


@@ -89,7 +91,8 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
     * Create the popup menu
     */
     m_menuWidget = (WXWidget) XmCreatePulldownMenu ((Widget) m_formWidget,
     * Create the popup menu
     */
     m_menuWidget = (WXWidget) XmCreatePulldownMenu ((Widget) m_formWidget,

-                                                    "choiceMenu", NULL, 0);
+                                                    wxMOTIF_STR("choiceMenu"),
+                                                    NULL, 0);

 
     if (n > 0)
     {
 
     if (n > 0)
     {


@@ -109,7 +112,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
     XtSetArg (args[argcnt], XmNmarginHeight, 0); ++argcnt;
     XtSetArg (args[argcnt], XmNpacking, XmPACK_TIGHT); ++argcnt;
     m_buttonWidget = (WXWidget) XmCreateOptionMenu ((Widget) m_formWidget,
     XtSetArg (args[argcnt], XmNmarginHeight, 0); ++argcnt;
     XtSetArg (args[argcnt], XmNpacking, XmPACK_TIGHT); ++argcnt;
     m_buttonWidget = (WXWidget) XmCreateOptionMenu ((Widget) m_formWidget,

-                                                    "choiceButton",
+                                                    wxMOTIF_STR("choiceButton"),

                                                     args, argcnt);
 
     m_mainWidget = m_buttonWidget;
                                                     args, argcnt);
 
     m_mainWidget = m_buttonWidget;


@@ -136,13 +139,24 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
 
     XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
 
 
     XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
 

-    ChangeFont(FALSE);
-    ChangeBackgroundColour();
-
+    PostCreation();

     AttachWidget (parent, m_buttonWidget, m_formWidget,
                   pos.x, pos.y, bestSize.x, bestSize.y);
 
     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()
 }
 
 wxChoice::~wxChoice()


@@ -165,67 +179,89 @@ wxChoice::~wxChoice()
         m_mainWidget = (WXWidget) 0;
         m_buttonWidget = (WXWidget) 0;
     }
         m_mainWidget = (WXWidget) 0;
         m_buttonWidget = (WXWidget) 0;
     }

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

 }
 
 }
 

-int wxChoice::DoAppend(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);

 
 

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

 
 

-    if( m_font.Ok() )
-        wxDoChangeFont( w, m_font );
+        if( m_font.Ok() )
+            wxDoChangeFont( w, m_font );

 
 

-    m_widgetArray.Add(w);
+        m_widgetArray.Insert(w, pos);

 
 

-    char mnem = wxFindMnemonic (item);
-    if (mnem != 0)
-        XtVaSetValues (w, XmNmnemonic, mnem, NULL);
+        char mnem = wxFindMnemonic (items[i]);
+        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);
-        wxXmString text( item );
-        XtVaSetValues (label,
-            XmNlabelString, text(),
-            NULL);
+        if (m_noStrings == 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);
+        }
+        // need to ditch wxStringList for wxArrayString
+        m_stringList.Insert(pos, MYcopystring(items[i]));
+        m_noStrings ++;
+
+        InsertNewItemClientData(pos, clientData, i, type);

     }
     }

-    m_stringList.Add(item);
-    m_noStrings ++;

 
 

-    return GetCount() - 1;
+    return pos - 1;

 }
 
 }
 

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

 {
     Widget w = (Widget)m_widgetArray[n];
     XtRemoveCallback(w, XmNactivateCallback, (XtCallbackProc)wxChoiceCallback,
                      (XtPointer)this);
 {
     Widget w = (Widget)m_widgetArray[n];
     XtRemoveCallback(w, XmNactivateCallback, (XtCallbackProc)wxChoiceCallback,
                      (XtPointer)this);

-    m_stringList.DeleteNode(m_stringList.Item(n));
+    m_stringList.Erase(m_stringList.Item(n));

     m_widgetArray.RemoveAt(size_t(n));
     m_widgetArray.RemoveAt(size_t(n));

-    m_clientDataDict.Delete(n, HasClientObjectData());
+    wxChoiceBase::DoDeleteOneItem(n);

 
     XtDestroyWidget(w);
 
     XtDestroyWidget(w);

-    m_noStrings --;
+    m_noStrings--;

 }
 
 }
 

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

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

-    size_t i;
+    unsigned int i;

     for (i = 0; i < m_noStrings; i++)
     {
         XtRemoveCallback((Widget) m_widgetArray[i],
     for (i = 0; i < m_noStrings; i++)
     {
         XtRemoveCallback((Widget) m_widgetArray[i],


@@ -240,8 +276,7 @@ void wxChoice::Clear()
                        XmNmenuHistory, (Widget) NULL,
                        NULL);
 
                        XmNmenuHistory, (Widget) NULL,
                        NULL);
 

-    if ( HasClientObjectData() )
-        m_clientDataDict.DestroyData();
+    wxChoiceBase::DoClear();

 
     m_noStrings = 0;
 }
 
     m_noStrings = 0;
 }


@@ -256,10 +291,10 @@ int wxChoice::GetSelection() const
     wxXmString freeMe(text);
     wxString s = wxXmStringToString( text );
 
     wxXmString freeMe(text);
     wxString s = wxXmStringToString( text );
 

-    if (!s.IsEmpty())
+    if (!s.empty())

     {
         int i = 0;
     {
         int i = 0;

-        for (wxStringListNode* node = m_stringList.GetFirst ();
+        for (wxStringList::compatibility_iterator node = m_stringList.GetFirst ();

              node; node = node->GetNext ())
         {
             if (wxStrcmp(node->GetData(), s.c_str()) == 0)
              node; node = node->GetNext ())
         {
             if (wxStrcmp(node->GetData(), s.c_str()) == 0)


@@ -277,9 +312,9 @@ int wxChoice::GetSelection() const
 
 void wxChoice::SetSelection(int n)
 {
 
 void wxChoice::SetSelection(int n)
 {

-    m_inSetValue = TRUE;
+    m_inSetValue = true;

 
 

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

     if (node)
     {
 #if 0
     if (node)
     {
 #if 0


@@ -304,27 +339,12 @@ void wxChoice::SetSelection(int n)
             XmNmenuHistory, (Widget) m_widgetArray[n], NULL);
 #endif
     }
             XmNmenuHistory, (Widget) m_widgetArray[n], NULL);
 #endif
     }

-    m_inSetValue = FALSE;
+    m_inSetValue = false;

 }
 
 }
 

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

 {
 {

-    int i = 0;
-    for (wxStringListNode* node = m_stringList.GetFirst();
-         node; node = node->GetNext ())
-    {
-        if (s == node->GetData())
-            return i;
-
-        i++;
-    }
-
-    return -1;
-}
-
-wxString wxChoice::GetString(int n) const
-{
-    wxStringListNode *node = m_stringList.Item(n);
+    wxStringList::compatibility_iterator node = m_stringList.Item(n);

     if (node)
         return node->GetData();
     else
     if (node)
         return node->GetData();
     else


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


@@ -369,7 +389,7 @@ void wxChoice::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 
     if (width > -1)
     {
 
     if (width > -1)
     {

-        size_t i;
+        unsigned int i;

         for (i = 0; i < m_noStrings; i++)
             XtVaSetValues ((Widget) m_widgetArray[i],
                            XmNwidth, actualWidth,
         for (i = 0; i < m_noStrings; i++)
             XtVaSetValues ((Widget) m_widgetArray[i],
                            XmNwidth, actualWidth,


@@ -380,7 +400,7 @@ void wxChoice::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     if (height > -1)
     {
 #if 0
     if (height > -1)
     {
 #if 0

-        size_t i;
+        unsigned int i;

         for (i = 0; i < m_noStrings; i++)
             XtVaSetValues ((Widget) m_widgetArray[i],
                            XmNheight, actualHeight,
         for (i = 0; i < m_noStrings; i++)
             XtVaSetValues ((Widget) m_widgetArray[i],
                            XmNheight, actualHeight,


@@ -416,8 +436,8 @@ void wxChoiceCallback (Widget w, XtPointer clientData, XtPointer WXUNUSED(ptr))
         {
             wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, item->GetId());
             event.SetEventObject(item);
         {
             wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, item->GetId());
             event.SetEventObject(item);

-            event.m_commandInt = n;
-            event.m_commandString = item->GetStrings().Item(n)->GetData();
+            event.SetInt(n);
+            event.SetString( item->GetStrings().Item(n)->GetData() );

             if ( item->HasClientObjectData() )
                 event.SetClientObject( item->GetClientObject(n) );
             else if ( item->HasClientUntypedData() )
             if ( item->HasClientObjectData() )
                 event.SetClientObject( item->GetClientObject(n) );
             else if ( item->HasClientUntypedData() )


@@ -432,27 +452,30 @@ 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);
 

-        WXFontType fontType =
-            m_font.GetFontType(XtDisplay((Widget) m_mainWidget));

         WXString fontTag = wxFont::GetFontTag();
 
         WXString fontTag = wxFont::GetFontTag();
 

-        XtVaSetValues ((Widget) m_formWidget, fontTag, fontType, NULL);
-        XtVaSetValues ((Widget) m_buttonWidget, fontTag, fontType, NULL);
+        XtVaSetValues ((Widget) m_formWidget,
+                       fontTag, m_font.GetFontTypeC(dpy),
+                       NULL);
+        XtVaSetValues ((Widget) m_buttonWidget,
+                       fontTag, m_font.GetFontTypeC(dpy),
+                       NULL);

 
 

-        for( size_t i = 0; i < m_noStrings; ++i )
+        for( unsigned int i = 0; i < m_noStrings; ++i )

             XtVaSetValues( (Widget)m_widgetArray[i],
             XtVaSetValues( (Widget)m_widgetArray[i],

-                           fontTag, fontType,
+                           fontTag, m_font.GetFontTypeC(dpy),

                            NULL );
                            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);

         }
     }
 }
         }
     }
 }


@@ -462,7 +485,7 @@ void wxChoice::ChangeBackgroundColour()
     wxDoChangeBackgroundColour(m_formWidget, m_backgroundColour);
     wxDoChangeBackgroundColour(m_buttonWidget, m_backgroundColour);
     wxDoChangeBackgroundColour(m_menuWidget, m_backgroundColour);
     wxDoChangeBackgroundColour(m_formWidget, m_backgroundColour);
     wxDoChangeBackgroundColour(m_buttonWidget, m_backgroundColour);
     wxDoChangeBackgroundColour(m_menuWidget, m_backgroundColour);

-    size_t i;
+    unsigned int i;

     for (i = 0; i < m_noStrings; i++)
         wxDoChangeBackgroundColour(m_widgetArray[i], m_backgroundColour);
 }
     for (i = 0; i < m_noStrings; i++)
         wxDoChangeBackgroundColour(m_widgetArray[i], m_backgroundColour);
 }


@@ -472,38 +495,17 @@ void wxChoice::ChangeForegroundColour()
     wxDoChangeForegroundColour(m_formWidget, m_foregroundColour);
     wxDoChangeForegroundColour(m_buttonWidget, m_foregroundColour);
     wxDoChangeForegroundColour(m_menuWidget, m_foregroundColour);
     wxDoChangeForegroundColour(m_formWidget, m_foregroundColour);
     wxDoChangeForegroundColour(m_buttonWidget, m_foregroundColour);
     wxDoChangeForegroundColour(m_menuWidget, m_foregroundColour);

-    size_t i;
+    unsigned int i;

     for (i = 0; i < m_noStrings; i++)
         wxDoChangeForegroundColour(m_widgetArray[i], m_foregroundColour);
 }
 
     for (i = 0; i < m_noStrings; i++)
         wxDoChangeForegroundColour(m_widgetArray[i], m_foregroundColour);
 }
 

-int wxChoice::GetCount() const
+unsigned int wxChoice::GetCount() const

 {
     return m_noStrings;
 }
 
 {
     return m_noStrings;
 }
 

-void wxChoice::DoSetItemClientData(int n, void* clientData)
-{
-    m_clientDataDict.Set(n, (wxClientData*)clientData, FALSE);
-}
-
-void* wxChoice::DoGetItemClientData(int n) const
-{
-    return (void*)m_clientDataDict.Get(n);
-}
-
-void wxChoice::DoSetItemClientObject(int n, wxClientData* clientData)
-{
-    // don't delete, wxItemContainer does that for us
-    m_clientDataDict.Set(n, clientData, FALSE);
-}
-
-wxClientData* wxChoice::DoGetItemClientObject(int n) const
-{
-    return m_clientDataDict.Get(n);
-}
-
-void wxChoice::SetString(int WXUNUSED(n), const wxString& WXUNUSED(s))
+void wxChoice::SetString(unsigned int WXUNUSED(n), const wxString& WXUNUSED(s))

 {
     wxFAIL_MSG( wxT("wxChoice::SetString not implemented") );
 }
 {
     wxFAIL_MSG( wxT("wxChoice::SetString not implemented") );
 }


@@ -515,7 +517,7 @@ wxSize wxChoice::GetItemsSize() const
     // get my
     GetTextExtent( "|", &x, &my );
 
     // get my
     GetTextExtent( "|", &x, &my );
 

-    wxStringList::Node* curr = m_stringList.GetFirst();
+    wxStringList::compatibility_iterator curr = m_stringList.GetFirst();

     while( curr )
     {
         GetTextExtent( curr->GetData(), &x, &y );
     while( curr )
     {
         GetTextExtent( curr->GetData(), &x, &y );


@@ -534,3 +536,5 @@ wxSize wxChoice::DoGetBestSize() const
     return wxSize( ( items.x ? items.x + WIDTH_OVERHEAD : 120 ),
                      items.y + HEIGHT_OVERHEAD );
 }
     return wxSize( ( items.x ? items.x + WIDTH_OVERHEAD : 120 ),
                      items.y + HEIGHT_OVERHEAD );
 }

+
+#endif // wxUSE_CHOICE