If -1 is used for width/height, use best size.

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

diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp
index 4537779eb6f7dd173508ac3c03b81a76c0cda144..72d2836507affec3d6037cfcfa1b906066af3a31 100644 (file)
--- a/src/motif/combobox.cpp
+++ b/src/motif/combobox.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -17,65 +17,55 @@
 
 #if wxUSE_COMBOBOX
 
 
 #if wxUSE_COMBOBOX
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <Xm/Xm.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 #include "xmcombo/xmcombo.h"
 
 #include "xmcombo/xmcombo.h"
 

+#include "wx/motif/private.h"
+

 void  wxComboBoxCallback (Widget w, XtPointer clientData,
 void  wxComboBoxCallback (Widget w, XtPointer clientData,

-                  XmComboBoxSelectionCallbackStruct * cbs);
+                          XmComboBoxSelectionCallbackStruct * cbs);

 
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)

-#endif

 
 bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
 
 bool wxComboBox::Create(wxWindow *parent, wxWindowID id,

-           const wxString& value,
-           const wxPoint& pos,
-           const wxSize& size,
-                  int n, const wxString choices[],
-                  long style,
-           const wxValidator& validator,
-           const wxString& name)
+                        const wxString& value,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        int n, const wxString choices[],
+                        long style,
+                        const wxValidator& validator,
+                        const wxString& name)

 {
 {

-    SetName(name);
-    SetValidator(validator);
-    m_noStrings = n;
-    m_windowStyle = style;
-    m_backgroundColour = parent->GetBackgroundColour();
-    m_foregroundColour = parent->GetForegroundColour();
-
-    if (parent) parent->AddChild(this);
+    if( !CreateControl( parent, id, pos, size, style, validator, name ) )
+        return FALSE;

 
 

-    if ( id == -1 )
-       m_windowId = (int)NewControlId();
-    else
-       m_windowId = id;
+    m_noStrings = n;

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

-    Widget buttonWidget = XtVaCreateManagedWidget((char*) (const char*) name,
-                                        xmComboBoxWidgetClass, parentWidget,
-                                        XmNmarginHeight, 0,
-                                        XmNmarginWidth, 0,
-                                        XmNshowLabel, False,
-       XmNeditable, ((style & wxCB_READONLY) != wxCB_READONLY),
-       XmNsorted, ((style & wxCB_SORT) == wxCB_SORT),
-       XmNstaticList, ((style & wxCB_SIMPLE) == wxCB_SIMPLE),
-                                        NULL);
-
-    XtAddCallback (buttonWidget, XmNselectionCallback, (XtCallbackProc) wxComboBoxCallback,
-                (XtPointer) this);
-    XtAddCallback (buttonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxComboBoxCallback,
-                (XtPointer) this);
+    Widget buttonWidget = XtVaCreateManagedWidget(name.c_str(),
+        xmComboBoxWidgetClass, parentWidget,
+        XmNmarginHeight, 0,
+        XmNmarginWidth, 0,
+        XmNshowLabel, False,
+        XmNeditable, ((style & wxCB_READONLY) != wxCB_READONLY),
+        XmNsorted, ((style & wxCB_SORT) == wxCB_SORT),
+        XmNstaticList, ((style & wxCB_SIMPLE) == wxCB_SIMPLE),
+        NULL);

 
     int i;
     for (i = 0; i < n; i++)
     {
 
     int i;
     for (i = 0; i < n; i++)
     {

-        XmString str = XmStringCreateLtoR((char*) (const char*) choices[i], XmSTRING_DEFAULT_CHARSET);
-        XmComboBoxAddItem(buttonWidget, str, 0);
-        XmStringFree(str);
+        wxXmString str( choices[i] );
+        XmComboBoxAddItem(buttonWidget, str(), 0);

         m_stringList.Add(choices[i]);
     }
         m_stringList.Add(choices[i]);
     }

-    m_noStrings = n;

 
     m_mainWidget = (Widget) buttonWidget;
 
 
     m_mainWidget = (Widget) buttonWidget;
 


@@ -83,9 +73,13 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
 
     SetValue(value);
 
 
     SetValue(value);
 

-    m_windowFont = parent->GetFont();

     ChangeFont(FALSE);
 
     ChangeFont(FALSE);
 

+    XtAddCallback (buttonWidget, XmNselectionCallback, (XtCallbackProc) wxComboBoxCallback,
+        (XtPointer) this);
+    XtAddCallback (buttonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxComboBoxCallback,
+        (XtPointer) this);
+

     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 
     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 


@@ -99,12 +93,14 @@ wxComboBox::~wxComboBox()
     DetachWidget((Widget) m_mainWidget); // Removes event handlers
     XtDestroyWidget((Widget) m_mainWidget);
     m_mainWidget = (WXWidget) 0;
     DetachWidget((Widget) m_mainWidget); // Removes event handlers
     XtDestroyWidget((Widget) m_mainWidget);
     m_mainWidget = (WXWidget) 0;

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

 }
 
 }
 

-void wxComboBox::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxComboBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)

 {
     // Necessary so it doesn't call wxChoice::SetSize
 {
     // Necessary so it doesn't call wxChoice::SetSize

-    wxWindow::SetSize(x, y, width, height, sizeFlags);
+    wxWindow::DoSetSize(x, y, width, DoGetBestSize().y, sizeFlags);

 }
 
 wxString wxComboBox::GetValue() const
 }
 
 wxString wxComboBox::GetValue() const


@@ -123,29 +119,31 @@ wxString wxComboBox::GetValue() const
 void wxComboBox::SetValue(const wxString& value)
 {
     m_inSetValue = TRUE;
 void wxComboBox::SetValue(const wxString& value)
 {
     m_inSetValue = TRUE;

-    if (!value.IsNull())
-        XmComboBoxSetString ((Widget) m_mainWidget, (char*) (const char*) value);
+    if( !value.empty() )
+        XmComboBoxSetString( (Widget)m_mainWidget, (char*)value.c_str() );

     m_inSetValue = FALSE;
 }
 
     m_inSetValue = FALSE;
 }
 

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

 {
 {

-    XmString str = XmStringCreateLtoR((char*) (const char*) item, XmSTRING_DEFAULT_CHARSET);
-    XmComboBoxAddItem((Widget) m_mainWidget, str, 0);
+    wxXmString str( item.c_str() );
+    XmComboBoxAddItem((Widget) m_mainWidget, str(), 0);

     m_stringList.Add(item);
     m_stringList.Add(item);

-    XmStringFree(str);

     m_noStrings ++;
     m_noStrings ++;

+
+    return GetCount() - 1;

 }
 
 void wxComboBox::Delete(int n)
 {
 }
 
 void wxComboBox::Delete(int n)
 {

-    XmComboBoxDeletePos((Widget) m_mainWidget, n-1);
+    XmComboBoxDeletePos((Widget) m_mainWidget, n+1);

     wxNode *node = m_stringList.Nth(n);
     if (node)
     {
     wxNode *node = m_stringList.Nth(n);
     if (node)
     {

-      delete[] (char *)node->Data();
-      delete node;
+        delete[] (char *)node->Data();
+        delete node;

     }
     }

+    m_clientDataDict.Delete(n, HasClientObjectData());

     m_noStrings--;
 }
 
     m_noStrings--;
 }
 


@@ -153,6 +151,10 @@ void wxComboBox::Clear()
 {
     XmComboBoxDeleteAllItems((Widget) m_mainWidget);
     m_stringList.Clear();
 {
     XmComboBoxDeleteAllItems((Widget) m_mainWidget);
     m_stringList.Clear();

+
+    if ( HasClientObjectData() )
+        m_clientDataDict.DestroyData();
+    m_noStrings = 0;

 }
 
 void wxComboBox::SetSelection (int n)
 }
 
 void wxComboBox::SetSelection (int n)


@@ -162,61 +164,38 @@ void wxComboBox::SetSelection (int n)
 
 int wxComboBox::GetSelection (void) const
 {
 
 int wxComboBox::GetSelection (void) const
 {

-  int sel = XmComboBoxGetSelectedPos((Widget) m_mainWidget);
-  if (sel == 0)
-    return -1;
-  else
-    return sel - 1;
+    int sel = XmComboBoxGetSelectedPos((Widget) m_mainWidget);
+    if (sel == 0)
+        return -1;
+    else
+        return sel - 1;

 }
 
 wxString wxComboBox::GetString(int n) const
 {
 }
 
 wxString wxComboBox::GetString(int n) const
 {

-    wxNode *node = m_stringList.Nth (n);
+    wxNode *node = m_stringList.Nth(n);

     if (node)
     if (node)

-      return wxString((char *) node->Data ());
+        return wxString((char *) node->Data ());

     else
     else

-      return wxEmptyString;
-}
-
-wxString wxComboBox::GetStringSelection() const
-{
-    int sel = GetSelection();
-    if (sel == -1)

         return wxEmptyString;
         return wxEmptyString;

-    else
-        return GetString(sel);

 }
 
 }
 

-bool wxComboBox::SetStringSelection(const wxString& sel)
+int wxComboBox::FindString(const wxString& s) const

 {
 {

-    int n = FindString(sel);
-    if (n == -1)
-        return FALSE;
-    else
+    int *pos_list = NULL;
+    int count = 0;
+    wxXmString text( s );
+    bool found = (XmComboBoxGetMatchPos((Widget) m_mainWidget,
+        text(), &pos_list, &count) != 0);
+
+    if (found && count > 0)

     {
     {

-        SetSelection(n);
-        return TRUE;
+        int pos = pos_list[0] - 1;
+        free(pos_list);
+        return pos;

     }
     }

-}

 
 

-int wxComboBox::FindString(const wxString& s) const
-{
-  int *pos_list = NULL;
-  int count = 0;
-  XmString text = XmStringCreateSimple ((char*) (const char*) s);
-  bool found = (XmComboBoxGetMatchPos((Widget) m_mainWidget,
-   text, &pos_list, &count) != 0);
-
-  XmStringFree(text);
-
-  if (found && count > 0)
-  {
-    int pos = pos_list[0] - 1;
-    free(pos_list);
-    return pos;
-  }
-
-  return -1;
+    return -1;

 }
 
 // Clipboard operations
 }
 
 // Clipboard operations


@@ -264,52 +243,56 @@ long wxComboBox::GetLastPosition() const
 void wxComboBox::Replace(long from, long to, const wxString& value)
 {
     XmComboBoxReplace ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,
 void wxComboBox::Replace(long from, long to, const wxString& value)
 {
     XmComboBoxReplace ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,

-                (char*) (const char*) value);
+        (char*) (const char*) value);

 }
 
 void wxComboBox::Remove(long from, long to)
 {
     XmComboBoxSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,
 }
 
 void wxComboBox::Remove(long from, long to)
 {
     XmComboBoxSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,

-                     (Time) 0);
+                      (Time) 0);

     XmComboBoxRemove ((Widget) m_mainWidget);
 }
 
 void wxComboBox::SetSelection(long from, long to)
 {
     XmComboBoxSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,
     XmComboBoxRemove ((Widget) m_mainWidget);
 }
 
 void wxComboBox::SetSelection(long from, long to)
 {
     XmComboBoxSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,

-                     (Time) 0);
+                      (Time) 0);

 }
 
 void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
 }
 
 void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,

-                  XmComboBoxSelectionCallbackStruct * cbs)
+                          XmComboBoxSelectionCallbackStruct * cbs)

 {
     wxComboBox *item = (wxComboBox *) clientData;
 
     switch (cbs->reason)
     {
 {
     wxComboBox *item = (wxComboBox *) clientData;
 
     switch (cbs->reason)
     {

-        case XmCR_SINGLE_SELECT:
-        case XmCR_BROWSE_SELECT:
+    case XmCR_SINGLE_SELECT:
+    case XmCR_BROWSE_SELECT:

         {
             wxCommandEvent event (wxEVT_COMMAND_COMBOBOX_SELECTED, item->GetId());
         {
             wxCommandEvent event (wxEVT_COMMAND_COMBOBOX_SELECTED, item->GetId());

-               event.m_commandInt = cbs->index - 1;
-               //              event.m_commandString = item->GetString (event.m_commandInt);
-               event.m_extraLong = TRUE;
-               event.SetEventObject(item);
-               item->ProcessCommand (event);
-               break;
+            event.m_commandInt = cbs->index - 1;
+            event.m_commandString = item->GetString (event.m_commandInt);
+            if ( item->HasClientObjectData() )
+                event.SetClientObject( item->GetClientObject(cbs->index - 1) );
+            else if ( item->HasClientUntypedData() )
+                event.SetClientData( item->GetClientData(cbs->index - 1) );
+            event.m_extraLong = TRUE;
+            event.SetEventObject(item);
+            item->ProcessCommand (event);
+            break;

         }
         }

-        case XmCR_VALUE_CHANGED:
+    case XmCR_VALUE_CHANGED:

         {
             wxCommandEvent event (wxEVT_COMMAND_TEXT_UPDATED, item->GetId());
         {
             wxCommandEvent event (wxEVT_COMMAND_TEXT_UPDATED, item->GetId());

-               event.m_commandInt = -1;
-               //              event.m_commandString = item->GetValue();
-               event.m_extraLong = TRUE;
-               event.SetEventObject(item);
-               item->ProcessCommand (event);
+            event.m_commandInt = -1;
+            event.m_commandString = item->GetValue();
+            event.m_extraLong = TRUE;
+            event.SetEventObject(item);
+            item->ProcessCommand (event);

             break;
         }
             break;
         }

-        default:
-            break;
+    default:
+        break;

     }
 }
 
     }
 }
 


@@ -326,7 +309,21 @@ void wxComboBox::ChangeBackgroundColour()
 
 void wxComboBox::ChangeForegroundColour()
 {
 
 void wxComboBox::ChangeForegroundColour()
 {

-    wxWindow::ChangeBackgroundColour();
+    wxWindow::ChangeForegroundColour();
+}
+
+wxSize wxComboBox::DoGetBestSize() const
+{
+    if( (GetWindowStyle() & wxCB_DROPDOWN) == wxCB_DROPDOWN ||
+        (GetWindowStyle() & wxCB_READONLY) == wxCB_READONLY )
+    {
+        wxSize items = GetItemsSize();
+        // FIXME arbitrary constants
+        return wxSize( ( items.x ? items.x + 50 : 120 ),
+                         items.y + 10 );
+    }
+    else
+        return wxWindow::DoGetBestSize();

 }
 
 #endif
 }
 
 #endif