Updating with Vadim's API changes.

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

diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp
index 8600650432f81f5144f84b91c10ddb4608483459..de2b16e9b11252cd95407462bb3cc93b8764da7e 100644 (file)
--- 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:
 // Purpose:     wxComboBox class
 // Author:      Julian Smart
 // Modified by:


@@ -9,16 +9,17 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "combobox.h"
-#endif
-
-#include "wx/setup.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

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

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

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


@@ -49,7 +50,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
                         const wxString& name)
 {
     if( !CreateControl( parent, id, pos, size, style, validator, name ) )
                         const wxString& name)
 {
     if( !CreateControl( parent, id, pos, size, style, validator, name ) )

-        return FALSE;
+        return false;

 
     m_noStrings = n;
 
 
     m_noStrings = n;
 


@@ -79,7 +80,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
 
     SetValue(value);
 
 
     SetValue(value);
 

-    ChangeFont(FALSE);
+    ChangeFont(false);

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


@@ -90,7 +91,21 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
 
     ChangeBackgroundColour();
 
 
     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,7 +117,9 @@ wxComboBox::~wxComboBox()
         m_clientDataDict.DestroyData();
 }
 
         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);


@@ -123,14 +140,14 @@ wxString wxComboBox::GetValue() const
 
 void wxComboBox::SetValue(const wxString& value)
 {
 
 void wxComboBox::SetValue(const wxString& value)
 {

-    m_inSetValue = TRUE;
+    m_inSetValue = true;

     if( !value.empty() )
         XmComboBoxSetString( (Widget)m_mainWidget,
                              wxConstCast(value.c_str(), char) );
     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(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") );
 }


@@ -145,26 +162,24 @@ int wxComboBox::DoAppend(const wxString& item)
     return GetCount() - 1;
 }
 
     return GetCount() - 1;
 }
 

-int wxComboBox::DoInsert(const wxString& item, int pos)
+int wxComboBox::DoInsert(const wxString& item, unsigned int pos)

 {
     wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
 {
     wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));

-    wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
+    wxCHECK_MSG(IsValidInsert(pos), -1, wxT("invalid index"));

 
     if (pos == GetCount())
         return DoAppend(item);
 
     wxXmString str( item.c_str() );
     XmComboBoxAddItem((Widget) m_mainWidget, str(), pos+1);
 
     if (pos == GetCount())
         return DoAppend(item);
 
     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;
 }
 
     m_noStrings ++;
 
     return pos;
 }
 

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

 {
     XmComboBoxDeletePos((Widget) m_mainWidget, n+1);
     wxStringList::Node *node = m_stringList.Item(n);
 {
     XmComboBoxDeletePos((Widget) m_mainWidget, n+1);
     wxStringList::Node *node = m_stringList.Item(n);


@@ -201,7 +216,7 @@ 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)
 {
     wxStringList::Node *node = m_stringList.Item(n);
     if (node)


@@ -210,8 +225,10 @@ wxString wxComboBox::GetString(int n) const
         return wxEmptyString;
 }
 
         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 );
     int *pos_list = NULL;
     int count = 0;
     wxXmString text( s );


@@ -225,7 +242,7 @@ int wxComboBox::FindString(const wxString& s) const
         return pos;
     }
 
         return pos;
     }
 

-    return -1;
+    return wxNOT_FOUND;

 }
 
 // Clipboard operations
 }
 
 // Clipboard operations


@@ -265,9 +282,9 @@ long wxComboBox::GetInsertionPoint() const
     return (long) XmComboBoxGetInsertionPosition ((Widget) m_mainWidget);
 }
 
     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)
 }
 
 void wxComboBox::Replace(long from, long to, const wxString& value)


@@ -302,13 +319,13 @@ void  wxComboBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
         {
             wxCommandEvent event (wxEVT_COMMAND_COMBOBOX_SELECTED,
                                   item->GetId());
         {
             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) );
             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;
             event.SetEventObject(item);
             item->ProcessCommand (event);
             break;


@@ -316,9 +333,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;