X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f94a81c084696210418b8709e8ab649a18465fa6..80f218424f34e2ded439cc23631ea1b74c72f732:/src/motif/choice.cpp

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index af308732cf..2ffba977d6 100644
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -12,15 +12,13 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
+#if wxUSE_CHOICE
+
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #define XtParent XTPARENT
 #endif
 
-#include "wx/defs.h"
-
-#if wxUSE_CHOICE
-
 #include "wx/choice.h"
 #include "wx/utils.h"
 #include "wx/arrstr.h"
@@ -192,7 +190,7 @@ static inline wxChar* MYcopystring(const wxChar* s)
 int wxChoice::DoInsert(const wxString& item, int pos)
 {
 #ifndef XmNpositionIndex
-    wxCHECK_MSG( pos == GetCount(), -1, wxT("insert not implemented"));
+    wxCHECK_MSG( (size_t)pos == GetCount(), -1, wxT("insert not implemented"));
 #endif
     Widget w = XtVaCreateManagedWidget (wxStripMenuCodes(item),
 #if wxUSE_GADGETS
@@ -238,7 +236,7 @@ int wxChoice::DoInsert(const wxString& item, int pos)
 
 int wxChoice::DoAppend(const wxString& item)
 {
-    return DoInsert(item, GetCount());
+    return DoInsert(item, (int)GetCount());
 }
 
 void wxChoice::Delete(int n)
@@ -352,7 +350,7 @@ void wxChoice::SetColumns(int n)
 {
     if (n<1) n = 1 ;
 
-    short numColumns = n ;
+    short numColumns = (short)n ;
     Arg args[3];
 
     XtSetArg(args[0], XmNnumColumns, numColumns);
@@ -497,7 +495,7 @@ void wxChoice::ChangeForegroundColour()
         wxDoChangeForegroundColour(m_widgetArray[i], m_foregroundColour);
 }
 
-int wxChoice::GetCount() const
+size_t wxChoice::GetCount() const
 {
     return m_noStrings;
 }