use unsgined int instead of int for 1 bit bitfields (SGI CC warning fix)

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

diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp
index a88b74149d5b8a07bc9e37145f7659ce460f2e3a..4219682a390fdf21c8ea0c12dea91bdc2c2e207c 100644 (file)
--- a/src/motif/listbox.cpp
+++ b/src/motif/listbox.cpp
@@ -9,10 +9,13 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "listbox.h"
 #endif
 
     #pragma implementation "listbox.h"
 #endif
 

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

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


@@ -23,6 +26,7 @@
 #include "wx/dynarray.h"
 #include "wx/log.h"
 #include "wx/utils.h"
 #include "wx/dynarray.h"
 #include "wx/log.h"
 #include "wx/utils.h"

+#include "wx/arrstr.h"

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


@@ -85,19 +89,13 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 {
     if( !wxControl::CreateControl( parent, id, pos, size, style,
                                    validator, name ) )
 {
     if( !wxControl::CreateControl( parent, id, pos, size, style,
                                    validator, name ) )

-        return FALSE;
+        return false;

 
     m_noItems = n;
     m_backgroundColour = * wxWHITE;
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     m_noItems = n;
     m_backgroundColour = * wxWHITE;
 
     Widget parentWidget = (Widget) parent->GetClientWidget();

-
-    WXFontType fontType = (WXFontType)NULL;
-
-    if( m_font.Ok() )
-    {
-        fontType = m_font.GetFontType(XtDisplay(parentWidget));
-    }
+    Display* dpy = XtDisplay(parentWidget);

 
     Arg args[4];
     int count = 0;
 
     Arg args[4];
     int count = 0;


@@ -107,9 +105,10 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
               ( m_windowStyle & wxLB_EXTENDED ) ? XmEXTENDED_SELECT :
                                                   XmBROWSE_SELECT );
     ++count;
               ( m_windowStyle & wxLB_EXTENDED ) ? XmEXTENDED_SELECT :
                                                   XmBROWSE_SELECT );
     ++count;

-    if( fontType )
+    if( m_font.Ok() )

     {
     {

-        XtSetArg( args[count], (String)wxFont::GetFontTag(), fontType );
+        XtSetArg( args[count],
+                  (String)wxFont::GetFontTag(), m_font.GetFontTypeC(dpy) );

         ++count;
     }
     if( m_windowStyle & wxLB_ALWAYS_SB )
         ++count;
     }
     if( m_windowStyle & wxLB_ALWAYS_SB )


@@ -118,8 +117,9 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
         ++count;
     }
 
         ++count;
     }
 

-    Widget listWidget = XmCreateScrolledList(parentWidget,
-                                             (char*)name.c_str(), args, count);
+    Widget listWidget =
+        XmCreateScrolledList(parentWidget,
+                             wxConstCast(name.c_str(), char), args, count);

 
     m_mainWidget = (WXWidget) listWidget;
 
 
     m_mainWidget = (WXWidget) listWidget;
 


@@ -148,13 +148,25 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
                    (XtCallbackProc) wxListBoxCallback,
                    (XtPointer) this);
 
                    (XtCallbackProc) wxListBoxCallback,
                    (XtPointer) this);
 

-    SetCanAddEventHandler(TRUE);

     AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
                   pos.x, pos.y, best.x, best.y);
 
     ChangeBackgroundColour();
 
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
                   pos.x, pos.y, best.x, best.y);
 
     ChangeBackgroundColour();
 

-    return TRUE;
+    return true;
+}
+
+bool wxListBox::Create(wxWindow *parent, wxWindowID id,
+                       const wxPoint& pos,
+                       const wxSize& size,
+                       const wxArrayString& choices,
+                       long style,
+                       const wxValidator& validator,
+                       const wxString& name)
+{
+    wxCArrayString chs(choices);
+    return Create(parent, id, pos, size, chs.GetCount(), chs.GetStrings(),
+                  style, validator, name);

 }
 
 wxListBox::~wxListBox()
 }
 
 wxListBox::~wxListBox()


@@ -256,11 +268,11 @@ void wxListBox::DoSetItems(const wxArrayString& items, void** clientData)
     XmString *text = new XmString[items.GetCount()];
     size_t i;
     for (i = 0; i < items.GetCount(); ++i)
     XmString *text = new XmString[items.GetCount()];
     size_t i;
     for (i = 0; i < items.GetCount(); ++i)

-        text[i] = XmStringCreateSimple ((char*)items[i].c_str());
+        text[i] = wxStringToXmString (items[i]);

 
     if ( clientData )
         for (i = 0; i < items.GetCount(); ++i)
 
     if ( clientData )
         for (i = 0; i < items.GetCount(); ++i)

-            m_clientDataDict.Set(i, (wxClientData*)clientData[i], FALSE);
+            m_clientDataDict.Set(i, (wxClientData*)clientData[i], false);

 
     XmListAddItems (listBox, text, items.GetCount(), 0);
     for (i = 0; i < items.GetCount(); i++)
 
     XmListAddItems (listBox, text, items.GetCount(), 0);
     for (i = 0; i < items.GetCount(); i++)


@@ -320,9 +332,9 @@ void wxListBox::Clear()
     m_noItems = 0;
 }
 
     m_noItems = 0;
 }
 

-void wxListBox::SetSelection(int N, bool select)
+void wxListBox::DoSetSelection(int N, bool select)

 {
 {

-    m_inSetValue = TRUE;
+    m_inSetValue = true;

     if (select)
     {
 #if 0
     if (select)
     {
 #if 0


@@ -341,9 +353,9 @@ void wxListBox::SetSelection(int N, bool select)
             int i;
             for (i = 0; i < n; i++)
                 XmListSelectPos ((Widget) m_mainWidget,
             int i;
             for (i = 0; i < n; i++)
                 XmListSelectPos ((Widget) m_mainWidget,

-                                 selections[i] + 1, FALSE);
+                                 selections[i] + 1, False);

 
 

-            XmListSelectPos ((Widget) m_mainWidget, N + 1, FALSE);
+            XmListSelectPos ((Widget) m_mainWidget, N + 1, False);

 
             XtVaSetValues ((Widget) m_mainWidget,
                            XmNselectionPolicy, XmEXTENDED_SELECT,
 
             XtVaSetValues ((Widget) m_mainWidget,
                            XmNselectionPolicy, XmEXTENDED_SELECT,


@@ -351,13 +363,13 @@ void wxListBox::SetSelection(int N, bool select)
         }
         else
 #endif // 0
         }
         else
 #endif // 0

-            XmListSelectPos ((Widget) m_mainWidget, N + 1, FALSE);
+            XmListSelectPos ((Widget) m_mainWidget, N + 1, False);

 
     }
     else
         XmListDeselectPos ((Widget) m_mainWidget, N + 1);
 
 
     }
     else
         XmListDeselectPos ((Widget) m_mainWidget, N + 1);
 

-    m_inSetValue = FALSE;
+    m_inSetValue = false;

 }
 
 bool wxListBox::IsSelected(int N) const
 }
 
 bool wxListBox::IsSelected(int N) const


@@ -366,20 +378,20 @@ bool wxListBox::IsSelected(int N) const
     wxArrayInt theSelections;
     int count = GetSelections (theSelections);
     if (count == 0)
     wxArrayInt theSelections;
     int count = GetSelections (theSelections);
     if (count == 0)

-        return FALSE;
+        return false;

     else
     {
         int j;
         for (j = 0; j < count; j++)
             if (theSelections[j] == N)
     else
     {
         int j;
         for (j = 0; j < count; j++)
             if (theSelections[j] == N)

-                return TRUE;
+                return true;

     }
     }

-    return FALSE;
+    return false;

 }
 
 void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
 {
 }
 
 void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
 {

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

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


@@ -394,7 +406,7 @@ void *wxListBox::DoGetItemClientData(int N) const
 
 void wxListBox::DoSetItemClientData(int N, void *Client_data)
 {
 
 void wxListBox::DoSetItemClientData(int N, void *Client_data)
 {

-    m_clientDataDict.Set(N, (wxClientData*)Client_data, FALSE);
+    m_clientDataDict.Set(N, (wxClientData*)Client_data, false);

 }
 
 // Return number of selections and an array of selected integers
 }
 
 // Return number of selections and an array of selected integers


@@ -458,7 +470,7 @@ wxString wxDoGetStringInList( Widget listBox, int n )
                    XmNitemCount, &count,
                    XmNitems, &strlist,
                    NULL );
                    XmNitemCount, &count,
                    XmNitems, &strlist,
                    NULL );

-    if( n <= count && n >= 0 )
+    if( n < count && n >= 0 )

         return wxXmStringToString( strlist[n] );
     else
         return wxEmptyString;
         return wxXmStringToString( strlist[n] );
     else
         return wxEmptyString;


@@ -486,12 +498,12 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
     // Corrected by Sergey Krasnov from Steve Hammes' code
 #if XmVersion > 1001
     for (i = 0; i < items.GetCount(); i++)
     // Corrected by Sergey Krasnov from Steve Hammes' code
 #if XmVersion > 1001
     for (i = 0; i < items.GetCount(); i++)

-        text[i] = XmStringCreateSimple((char*)items[i].c_str());
+        text[i] = wxStringToXmString(items[i]);

     XmListAddItemsUnselected(listBox, text, items.GetCount(), pos+1);
 #else
     for (i = 0; i < items.GetCount(); i++)
     {
     XmListAddItemsUnselected(listBox, text, items.GetCount(), pos+1);
 #else
     for (i = 0; i < items.GetCount(); i++)
     {

-        text[i] = XmStringCreateSimple((char*)items[i].c_str());
+        text[i] = wxStringToXmString(items[i]);

         // Another Sergey correction
         XmListAddItemUnselected(listBox, text[i], pos+i+1);
     }
         // Another Sergey correction
         XmListAddItemUnselected(listBox, text[i], pos+i+1);
     }


@@ -529,11 +541,11 @@ void wxListBox::SetString(int N, const wxString& s)
 
 void wxListBox::Command (wxCommandEvent & event)
 {
 
 void wxListBox::Command (wxCommandEvent & event)
 {

-    if (event.m_extraLong)
-        SetSelection (event.m_commandInt);
+    if (event.GetExtraLong())
+        SetSelection (event.GetInt());

     else
     {
     else
     {

-        Deselect (event.m_commandInt);
+        Deselect (event.GetInt());

         return;
     }
     ProcessCommand (event);
         return;
     }
     ProcessCommand (event);


@@ -560,8 +572,8 @@ void wxListBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
         event.SetClientObject( item->GetClientObject(n) );
     else if ( item->HasClientUntypedData() )
         event.SetClientData( item->GetClientData(n) );
         event.SetClientObject( item->GetClientObject(n) );
     else if ( item->HasClientUntypedData() )
         event.SetClientData( item->GetClientData(n) );

-    event.m_commandInt = n;
-    event.m_extraLong = TRUE;
+    event.SetInt(n);
+    event.SetExtraLong(true);

     event.SetEventObject(item);
     event.SetString( item->GetString( n ) );
 
     event.SetEventObject(item);
     event.SetString( item->GetString( n ) );
 


@@ -618,8 +630,8 @@ void wxListBox::ChangeBackgroundColour()
     * function to change them (by default, taken from wxSystemSettings)
     */
     wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
     * function to change them (by default, taken from wxSystemSettings)
     */
     wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);

-    DoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE);
-    DoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE);
+    wxDoChangeBackgroundColour((WXWidget) hsb, backgroundColour, true);
+    wxDoChangeBackgroundColour((WXWidget) vsb, backgroundColour, true);

 
     XtVaSetValues (hsb,
         XmNtroughColor, backgroundColour.AllocColour(XtDisplay(hsb)),
 
     XtVaSetValues (hsb,
         XmNtroughColor, backgroundColour.AllocColour(XtDisplay(hsb)),


@@ -629,7 +641,7 @@ void wxListBox::ChangeBackgroundColour()
         NULL);
 
     // MBN: why change parent's background? It looks really ugly.
         NULL);
 
     // MBN: why change parent's background? It looks really ugly.

-    // DoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, TRUE);
+    // wxDoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, true);

 }
 
 void wxListBox::ChangeForegroundColour()
 }
 
 void wxListBox::ChangeForegroundColour()


@@ -647,9 +659,9 @@ void wxListBox::ChangeForegroundColour()
     /* TODO: should scrollbars be affected? Should probably have separate
              function to change them (by default, taken from wxSystemSettings)
 
     /* TODO: should scrollbars be affected? Should probably have separate
              function to change them (by default, taken from wxSystemSettings)
 

-        DoChangeForegroundColour((WXWidget) hsb, m_foregroundColour);
-        DoChangeForegroundColour((WXWidget) vsb, m_foregroundColour);
-        DoChangeForegroundColour((WXWidget) parent, m_foregroundColour);
+        wxDoChangeForegroundColour((WXWidget) hsb, m_foregroundColour);
+        wxDoChangeForegroundColour((WXWidget) vsb, m_foregroundColour);
+        wxDoChangeForegroundColour((WXWidget) parent, m_foregroundColour);

     */
 }
 
     */
 }