Minor header cleaning.

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

diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp
index 49a8f87dbe05516d7cf3564d86078873da4e1c32..de2b16e9b11252cd95407462bb3cc93b8764da7e 100644 (file)
--- a/src/motif/combobox.cpp
+++ b/src/motif/combobox.cpp
@@ -15,7 +15,10 @@
 #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


@@ -49,7 +52,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     if( !CreateControl( parent, id, pos, size, style, validator, name ) )
         return false;
 
     if( !CreateControl( parent, id, pos, size, style, validator, name ) )
         return false;
 

-    m_noStrings = (size_t)n;
+    m_noStrings = n;

 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 


@@ -144,7 +147,7 @@ void wxComboBox::SetValue(const wxString& value)
     m_inSetValue = false;
 }
 
     m_inSetValue = false;
 }
 

-void wxComboBox::SetString(int WXUNUSED(n), const wxString& WXUNUSED(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,7 +162,7 @@ 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(IsValidInsert(pos), -1, wxT("invalid index"));
 {
     wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
     wxCHECK_MSG(IsValidInsert(pos), -1, wxT("invalid index"));


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