X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c698eae5a875ca973df44add1ad67ec69a5754ba..b7ba00e77a3f69941d6a2050e67bdfff38b3238e:/src/motif/combobox.cpp

diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp
index 8600650432..0c157e39ba 100644
--- a/src/motif/combobox.cpp
+++ b/src/motif/combobox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        combobox.cpp
+// Name:        src/motif/combobox.cpp
 // Purpose:     wxComboBox class
 // Author:      Julian Smart
 // Modified by:
@@ -9,15 +9,15 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "combobox.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #include "wx/setup.h"
 
 #if wxUSE_COMBOBOX
 
 #include "wx/combobox.h"
+#include "wx/arrstr.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint
@@ -49,7 +49,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
                         const wxString& name)
 {
     if( !CreateControl( parent, id, pos, size, style, validator, name ) )
-        return FALSE;
+        return false;
 
     m_noStrings = n;
 
@@ -79,7 +79,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
 
     SetValue(value);
 
-    ChangeFont(FALSE);
+    ChangeFont(false);
 
     XtAddCallback (buttonWidget, XmNselectionCallback, (XtCallbackProc) wxComboBoxCallback,
         (XtPointer) this);
@@ -90,7 +90,21 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
 
     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()
@@ -102,7 +116,9 @@ wxComboBox::~wxComboBox()
         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);
@@ -123,14 +139,14 @@ wxString wxComboBox::GetValue() const
 
 void wxComboBox::SetValue(const wxString& value)
 {
-    m_inSetValue = TRUE;
+    m_inSetValue = true;
     if( !value.empty() )
         XmComboBoxSetString( (Widget)m_mainWidget,
                              wxConstCast(value.c_str(), char) );
-    m_inSetValue = FALSE;
+    m_inSetValue = false;
 }
 
-void wxComboBox::SetString(int n, const wxString& s)
+void wxComboBox::SetString(int WXUNUSED(n), const wxString& WXUNUSED(s))
 {
     wxFAIL_MSG( wxT("wxComboBox::SetString only implemented for Motif 2.0") );
 }
@@ -155,10 +171,8 @@ int wxComboBox::DoInsert(const wxString& item, int pos)
 
     wxXmString str( item.c_str() );
     XmComboBoxAddItem((Widget) m_mainWidget, str(), pos+1);
-#ifndef __VMS
-   //FIX me for VMS : no intance for insert function to overload
-   m_stringList.Insert(pos, item);
-#endif
+    wxChar* copy = wxStrcpy(new wxChar[item.length() + 1], item.c_str());
+    m_stringList.Insert(pos, copy);
     m_noStrings ++;
 
     return pos;
@@ -210,8 +224,10 @@ wxString wxComboBox::GetString(int n) const
         return wxEmptyString;
 }
 
-int wxComboBox::FindString(const wxString& s) const
+int wxComboBox::FindString(const wxString& s, bool WXUNUSED(bCase)) const
 {
+    // FIXME: back to base class for not supported value of bCase
+
     int *pos_list = NULL;
     int count = 0;
     wxXmString text( s );
@@ -225,7 +241,7 @@ int wxComboBox::FindString(const wxString& s) const
         return pos;
     }
 
-    return -1;
+    return wxNOT_FOUND;
 }
 
 // Clipboard operations
@@ -265,9 +281,9 @@ long wxComboBox::GetInsertionPoint() const
     return (long) XmComboBoxGetInsertionPosition ((Widget) m_mainWidget);
 }
 
-long wxComboBox::GetLastPosition() const
+wxTextPos wxComboBox::GetLastPosition() const
 {
-    return (long) XmComboBoxGetLastPosition ((Widget) m_mainWidget);
+    return (wxTextPos) XmComboBoxGetLastPosition ((Widget) m_mainWidget);
 }
 
 void wxComboBox::Replace(long from, long to, const wxString& value)
@@ -302,13 +318,13 @@ void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
         {
             wxCommandEvent event (wxEVT_COMMAND_COMBOBOX_SELECTED,
                                   item->GetId());
-            event.m_commandInt = cbs->index - 1;
-            event.m_commandString = item->GetString (event.m_commandInt);
+            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.m_extraLong = TRUE;
+            event.SetExtraLong(true);
             event.SetEventObject(item);
             item->ProcessCommand (event);
             break;
@@ -316,9 +332,9 @@ void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
     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;