X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/100f92893de45f8ef41c90ad6e3cbfac946dc444..6ceef8efe9e38313dba9f7c8a64efcb344a0056e:/src/motif/combobox_native.cpp

diff --git a/src/motif/combobox_native.cpp b/src/motif/combobox_native.cpp
index 9c11990fe3..498ce2565f 100644
--- a/src/motif/combobox_native.cpp
+++ b/src/motif/combobox_native.cpp
@@ -83,6 +83,8 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
                   ( style & wxCB_DROPDOWN ) ? XmDROP_DOWN_COMBO_BOX :
     // default to wxCB_DROPDOWN
                                               XmDROP_DOWN_COMBO_BOX;
+    if( cb_type == XmDROP_DOWN_COMBO_BOX )
+        SetWindowStyle( style | wxCB_DROPDOWN );
 
     Widget buttonWidget= XtVaCreateManagedWidget(name.c_str(),
         xmComboBoxWidgetClass, parentWidget,
@@ -108,19 +110,36 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
                    (XtCallbackProc) wxComboBoxCallback,
                    (XtPointer) this);
 
+    wxSize best = GetBestSize();
+    if( size.x != -1 ) best.x = size.x;
+    if( size.y != -1 ) best.y = size.y;
+
     SetCanAddEventHandler(true);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
-                  pos.x, pos.y, size.x, size.y);
-
-    XtVaSetValues (GetXmList(this),
-                   XmNvisibleItemCount, 10,
-                   NULL);
+                  pos.x, pos.y, best.x, best.y);
 
     ChangeBackgroundColour();
 
     return true;
 }
 
+void wxComboBox::AdjustDropDownListSize()
+{
+    int newListCount = -1, itemCount = GetCount();
+    const int MAX = 12;
+
+    if( !itemCount )
+        newListCount = 1;
+    else if( itemCount < MAX )
+        newListCount = itemCount;
+    else
+        newListCount = MAX;
+
+    XtVaSetValues( GetXmList(this),
+                   XmNvisibleItemCount, newListCount,
+                   NULL );
+}
+
 wxComboBox::~wxComboBox()
 {
     DetachWidget((Widget) m_mainWidget); // Removes event handlers
@@ -161,7 +180,7 @@ void wxComboBox::SetValue(const wxString& value)
     m_inSetValue = true;
 
     XtVaSetValues( GetXmText(this),
-                   XmNvalue, (char *)value.c_str(),
+                   XmNvalue, wxConstCast(value.c_str(), char),
                    NULL);
 
     m_inSetValue = false;
@@ -171,8 +190,8 @@ int wxComboBox::DoAppend(const wxString& item)
 {
     wxXmString str( item.c_str() );
     XmComboBoxAddItem((Widget) m_mainWidget, str(), 0, False);
-    m_stringList.Add(item);
     m_noStrings ++;
+    AdjustDropDownListSize();
 
     return GetCount() - 1;
 }
@@ -185,14 +204,10 @@ void wxComboBox::Delete(int n)
     XmComboBoxDeletePos((Widget) m_mainWidget, n+1);
 #endif
 
-    wxStringList::Node *node = m_stringList.Item(n);
-    if (node)
-    {
-        delete[] node->GetData();
-        delete node;
-    }
     m_clientDataDict.Delete(n, HasClientObjectData());
     m_noStrings--;
+
+    AdjustDropDownListSize();
 }
 
 void wxComboBox::Clear()
@@ -204,30 +219,28 @@ void wxComboBox::Clear()
     {
     	XmComboBoxDeletePos((Widget) m_mainWidget, m_noStrings--);
     }
- #endif
-
-    m_stringList.Clear();
+#endif
 
     if ( HasClientObjectData() )
         m_clientDataDict.DestroyData();
     m_noStrings = 0;
+    AdjustDropDownListSize();
 }
 
 void wxComboBox::SetSelection (int n)
 {
-#ifdef LESSTIF_VERSION
+#if wxCHECK_LESSTIF()
     XmListSelectPos (GetXmList(this), n + 1, false);
     SetValue(GetString(n));
 #else
+#if 0
     wxXmString str( GetString(n).c_str() );
     XmComboBoxSelectItem((Widget) m_mainWidget, str());
-#if 0
-    // does it work for Motif
+#endif
     XtVaSetValues( (Widget)m_mainWidget,
-                   XmNselectedPosition, n + 1,
+                   XmNselectedPosition, n,
                    NULL );
 #endif
-#endif
 }
 
 int wxComboBox::GetSelection (void) const
@@ -237,11 +250,7 @@ int wxComboBox::GetSelection (void) const
 
 wxString wxComboBox::GetString(int n) const
 {
-    wxStringList::Node *node = m_stringList.Item(n);
-    if (node)
-        return wxString(node->GetData ());
-    else
-        return wxEmptyString;
+    return wxDoGetStringInList( GetXmList(this), n );
 }
 
 int wxComboBox::FindString(const wxString& s) const
@@ -294,7 +303,7 @@ long wxComboBox::GetLastPosition() const
 void wxComboBox::Replace(long from, long to, const wxString& value)
 {
     XmTextReplace( GetXmText(this), (XmTextPosition)from, (XmTextPosition)to,
-                   (char*)value.c_str() );
+                   wxConstCast(value.c_str(), char) );
 }
 
 void wxComboBox::Remove(long from, long to)
@@ -356,6 +365,12 @@ void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
 
 void wxComboBox::ChangeFont(bool keepOriginalSize)
 {
+    if( m_font.Ok() )
+    {
+        wxDoChangeFont( GetXmText(this), m_font );
+        wxDoChangeFont( GetXmList(this), m_font );
+    }
+
     // Don't use the base class wxChoice's ChangeFont
     wxWindow::ChangeFont(keepOriginalSize);
 }
@@ -372,7 +387,31 @@ void wxComboBox::ChangeForegroundColour()
 
 wxSize wxComboBox::DoGetBestSize() const
 {
-   return wxWindow::DoGetBestSize();
+    if( (GetWindowStyle() & wxCB_DROPDOWN) == wxCB_DROPDOWN ||
+        (GetWindowStyle() & wxCB_READONLY) == wxCB_READONLY )
+    {
+        Dimension arrowW, arrowS, highlight, xmargin, ymargin, shadow;
+
+        XtVaGetValues( (Widget)m_mainWidget,
+                       XmNarrowSize, &arrowW,
+                       XmNarrowSpacing, &arrowS,
+                       XmNhighlightThickness, &highlight,
+                       XmNmarginWidth, &xmargin,
+                       XmNmarginHeight, &ymargin,
+                       XmNshadowThickness, &shadow,
+                       NULL );
+
+        wxSize listSize = wxDoGetListBoxBestSize( GetXmList(this), this );
+        wxSize textSize = wxDoGetSingleTextCtrlBestSize( GetXmText(this),
+                                                         this );
+
+        // FIXME arbitrary constants
+        return wxSize( listSize.x + arrowW + arrowS + 2 * highlight
+                                  + 2 * shadow + 2 * xmargin ,
+                       textSize.y + 2 * highlight + 2 * ymargin + 2 * shadow );
+    }
+    else
+        return wxWindow::DoGetBestSize();
 }
 
 #endif // XmVersion >= 2000