Fix horizontal mouse wheel scrolling in wxGTK.

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

diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp
index 2d8be1fbbb13f676d897b2322a634e0000fca7b1..cf85010c4c13096ee9f465b1711c6e562a5dc77b 100644 (file)
--- a/src/motif/combobox.cpp
+++ b/src/motif/combobox.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,12 +11,13 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/setup.h"
-

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

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

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -37,8 +37,6 @@
 void  wxComboBoxCallback (Widget w, XtPointer clientData,
                           XmComboBoxSelectionCallbackStruct * cbs);
 
 void  wxComboBoxCallback (Widget w, XtPointer clientData,
                           XmComboBoxSelectionCallbackStruct * cbs);
 

-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-

 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,


@@ -50,8 +48,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
 {
     if( !CreateControl( parent, id, pos, size, style, validator, name ) )
         return false;
 {
     if( !CreateControl( parent, id, pos, size, style, validator, name ) )
         return false;

-
-    m_noStrings = n;
+    PreCreation();

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


@@ -70,7 +67,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     {
         wxXmString str( choices[i] );
         XmComboBoxAddItem(buttonWidget, str(), 0);
     {
         wxXmString str( choices[i] );
         XmComboBoxAddItem(buttonWidget, str(), 0);

-        m_stringList.Add(choices[i]);
+        m_stringArray.Add(choices[i]);

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


@@ -79,17 +76,14 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
 
     SetValue(value);
 
 
     SetValue(value);
 

-    ChangeFont(false);
-

     XtAddCallback (buttonWidget, XmNselectionCallback, (XtCallbackProc) wxComboBoxCallback,
         (XtPointer) this);
     XtAddCallback (buttonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxComboBoxCallback,
         (XtPointer) this);
 
     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;
 }
 


@@ -112,16 +106,18 @@ 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)
+void wxComboBox::DoSetSize(int x, int y,
+                           int width, int WXUNUSED(height),
+                           int sizeFlags)

 {
     // Necessary so it doesn't call wxChoice::SetSize
     wxWindow::DoSetSize(x, y, width, DoGetBestSize().y, sizeFlags);
 }
 
 {
     // Necessary so it doesn't call wxChoice::SetSize
     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);


@@ -134,69 +130,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.empty() )
     if( !value.empty() )

-        XmComboBoxSetString( (Widget)m_mainWidget,
-                             wxConstCast(value.c_str(), char) );
-    m_inSetValue = false;
+    {
+        m_inSetValue = true;
+        XmComboBoxSetString((Widget)m_mainWidget, value.char_str());
+        m_inSetValue = false;
+    }

 }
 
 }
 

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

 {
     wxFAIL_MSG( wxT("wxComboBox::SetString only implemented for Motif 2.0") );
 }
 
 {
     wxFAIL_MSG( wxT("wxComboBox::SetString only implemented for Motif 2.0") );
 }
 

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

 {
 {

-    wxXmString str( item.c_str() );
-    XmComboBoxAddItem((Widget) m_mainWidget, str(), 0);
-    m_stringList.Add(item);
-    m_noStrings ++;
-
-    return GetCount() - 1;
-}
-
-int wxComboBox::DoInsert(const wxString& item, int pos)
-{
-    wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
-    wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
-
-    if (pos == GetCount())
-        return DoAppend(item);
+    const unsigned int numItems = items.GetCount();

 
 

-    wxXmString str( item.c_str() );
-    XmComboBoxAddItem((Widget) m_mainWidget, str(), pos+1);
-    wxChar* copy = wxStrcpy(new wxChar[item.length() + 1], item.c_str());
-    m_stringList.Insert(pos, copy);
-    m_noStrings ++;
+    AllocClientData(numItems);
+    for( unsigned int i = 0; i < numItems; ++i, ++pos )
+    {
+        wxXmString str( items[i].c_str() );
+        XmComboBoxAddItem((Widget) m_mainWidget, str(), GetMotifPosition(pos));
+        m_stringArray.Insert(items[i], pos);
+        InsertNewItemClientData(pos, clientData, i, type);
+    }

 
 

-    return pos;
+    return pos - 1;

 }
 
 }
 

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

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

-    wxStringList::Node *node = m_stringList.Item(n);
-    if (node)
-    {
-        delete[] node->GetData();
-        delete node;
-    }
-    m_clientDataDict.Delete(n, HasClientObjectData());
-    m_noStrings--;
+    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();

 
 

-    if ( HasClientObjectData() )
-        m_clientDataDict.DestroyData();
-    m_noStrings = 0;
+    wxControlWithItems::DoClear();

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


@@ -213,16 +196,12 @@ int wxComboBox::GetSelection (void) const
         return sel - 1;
 }
 
         return sel - 1;
 }
 

-wxString wxComboBox::GetString(int n) const
+wxString wxComboBox::GetString(unsigned int n) const

 {
 {

-    wxStringList::Node *node = m_stringList.Item(n);
-    if (node)
-        return wxString(node->GetData ());
-    else
-        return wxEmptyString;
+    return m_stringArray[n];

 }
 
 }
 

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

 {
     // FIXME: back to base class for not supported value of bCase
 
 {
     // FIXME: back to base class for not supported value of bCase
 


@@ -242,68 +221,6 @@ int wxComboBox::FindString(const wxString& s, bool bCase) const
     return wxNOT_FOUND;
 }
 
     return wxNOT_FOUND;
 }
 

-// 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);
-}
-
-wxTextPos wxComboBox::GetLastPosition() const
-{
-    return (wxTextPos) XmComboBoxGetLastPosition ((Widget) m_mainWidget);
-}
-
-void wxComboBox::Replace(long from, long to, const wxString& value)
-{
-    XmComboBoxReplace ((Widget) m_mainWidget, (XmTextPosition) from,
-                       (XmTextPosition) to,
-                       wxConstCast(value.c_str(), char));
-}
-
-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);
-}
-

 void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
                           XmComboBoxSelectionCallbackStruct * cbs)
 {
 void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
                           XmComboBoxSelectionCallbackStruct * cbs)
 {


@@ -314,7 +231,7 @@ void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
     case XmCR_SINGLE_SELECT:
     case XmCR_BROWSE_SELECT:
         {
     case XmCR_SINGLE_SELECT:
     case XmCR_BROWSE_SELECT:
         {

-            wxCommandEvent event (wxEVT_COMMAND_COMBOBOX_SELECTED,
+            wxCommandEvent event (wxEVT_COMBOBOX,

                                   item->GetId());
             event.SetInt(cbs->index - 1);
             event.SetString( item->GetString ( event.GetInt() ) );
                                   item->GetId());
             event.SetInt(cbs->index - 1);
             event.SetString( item->GetString ( event.GetInt() ) );


@@ -329,7 +246,7 @@ void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
         }
     case XmCR_VALUE_CHANGED:
         {
         }
     case XmCR_VALUE_CHANGED:
         {

-            wxCommandEvent event (wxEVT_COMMAND_TEXT_UPDATED, item->GetId());
+            wxCommandEvent event (wxEVT_TEXT, item->GetId());

             event.SetInt(-1);
             event.SetString( item->GetValue() );
             event.SetExtraLong(true);
             event.SetInt(-1);
             event.SetString( item->GetValue() );
             event.SetExtraLong(true);


@@ -372,6 +289,11 @@ wxSize wxComboBox::DoGetBestSize() const
         return wxWindow::DoGetBestSize();
 }
 
         return wxWindow::DoGetBestSize();
 }
 

+WXWidget wxComboBox::GetTextWidget() const
+{
+    return (WXWidget)XmComboBoxGetEditWidget((Widget) m_mainWidget);
+}
+

 #endif // XmVersion < 2000
 
 #endif // wxUSE_COMBOBOX
 #endif // XmVersion < 2000
 
 #endif // wxUSE_COMBOBOX