Applied patch [ 666379 ] CalCtrl doesn't use best sizes for the year combobox

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

diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp
index c2e9d0ecb989772e50267b6d65de256e1d15fcf9..36e322073f2c621e40ec0622533fa35e6f5adf14 100644 (file)
--- a/src/motif/combobox.cpp
+++ b/src/motif/combobox.cpp
@@ -17,15 +17,21 @@
 
 #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,
                           XmComboBoxSelectionCallbackStruct * cbs);
 
 void  wxComboBoxCallback (Widget w, XtPointer clientData,
                           XmComboBoxSelectionCallbackStruct * cbs);
 

-#if !USE_SHARED_LIBRARY

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

-#endif

 
 bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
                         const wxString& value,
 
 bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
                         const wxString& value,


@@ -36,20 +42,10 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
                         const wxValidator& validator,
                         const wxString& name)
 {
                         const wxValidator& validator,
                         const wxString& name)
 {

-    SetName(name);
-    SetValidator(validator);
-    m_noStrings = n;
-    m_windowStyle = style;
-    //    m_backgroundColour = parent->GetBackgroundColour();
-    m_backgroundColour = * wxWHITE;
-    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();
 


@@ -63,20 +59,13 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
         XmNstaticList, ((style & wxCB_SIMPLE) == wxCB_SIMPLE),
         NULL);
 
         XmNstaticList, ((style & wxCB_SIMPLE) == wxCB_SIMPLE),
         NULL);
 

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

     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;
 


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

-    m_font = 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);
 


@@ -100,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::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
     // Necessary so it doesn't call wxChoice::SetSize
 }
 
 void wxComboBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
     // Necessary so it doesn't call wxChoice::SetSize

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

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


@@ -124,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);
-    wxNode *node = m_stringList.Nth(n);
+    XmComboBoxDeletePos((Widget) m_mainWidget, n+1);
+    wxStringList::Node *node = m_stringList.Item(n);

     if (node)
     {
     if (node)
     {

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

         delete node;
     }
         delete node;
     }

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

     m_noStrings--;
 }
 
     m_noStrings--;
 }
 


@@ -154,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)


@@ -172,43 +173,20 @@ int wxComboBox::GetSelection (void) const
 
 wxString wxComboBox::GetString(int n) const
 {
 
 wxString wxComboBox::GetString(int n) const
 {

-    wxNode *node = m_stringList.Nth (n);
+    wxStringList::Node *node = m_stringList.Item(n);

     if (node)
     if (node)

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

     else
         return wxEmptyString;
 }
 
     else
         return wxEmptyString;
 }
 

-wxString wxComboBox::GetStringSelection() const
-{
-    int sel = GetSelection();
-    if (sel == -1)
-        return wxEmptyString;
-    else
-        return GetString(sel);
-}
-
-bool wxComboBox::SetStringSelection(const wxString& sel)
-{
-    int n = FindString(sel);
-    if (n == -1)
-        return FALSE;
-    else
-    {
-        SetSelection(n);
-        return TRUE;
-    }
-}
-

 int wxComboBox::FindString(const wxString& s) const
 {
     int *pos_list = NULL;
     int count = 0;
 int wxComboBox::FindString(const wxString& s) const
 {
     int *pos_list = NULL;
     int count = 0;

-    XmString text = XmStringCreateSimple ((char*) (const char*) s);
+    wxXmString text( s );

     bool found = (XmComboBoxGetMatchPos((Widget) m_mainWidget,
     bool found = (XmComboBoxGetMatchPos((Widget) m_mainWidget,

-        text, &pos_list, &count) != 0);
-
-    XmStringFree(text);
+        text(), &pos_list, &count) != 0);

 
     if (found && count > 0)
     {
 
     if (found && count > 0)
     {


@@ -293,7 +271,11 @@ void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
         {
             wxCommandEvent event (wxEVT_COMMAND_COMBOBOX_SELECTED, item->GetId());
             event.m_commandInt = cbs->index - 1;
         {
             wxCommandEvent event (wxEVT_COMMAND_COMBOBOX_SELECTED, item->GetId());
             event.m_commandInt = cbs->index - 1;

-            //                event.m_commandString = item->GetString (event.m_commandInt);
+            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);
             event.m_extraLong = TRUE;
             event.SetEventObject(item);
             item->ProcessCommand (event);


@@ -303,7 +285,7 @@ void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
         {
             wxCommandEvent event (wxEVT_COMMAND_TEXT_UPDATED, item->GetId());
             event.m_commandInt = -1;
         {
             wxCommandEvent event (wxEVT_COMMAND_TEXT_UPDATED, item->GetId());
             event.m_commandInt = -1;

-            //                event.m_commandString = item->GetValue();
+            event.m_commandString = item->GetValue();

             event.m_extraLong = TRUE;
             event.SetEventObject(item);
             item->ProcessCommand (event);
             event.m_extraLong = TRUE;
             event.SetEventObject(item);
             item->ProcessCommand (event);


@@ -327,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