[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index fbc5fdc03ededafbb85e27ab0c00e1ded8e99fc8..bae8a4417178ab0339266aa75671e9bf7e48c0c5 100644 (file)
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -6,13 +6,16 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "choice.h"
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "choice.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

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


@@ -20,6 +23,8 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

+#if wxUSE_CHOICE
+

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


@@ -68,7 +73,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
                       const wxString& name)
 {
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
                       const wxString& name)
 {
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )

-        return FALSE;
+        return false;

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


@@ -135,13 +140,13 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
 
     XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
 
 
     XtVaSetValues((Widget) m_formWidget, XmNresizePolicy, XmRESIZE_NONE, NULL);
 

-    ChangeFont(FALSE);
+    ChangeFont(false);

     ChangeBackgroundColour();
 
     AttachWidget (parent, m_buttonWidget, m_formWidget,
                   pos.x, pos.y, bestSize.x, bestSize.y);
 
     ChangeBackgroundColour();
 
     AttachWidget (parent, m_buttonWidget, m_formWidget,
                   pos.x, pos.y, bestSize.x, bestSize.y);
 

-    return TRUE;
+    return true;

 }
 
 bool wxChoice::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxChoice::Create(wxWindow *parent, wxWindowID id,


@@ -223,7 +228,7 @@ int wxChoice::DoAppend(const wxString& item)
 
 int wxChoice::DoInsert(const wxString& item, int pos)
 {
 
 int wxChoice::DoInsert(const wxString& item, int pos)
 {

-    wxCHECK_MSG(FALSE, -1, wxT("insert not implemented"));
+    wxCHECK_MSG(false, -1, wxT("insert not implemented"));

 
 //    wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
 //    if (pos == GetCount()) return DoAppend(item);
 
 //    wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
 //    if (pos == GetCount()) return DoAppend(item);


@@ -297,7 +302,7 @@ int wxChoice::GetSelection() const
 
 void wxChoice::SetSelection(int n)
 {
 
 void wxChoice::SetSelection(int n)
 {

-    m_inSetValue = TRUE;
+    m_inSetValue = true;

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


@@ -324,7 +329,7 @@ void wxChoice::SetSelection(int n)
             XmNmenuHistory, (Widget) m_widgetArray[n], NULL);
 #endif
     }
             XmNmenuHistory, (Widget) m_widgetArray[n], NULL);
 #endif
     }

-    m_inSetValue = FALSE;
+    m_inSetValue = false;

 }
 
 int wxChoice::FindString(const wxString& s) const
 }
 
 int wxChoice::FindString(const wxString& s) const


@@ -339,7 +344,7 @@ int wxChoice::FindString(const wxString& s) const
         i++;
     }
 
         i++;
     }
 

-    return -1;
+    return wxNOT_FOUND;

 }
 
 wxString wxChoice::GetString(int n) const
 }
 
 wxString wxChoice::GetString(int n) const


@@ -436,8 +441,8 @@ void wxChoiceCallback (Widget w, XtPointer clientData, XtPointer WXUNUSED(ptr))
         {
             wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, item->GetId());
             event.SetEventObject(item);
         {
             wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, item->GetId());
             event.SetEventObject(item);

-            event.m_commandInt = n;
-            event.m_commandString = item->GetStrings().Item(n)->GetData();
+            event.SetInt(n);
+            event.SetString( item->GetStrings().Item(n)->GetData() );

             if ( item->HasClientObjectData() )
                 event.SetClientObject( item->GetClientObject(n) );
             else if ( item->HasClientUntypedData() )
             if ( item->HasClientObjectData() )
                 event.SetClientObject( item->GetClientObject(n) );
             else if ( item->HasClientUntypedData() )


@@ -468,11 +473,11 @@ void wxChoice::ChangeFont(bool keepOriginalSize)
             XtVaSetValues( (Widget)m_widgetArray[i],
                            fontTag, fontType,
                            NULL );
             XtVaSetValues( (Widget)m_widgetArray[i],
                            fontTag, fontType,
                            NULL );

-        
+

         GetSize(& width1, & height1);
         if (keepOriginalSize && (width != width1 || height != height1))
         {
         GetSize(& width1, & height1);
         if (keepOriginalSize && (width != width1 || height != height1))
         {

-            SetSize(-1, -1, width, height);
+            SetSize(wxDefaultCoord, wxDefaultCoord, width, height);

         }
     }
 }
         }
     }
 }


@@ -504,7 +509,7 @@ int wxChoice::GetCount() const
 
 void wxChoice::DoSetItemClientData(int n, void* clientData)
 {
 
 void wxChoice::DoSetItemClientData(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(int n) const


@@ -515,7 +520,7 @@ void* wxChoice::DoGetItemClientData(int n) const
 void wxChoice::DoSetItemClientObject(int n, wxClientData* clientData)
 {
     // don't delete, wxItemContainer does that for us
 void wxChoice::DoSetItemClientObject(int n, wxClientData* clientData)
 {
     // don't delete, wxItemContainer does that for us

-    m_clientDataDict.Set(n, clientData, FALSE);
+    m_clientDataDict.Set(n, clientData, false);

 }
 
 wxClientData* wxChoice::DoGetItemClientObject(int n) const
 }
 
 wxClientData* wxChoice::DoGetItemClientObject(int n) const


@@ -554,3 +559,5 @@ wxSize wxChoice::DoGetBestSize() const
     return wxSize( ( items.x ? items.x + WIDTH_OVERHEAD : 120 ),
                      items.y + HEIGHT_OVERHEAD );
 }
     return wxSize( ( items.x ? items.x + WIDTH_OVERHEAD : 120 ),
                      items.y + HEIGHT_OVERHEAD );
 }

+
+#endif // wxUSE_CHOICE