64 bit compilation fix for wxTextCtrl in wxMSW.

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

diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp
index b24da1adb019aa0c960577ce88fa62120c7ef386..65fcf3f7ac276276a2ac72f1e74f50e805ef8782 100644 (file)
--- a/src/motif/combobox.cpp
+++ b/src/motif/combobox.cpp
@@ -1,32 +1,43 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        combobox.cpp
+// Name:        src/motif/combobox.cpp

 // Purpose:     wxComboBox class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxComboBox class
 // 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 "combobox.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_COMBOBOX

 
 #include "wx/combobox.h"
 
 
 #include "wx/combobox.h"
 

-#if wxUSE_COMBOBOX
+#ifndef WX_PRECOMP
+    #include "wx/arrstr.h"
+#endif

 
 

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

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

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
+
+// use the old, GPL'd combobox
+#if (XmVersion < 2000)
+

 #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)
-#endif
-

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


@@ -36,24 +47,13 @@ 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 ( id == -1 )
-        m_windowId = (int)NewControlId();
-    else
-        m_windowId = id;
-    
+    if( !CreateControl( parent, id, pos, size, style, validator, name ) )
+        return false;
+    PreCreation();
+

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

-    
-    Widget buttonWidget = XtVaCreateManagedWidget((char*) (const char*) name,
+
+    Widget buttonWidget = XtVaCreateManagedWidget(name.c_str(),

         xmComboBoxWidgetClass, parentWidget,
         XmNmarginHeight, 0,
         XmNmarginWidth, 0,
         xmComboBoxWidgetClass, parentWidget,
         XmNmarginHeight, 0,
         XmNmarginWidth, 0,


@@ -62,37 +62,44 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
         XmNsorted, ((style & wxCB_SORT) == wxCB_SORT),
         XmNstaticList, ((style & wxCB_SIMPLE) == wxCB_SIMPLE),
         NULL);
         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);
-    
+

     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);
-        m_stringList.Add(choices[i]);
+        wxXmString str( choices[i] );
+        XmComboBoxAddItem(buttonWidget, str(), 0);
+        m_stringArray.Add(choices[i]);

     }
     }

-    m_noStrings = n;
-    
+

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

-    
+

     XtManageChild (buttonWidget);
     XtManageChild (buttonWidget);

-    
+

     SetValue(value);
     SetValue(value);

-    
-    m_font = parent->GetFont();
-    ChangeFont(FALSE);
-    
-    SetCanAddEventHandler(TRUE);
+
+    XtAddCallback (buttonWidget, XmNselectionCallback, (XtCallbackProc) wxComboBoxCallback,
+        (XtPointer) this);
+    XtAddCallback (buttonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxComboBoxCallback,
+        (XtPointer) this);
+
+    PostCreation();

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

-    
-    ChangeBackgroundColour();
-    
-    return TRUE;
+
+    return true;
+}
+
+bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
+                        const wxString& value,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        const wxArrayString& choices,
+                        long style,
+                        const wxValidator& validator,
+                        const wxString& name)
+{
+    wxCArrayString chs(choices);
+    return Create(parent, id, value, pos, size, chs.GetCount(),
+                  chs.GetStrings(), style, validator, name);

 }
 
 wxComboBox::~wxComboBox()
 }
 
 wxComboBox::~wxComboBox()


@@ -102,12 +109,16 @@ wxComboBox::~wxComboBox()
     m_mainWidget = (WXWidget) 0;
 }
 
     m_mainWidget = (WXWidget) 0;
 }
 

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

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

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

 }
 
 }
 

+#if 0
+// Already defined in include/motif/combobox.h

 wxString wxComboBox::GetValue() const
 {
     char *s = XmComboBoxGetString ((Widget) m_mainWidget);
 wxString wxComboBox::GetValue() const
 {
     char *s = XmComboBoxGetString ((Widget) m_mainWidget);


@@ -120,40 +131,56 @@ wxString wxComboBox::GetValue() const
     else
         return wxEmptyString;
 }
     else
         return wxEmptyString;
 }

+#endif

 
 void wxComboBox::SetValue(const wxString& value)
 {
 
 void wxComboBox::SetValue(const wxString& value)
 {

-    m_inSetValue = TRUE;
-    if (!value.IsNull())
-        XmComboBoxSetString ((Widget) m_mainWidget, (char*) (const char*) value);
-    m_inSetValue = FALSE;
+    if( !value.empty() )
+    {
+        m_inSetValue = true;
+        XmComboBoxSetString((Widget)m_mainWidget, value.char_str());
+        m_inSetValue = false;
+    }

 }
 
 }
 

-void wxComboBox::Append(const wxString& item)
+void wxComboBox::SetString(unsigned int WXUNUSED(n), const wxString& WXUNUSED(s))

 {
 {

-    XmString str = XmStringCreateLtoR((char*) (const char*) item, XmSTRING_DEFAULT_CHARSET);
-    XmComboBoxAddItem((Widget) m_mainWidget, str, 0);
-    m_stringList.Add(item);
-    XmStringFree(str);
-    m_noStrings ++;
+    wxFAIL_MSG( wxT("wxComboBox::SetString only implemented for Motif 2.0") );

 }
 
 }
 

-void wxComboBox::Delete(int n)
+// TODO auto-sorting is not supported by the code
+int wxComboBox::DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData,
+                              wxClientDataType type)

 {
 {

-    XmComboBoxDeletePos((Widget) m_mainWidget, n-1);
-    wxNode *node = m_stringList.Nth(n);
-    if (node)
+    const unsigned int numItems = items.GetCount();
+
+    AllocClientData(numItems);
+    for( unsigned int i = 0; i < numItems; ++i, ++pos )

     {
     {

-        delete[] (char *)node->Data();
-        delete node;
+        wxXmString str( items[i].c_str() );
+        XmComboBoxAddItem((Widget) m_mainWidget, str(), GetMotifPosition(pos));
+        m_stringArray.Insert(items[i], pos);
+        InsertNewItemClientData(pos, clientData, i, type);

     }
     }

-    m_noStrings--;
+
+    return pos - 1;
+}
+
+void wxComboBox::DoDeleteOneItem(unsigned int n)
+{
+    XmComboBoxDeletePos((Widget) m_mainWidget, n+1);
+    m_stringArray.RemoveAt(n);
+    wxControlWithItems::DoDeleteOneItem(n);

 }
 
 void wxComboBox::Clear()
 {
     XmComboBoxDeleteAllItems((Widget) m_mainWidget);
 }
 
 void wxComboBox::Clear()
 {
     XmComboBoxDeleteAllItems((Widget) m_mainWidget);

-    m_stringList.Clear();
+    m_stringArray.Clear();
+
+    wxControlWithItems::DoClear();

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


@@ -170,131 +197,50 @@ int wxComboBox::GetSelection (void) const
         return sel - 1;
 }
 
         return sel - 1;
 }
 

-wxString wxComboBox::GetString(int n) const
-{
-    wxNode *node = m_stringList.Nth (n);
-    if (node)
-        return wxString((char *) node->Data ());
-    else
-        return wxEmptyString;
-}
-
-wxString wxComboBox::GetStringSelection() const
+wxString wxComboBox::GetString(unsigned int n) const

 {
 {

-    int sel = GetSelection();
-    if (sel == -1)
-        return wxEmptyString;
-    else
-        return GetString(sel);
+    return m_stringArray[n];

 }
 
 }
 

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

 {
 {

-    int n = FindString(sel);
-    if (n == -1)
-        return FALSE;
-    else
-    {
-        SetSelection(n);
-        return TRUE;
-    }
-}
+    // FIXME: back to base class for not supported value of bCase

 
 

-int wxComboBox::FindString(const wxString& s) const
-{

     int *pos_list = NULL;
     int count = 0;
     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)
     {
         int pos = pos_list[0] - 1;
         free(pos_list);
         return pos;
     }
     if (found && count > 0)
     {
         int pos = pos_list[0] - 1;
         free(pos_list);
         return pos;
     }

-    
-    return -1;
-}

 
 

-// Clipboard operations
-void wxComboBox::Copy()
-{
-    XmComboBoxCopy((Widget) m_mainWidget, CurrentTime);
-}
-
-void wxComboBox::Cut()
-{
-    XmComboBoxCut((Widget) m_mainWidget, CurrentTime);
-}
-
-void wxComboBox::Paste()
-{
-    XmComboBoxPaste((Widget) m_mainWidget);
-}
-
-void wxComboBox::SetEditable(bool WXUNUSED(editable))
-{
-    // TODO
-}
-
-void wxComboBox::SetInsertionPoint(long pos)
-{
-    XmComboBoxSetInsertionPosition ((Widget) m_mainWidget, (XmTextPosition) pos);
-}
-
-void wxComboBox::SetInsertionPointEnd()
-{
-    XmTextPosition pos = XmComboBoxGetLastPosition ((Widget) m_mainWidget);
-    XmComboBoxSetInsertionPosition ((Widget) m_mainWidget, (XmTextPosition) (pos + 1));
-}
-
-long wxComboBox::GetInsertionPoint() const
-{
-    return (long) XmComboBoxGetInsertionPosition ((Widget) m_mainWidget);
-}
-
-long wxComboBox::GetLastPosition() const
-{
-    return (long) XmComboBoxGetLastPosition ((Widget) m_mainWidget);
-}
-
-void wxComboBox::Replace(long from, long to, const wxString& value)
-{
-    XmComboBoxReplace ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,
-        (char*) (const char*) value);
-}
-
-void wxComboBox::Remove(long from, long to)
-{
-    XmComboBoxSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,
-                     (Time) 0);
-    XmComboBoxRemove ((Widget) m_mainWidget);
-}
-
-void wxComboBox::SetSelection(long from, long to)
-{
-    XmComboBoxSetSelection ((Widget) m_mainWidget, (XmTextPosition) from, (XmTextPosition) to,
-                     (Time) 0);
+    return wxNOT_FOUND;

 }
 
 void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
                           XmComboBoxSelectionCallbackStruct * cbs)
 {
     wxComboBox *item = (wxComboBox *) clientData;
 }
 
 void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
                           XmComboBoxSelectionCallbackStruct * cbs)
 {
     wxComboBox *item = (wxComboBox *) clientData;

-    
+

     switch (cbs->reason)
     {
     case XmCR_SINGLE_SELECT:
     case XmCR_BROWSE_SELECT:
         {
     switch (cbs->reason)
     {
     case XmCR_SINGLE_SELECT:
     case XmCR_BROWSE_SELECT:
         {

-            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;
+            wxCommandEvent event (wxEVT_COMMAND_COMBOBOX_SELECTED,
+                                  item->GetId());
+            event.SetInt(cbs->index - 1);
+            event.SetString( item->GetString ( event.GetInt() ) );
+            if ( item->HasClientObjectData() )
+                event.SetClientObject( item->GetClientObject(cbs->index - 1) );
+            else if ( item->HasClientUntypedData() )
+                event.SetClientData( item->GetClientData(cbs->index - 1) );
+            event.SetExtraLong(true);

             event.SetEventObject(item);
             item->ProcessCommand (event);
             break;
             event.SetEventObject(item);
             item->ProcessCommand (event);
             break;


@@ -302,9 +248,9 @@ void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
     case XmCR_VALUE_CHANGED:
         {
             wxCommandEvent event (wxEVT_COMMAND_TEXT_UPDATED, item->GetId());
     case XmCR_VALUE_CHANGED:
         {
             wxCommandEvent event (wxEVT_COMMAND_TEXT_UPDATED, item->GetId());

-            event.m_commandInt = -1;
-            //         event.m_commandString = item->GetValue();
-            event.m_extraLong = TRUE;
+            event.SetInt(-1);
+            event.SetString( item->GetValue() );
+            event.SetExtraLong(true);

             event.SetEventObject(item);
             item->ProcessCommand (event);
             break;
             event.SetEventObject(item);
             item->ProcessCommand (event);
             break;


@@ -327,8 +273,28 @@ void wxComboBox::ChangeBackgroundColour()
 
 void wxComboBox::ChangeForegroundColour()
 {
 
 void wxComboBox::ChangeForegroundColour()
 {

-    wxWindow::ChangeBackgroundColour();
+    wxWindow::ChangeForegroundColour();

 }
 
 }
 

-#endif
+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();
+}
+
+WXWidget wxComboBox::GetTextWidget() const
+{
+    return (WXWidget)XmComboBoxGetEditWidget((Widget) m_mainWidget);
+}
+
+#endif // XmVersion < 2000

 
 

+#endif // wxUSE_COMBOBOX