Renamed wxDataViewCell to wxDataViewRenderer since the

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

diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp
index 2d8be1fbbb13f676d897b2322a634e0000fca7b1..de2b16e9b11252cd95407462bb3cc93b8764da7e 100644 (file)
--- a/src/motif/combobox.cpp
+++ b/src/motif/combobox.cpp
@@ -12,12 +12,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


@@ -116,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);


@@ -144,7 +147,7 @@ void wxComboBox::SetValue(const wxString& value)
     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") );
 }


@@ -159,10 +162,10 @@ 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);
 
     if (pos == GetCount())
         return DoAppend(item);


@@ -176,7 +179,7 @@ int wxComboBox::DoInsert(const wxString& item, int pos)
     return 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);
 {
     XmComboBoxDeletePos((Widget) m_mainWidget, n+1);
     wxStringList::Node *node = m_stringList.Item(n);


@@ -213,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)


@@ -222,7 +225,7 @@ wxString wxComboBox::GetString(int n) const
         return wxEmptyString;
 }
 
         return wxEmptyString;
 }
 

-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