Warning fix.

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

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


@@ -51,7 +49,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 = n;
+    m_noStrings = (size_t)n;

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


@@ -116,7 +114,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 +144,7 @@ void wxComboBox::SetValue(const wxString& value)
     m_inSetValue = false;
 }
 
     m_inSetValue = false;
 }
 

-void wxComboBox::SetString(int n, const wxString& s)
+void wxComboBox::SetString(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") );
 }


@@ -162,7 +162,7 @@ int wxComboBox::DoAppend(const wxString& item)
 int wxComboBox::DoInsert(const wxString& item, int pos)
 {
     wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
 int wxComboBox::DoInsert(const wxString& item, 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);
 
     if (pos == GetCount())
         return DoAppend(item);


@@ -222,7 +222,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