Minor header cleaning.

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

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index af308732cfdeb8929fa14669dc04a182bb03e5f2..585c467600427ab9b8ebef615139340c1ef19e9c 100644 (file)
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -12,18 +12,19 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_CHOICE
+

 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #define XtParent XTPARENT
 #endif
 
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #define XtParent XTPARENT
 #endif
 

-#include "wx/defs.h"
-
-#if wxUSE_CHOICE
-

 #include "wx/choice.h"
 #include "wx/choice.h"

-#include "wx/utils.h"
-#include "wx/arrstr.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/arrstr.h"
+#endif

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -189,12 +190,12 @@ static inline wxChar* MYcopystring(const wxChar* s)
     return wxStrcpy(copy, s);
 }
 
     return wxStrcpy(copy, s);
 }
 

-int wxChoice::DoInsert(const wxString& item, int pos)
+int wxChoice::DoInsert(const wxString& item, unsigned int pos)

 {
 #ifndef XmNpositionIndex
     wxCHECK_MSG( pos == GetCount(), -1, wxT("insert not implemented"));
 #endif
 {
 #ifndef XmNpositionIndex
     wxCHECK_MSG( pos == GetCount(), -1, wxT("insert not implemented"));
 #endif

-    Widget w = XtVaCreateManagedWidget (wxStripMenuCodes(item),
+    Widget w = XtVaCreateManagedWidget (GetLabelText(item),

 #if wxUSE_GADGETS
         xmPushButtonGadgetClass, (Widget) m_menuWidget,
 #else
 #if wxUSE_GADGETS
         xmPushButtonGadgetClass, (Widget) m_menuWidget,
 #else


@@ -241,7 +242,7 @@ int wxChoice::DoAppend(const wxString& item)
     return DoInsert(item, GetCount());
 }
 
     return DoInsert(item, GetCount());
 }
 

-void wxChoice::Delete(int n)
+void wxChoice::Delete(unsigned int n)

 {
     Widget w = (Widget)m_widgetArray[n];
     XtRemoveCallback(w, XmNactivateCallback, (XtCallbackProc)wxChoiceCallback,
 {
     Widget w = (Widget)m_widgetArray[n];
     XtRemoveCallback(w, XmNactivateCallback, (XtCallbackProc)wxChoiceCallback,


@@ -251,13 +252,13 @@ void wxChoice::Delete(int n)
     m_clientDataDict.Delete(n, HasClientObjectData());
 
     XtDestroyWidget(w);
     m_clientDataDict.Delete(n, HasClientObjectData());
 
     XtDestroyWidget(w);

-    m_noStrings --;
+    m_noStrings--;

 }
 
 void wxChoice::Clear()
 {
     m_stringList.Clear ();
 }
 
 void wxChoice::Clear()
 {
     m_stringList.Clear ();

-    size_t i;
+    unsigned int i;

     for (i = 0; i < m_noStrings; i++)
     {
         XtRemoveCallback((Widget) m_widgetArray[i],
     for (i = 0; i < m_noStrings; i++)
     {
         XtRemoveCallback((Widget) m_widgetArray[i],


@@ -339,7 +340,7 @@ void wxChoice::SetSelection(int n)
     m_inSetValue = false;
 }
 
     m_inSetValue = false;
 }
 

-wxString wxChoice::GetString(int n) const
+wxString wxChoice::GetString(unsigned int n) const

 {
     wxStringList::compatibility_iterator node = m_stringList.Item(n);
     if (node)
 {
     wxStringList::compatibility_iterator node = m_stringList.Item(n);
     if (node)


@@ -352,7 +353,7 @@ void wxChoice::SetColumns(int n)
 {
     if (n<1) n = 1 ;
 
 {
     if (n<1) n = 1 ;
 

-    short numColumns = n ;
+    short numColumns = (short)n ;

     Arg args[3];
 
     XtSetArg(args[0], XmNnumColumns, numColumns);
     Arg args[3];
 
     XtSetArg(args[0], XmNnumColumns, numColumns);


@@ -386,7 +387,7 @@ void wxChoice::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 
     if (width > -1)
     {
 
     if (width > -1)
     {

-        size_t i;
+        unsigned int i;

         for (i = 0; i < m_noStrings; i++)
             XtVaSetValues ((Widget) m_widgetArray[i],
                            XmNwidth, actualWidth,
         for (i = 0; i < m_noStrings; i++)
             XtVaSetValues ((Widget) m_widgetArray[i],
                            XmNwidth, actualWidth,


@@ -397,7 +398,7 @@ void wxChoice::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     if (height > -1)
     {
 #if 0
     if (height > -1)
     {
 #if 0

-        size_t i;
+        unsigned int i;

         for (i = 0; i < m_noStrings; i++)
             XtVaSetValues ((Widget) m_widgetArray[i],
                            XmNheight, actualHeight,
         for (i = 0; i < m_noStrings; i++)
             XtVaSetValues ((Widget) m_widgetArray[i],
                            XmNheight, actualHeight,


@@ -464,7 +465,7 @@ void wxChoice::ChangeFont(bool keepOriginalSize)
                        fontTag, m_font.GetFontTypeC(dpy),
                        NULL);
 
                        fontTag, m_font.GetFontTypeC(dpy),
                        NULL);
 

-        for( size_t i = 0; i < m_noStrings; ++i )
+        for( unsigned int i = 0; i < m_noStrings; ++i )

             XtVaSetValues( (Widget)m_widgetArray[i],
                            fontTag, m_font.GetFontTypeC(dpy),
                            NULL );
             XtVaSetValues( (Widget)m_widgetArray[i],
                            fontTag, m_font.GetFontTypeC(dpy),
                            NULL );


@@ -482,7 +483,7 @@ void wxChoice::ChangeBackgroundColour()
     wxDoChangeBackgroundColour(m_formWidget, m_backgroundColour);
     wxDoChangeBackgroundColour(m_buttonWidget, m_backgroundColour);
     wxDoChangeBackgroundColour(m_menuWidget, m_backgroundColour);
     wxDoChangeBackgroundColour(m_formWidget, m_backgroundColour);
     wxDoChangeBackgroundColour(m_buttonWidget, m_backgroundColour);
     wxDoChangeBackgroundColour(m_menuWidget, m_backgroundColour);

-    size_t i;
+    unsigned int i;

     for (i = 0; i < m_noStrings; i++)
         wxDoChangeBackgroundColour(m_widgetArray[i], m_backgroundColour);
 }
     for (i = 0; i < m_noStrings; i++)
         wxDoChangeBackgroundColour(m_widgetArray[i], m_backgroundColour);
 }


@@ -492,38 +493,38 @@ void wxChoice::ChangeForegroundColour()
     wxDoChangeForegroundColour(m_formWidget, m_foregroundColour);
     wxDoChangeForegroundColour(m_buttonWidget, m_foregroundColour);
     wxDoChangeForegroundColour(m_menuWidget, m_foregroundColour);
     wxDoChangeForegroundColour(m_formWidget, m_foregroundColour);
     wxDoChangeForegroundColour(m_buttonWidget, m_foregroundColour);
     wxDoChangeForegroundColour(m_menuWidget, m_foregroundColour);

-    size_t i;
+    unsigned int i;

     for (i = 0; i < m_noStrings; i++)
         wxDoChangeForegroundColour(m_widgetArray[i], m_foregroundColour);
 }
 
     for (i = 0; i < m_noStrings; i++)
         wxDoChangeForegroundColour(m_widgetArray[i], m_foregroundColour);
 }
 

-int wxChoice::GetCount() const
+unsigned int wxChoice::GetCount() const

 {
     return m_noStrings;
 }
 
 {
     return m_noStrings;
 }
 

-void wxChoice::DoSetItemClientData(int n, void* clientData)
+void wxChoice::DoSetItemClientData(unsigned int n, void* clientData)

 {
     m_clientDataDict.Set(n, (wxClientData*)clientData, false);
 }
 
 {
     m_clientDataDict.Set(n, (wxClientData*)clientData, false);
 }
 

-void* wxChoice::DoGetItemClientData(int n) const
+void* wxChoice::DoGetItemClientData(unsigned int n) const

 {
     return (void*)m_clientDataDict.Get(n);
 }
 
 {
     return (void*)m_clientDataDict.Get(n);
 }
 

-void wxChoice::DoSetItemClientObject(int n, wxClientData* clientData)
+void wxChoice::DoSetItemClientObject(unsigned int n, wxClientData* clientData)

 {
     // don't delete, wxItemContainer does that for us
     m_clientDataDict.Set(n, clientData, false);
 }
 
 {
     // don't delete, wxItemContainer does that for us
     m_clientDataDict.Set(n, clientData, false);
 }
 

-wxClientData* wxChoice::DoGetItemClientObject(int n) const
+wxClientData* wxChoice::DoGetItemClientObject(unsigned int n) const

 {
     return m_clientDataDict.Get(n);
 }
 
 {
     return m_clientDataDict.Get(n);
 }
 

-void wxChoice::SetString(int WXUNUSED(n), const wxString& WXUNUSED(s))
+void wxChoice::SetString(unsigned int WXUNUSED(n), const wxString& WXUNUSED(s))

 {
     wxFAIL_MSG( wxT("wxChoice::SetString not implemented") );
 }
 {
     wxFAIL_MSG( wxT("wxChoice::SetString not implemented") );
 }