X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c698eae5a875ca973df44add1ad67ec69a5754ba..51e4e266702b0605ca3ab23983184edd7ec9e0aa:/src/motif/combobox.cpp?ds=sidebyside

diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp
index 8600650432..01ed1c3816 100644
--- a/src/motif/combobox.cpp
+++ b/src/motif/combobox.cpp
@@ -9,15 +9,19 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #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
@@ -93,6 +97,20 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     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()
 {
     DetachWidget((Widget) m_mainWidget); // Removes event handlers
@@ -155,10 +173,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;
@@ -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;