X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..129b8b1a215fc1fcc1b9f06daa0aeaf22bbce614:/src/motif/combobox.cpp?ds=sidebyside

diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp
index 9e052ac94e..313dde7628 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,19 +9,16 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#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"
+
+#ifndef WX_PRECOMP
+    #include "wx/arrstr.h"
+#endif
 
 #ifdef __VMS__
 #pragma message disable nosimpint
@@ -53,7 +50,8 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
                         const wxString& name)
 {
     if( !CreateControl( parent, id, pos, size, style, validator, name ) )
-        return FALSE;
+        return false;
+    PreCreation();
 
     m_noStrings = n;
 
@@ -83,18 +81,15 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
 
     SetValue(value);
 
-    ChangeFont(FALSE);
-
     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);
 
-    ChangeBackgroundColour();
-
-    return TRUE;
+    return true;
 }
 
 bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
@@ -107,7 +102,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
                         const wxString& name)
 {
     wxCArrayString chs(choices);
-    return Create(parent, id, value, pos, size, chs.GetCount(), 
+    return Create(parent, id, value, pos, size, chs.GetCount(),
                   chs.GetStrings(), style, validator, name);
 }
 
@@ -120,7 +115,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);
@@ -141,14 +138,15 @@ wxString wxComboBox::GetValue() const
 
 void wxComboBox::SetValue(const wxString& value)
 {
-    m_inSetValue = TRUE;
     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") );
 }
@@ -163,10 +161,10 @@ int wxComboBox::DoAppend(const wxString& item)
     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((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
+    wxCHECK_MSG(IsValidInsert(pos), -1, wxT("invalid index"));
 
     if (pos == GetCount())
         return DoAppend(item);
@@ -180,7 +178,7 @@ int wxComboBox::DoInsert(const wxString& item, int pos)
     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);
@@ -217,7 +215,7 @@ int wxComboBox::GetSelection (void) const
         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)
@@ -226,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 );
@@ -241,7 +241,7 @@ int wxComboBox::FindString(const wxString& s) const
         return pos;
     }
 
-    return -1;
+    return wxNOT_FOUND;
 }
 
 // Clipboard operations
@@ -281,16 +281,16 @@ 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)
 {
     XmComboBoxReplace ((Widget) m_mainWidget, (XmTextPosition) from,
                        (XmTextPosition) to,
-                       wxConstCast(value.c_str(), char));
+                       value.char_str());
 }
 
 void wxComboBox::Remove(long from, long to)
@@ -318,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;
@@ -332,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;