X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/584ad2a32fec156c6049145d7ece9a33213aea28..4fe0156b18e2330be391b804da341e546164b85f:/src/motif/listbox.cpp?ds=sidebyside

diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp
index 1ad6566347..07670065d8 100644
--- a/src/motif/listbox.cpp
+++ b/src/motif/listbox.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        listbox.cpp
+// Name:        src/motif/listbox.cpp
 // Purpose:     wxListBox
 // Author:      Julian Smart
 // Modified by:
@@ -9,8 +9,19 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "listbox.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_LISTBOX
+
+#include "wx/listbox.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/settings.h"
+    #include "wx/arrstr.h"
 #endif
 
 #ifdef __VMS
@@ -18,13 +29,6 @@
 #define XtDisplay XTDISPLAY
 #endif
 
-# include "wx/listbox.h"
-#include "wx/settings.h"
-#include "wx/dynarray.h"
-#include "wx/log.h"
-#include "wx/utils.h"
-#include "wx/arrstr.h"
-
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif
@@ -86,19 +90,13 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 {
     if( !wxControl::CreateControl( parent, id, pos, size, style,
                                    validator, name ) )
-        return FALSE;
+        return false;
 
-    m_noItems = n;
+    m_noItems = (unsigned int)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;
@@ -108,9 +106,10 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
               ( 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 )
@@ -155,7 +154,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 
     ChangeBackgroundColour();
 
-    return TRUE;
+    return true;
 }
 
 bool wxListBox::Create(wxWindow *parent, wxWindowID id,
@@ -196,8 +195,9 @@ void wxListBox::DoSetFirstItem( int N )
 {
     int count, length;
 
-    if (N < 0)
+    if (!IsValid(N))
         return;
+
     XtVaGetValues ((Widget) m_mainWidget,
                     XmNvisibleItemCount, &count,
                     XmNitemCount, &length,
@@ -207,35 +207,20 @@ void wxListBox::DoSetFirstItem( int N )
     XmListSetPos ((Widget) m_mainWidget, N + 1);
 }
 
-void wxListBox::Delete(int N)
+void wxListBox::Delete(unsigned int n)
 {
-    wxSizeKeeper sk( this );
     Widget listBox = (Widget) m_mainWidget;
 
-    bool managed = XtIsManaged(listBox);
+    XmListDeletePos (listBox, n + 1);
 
-    if (managed)
-        XtUnmanageChild (listBox);
-
-    XmListDeletePos (listBox, N + 1);
-
-    if (managed)
-        XtManageChild (listBox);
-
-    sk.Restore();
-    m_clientDataDict.Delete(N, HasClientObjectData());
+    m_clientDataDict.Delete(n, HasClientObjectData());
     m_noItems --;
 }
 
 int wxListBox::DoAppend(const wxString& item)
 {
-    wxSizeKeeper sk( this );
     Widget listBox = (Widget) m_mainWidget;
 
-    bool managed = XtIsManaged(listBox);
-
-    if (managed)
-        XtUnmanageChild (listBox);
     int n;
     XtVaGetValues (listBox, XmNitemCount, &n, NULL);
     wxXmString text( item );
@@ -246,10 +231,6 @@ int wxListBox::DoAppend(const wxString& item)
     // selection policy!!
     SetSelectionPolicy();
 
-    if (managed)
-        XtManageChild (listBox);
-
-    sk.Restore();
     m_noItems ++;
 
     return GetCount() - 1;
@@ -257,24 +238,19 @@ int wxListBox::DoAppend(const wxString& item)
 
 void wxListBox::DoSetItems(const wxArrayString& items, void** clientData)
 {
-    wxSizeKeeper sk( this );
     Widget listBox = (Widget) m_mainWidget;
 
     if( HasClientObjectData() )
         m_clientDataDict.DestroyData();
 
-    bool managed = XtIsManaged(listBox);
-
-    if (managed)
-        XtUnmanageChild (listBox);
     XmString *text = new XmString[items.GetCount()];
-    size_t i;
+    unsigned int i;
     for (i = 0; i < items.GetCount(); ++i)
         text[i] = wxStringToXmString (items[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++)
@@ -285,11 +261,6 @@ void wxListBox::DoSetItems(const wxArrayString& items, void** clientData)
     // selection policy!!
     SetSelectionPolicy();
 
-    if (managed)
-        XtManageChild (listBox);
-
-    sk.Restore();
-
     m_noItems = items.GetCount();
 }
 
@@ -312,8 +283,10 @@ int wxDoFindStringInList(Widget w, const wxString& s)
         return -1;
 }
 
-int wxListBox::FindString(const wxString& s) const
+int wxListBox::FindString(const wxString& s, bool WXUNUSED(bCase)) const
 {
+    // FIXME: back to base class for not supported value of bCase
+
     return wxDoFindStringInList( (Widget)m_mainWidget, s );
 }
 
@@ -334,9 +307,9 @@ void wxListBox::Clear()
     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
@@ -355,9 +328,9 @@ void wxListBox::SetSelection(int N, bool select)
             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,
@@ -365,13 +338,13 @@ void wxListBox::SetSelection(int N, bool select)
         }
         else
 #endif // 0
-            XmListSelectPos ((Widget) m_mainWidget, N + 1, FALSE);
+            XmListSelectPos ((Widget) m_mainWidget, N + 1, False);
 
     }
     else
         XmListDeselectPos ((Widget) m_mainWidget, N + 1);
 
-    m_inSetValue = FALSE;
+    m_inSetValue = false;
 }
 
 bool wxListBox::IsSelected(int N) const
@@ -380,35 +353,35 @@ bool wxListBox::IsSelected(int N) const
     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)
-                return TRUE;
+                return true;
     }
-    return FALSE;
+    return false;
 }
 
-void wxListBox::DoSetItemClientObject(int n, wxClientData* clientData)
+void wxListBox::DoSetItemClientObject(unsigned 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(unsigned int n) const
 {
     return m_clientDataDict.Get(n);
 }
 
-void *wxListBox::DoGetItemClientData(int N) const
+void *wxListBox::DoGetItemClientData(unsigned int n) const
 {
-    return (void*)m_clientDataDict.Get(N);
+    return (void*)m_clientDataDict.Get(n);
 }
 
-void wxListBox::DoSetItemClientData(int N, void *Client_data)
+void wxListBox::DoSetItemClientData(unsigned 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
@@ -478,23 +451,17 @@ wxString wxDoGetStringInList( Widget listBox, int n )
         return wxEmptyString;
 }
 
-wxString wxListBox::GetString( int n ) const
+wxString wxListBox::GetString(unsigned int n) const
 {
     return wxDoGetStringInList( (Widget)m_mainWidget, n );
 }
 
-void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
+void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
 {
-    wxSizeKeeper sk( this );
     Widget listBox = (Widget) m_mainWidget;
 
-    bool managed = XtIsManaged(listBox);
-
-    if (managed)
-        XtUnmanageChild(listBox);
-
     XmString *text = new XmString[items.GetCount()];
-    size_t i;
+    unsigned int i;
     // Steve Hammes: Motif 1.1 compatibility
     // #if XmVersion > 1100
     // Corrected by Sergey Krasnov from Steve Hammes' code
@@ -518,15 +485,10 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
     // selection policy!!
     SetSelectionPolicy();
 
-    if (managed)
-        XtManageChild(listBox);
-
-    sk.Restore();
-
     m_noItems += items.GetCount();
 }
 
-void wxListBox::SetString(int N, const wxString& s)
+void wxListBox::SetString(unsigned int n, const wxString& s)
 {
     wxSizeKeeper sk( this );
     Widget listBox = (Widget) m_mainWidget;
@@ -535,19 +497,19 @@ void wxListBox::SetString(int N, const wxString& s)
 
     // delete the item and add it again.
     // FIXME isn't there a way to change it in place?
-    XmListDeletePos (listBox, N+1);
-    XmListAddItem (listBox, text(), N+1);
+    XmListDeletePos (listBox, n+1);
+    XmListAddItem (listBox, text(), n+1);
 
     sk.Restore();
 }
 
 void wxListBox::Command (wxCommandEvent & event)
 {
-    if (event.m_extraLong)
-        SetSelection (event.m_commandInt);
+    if (event.GetExtraLong())
+        SetSelection (event.GetInt());
     else
     {
-        Deselect (event.m_commandInt);
+        Deselect (event.GetInt());
         return;
     }
     ProcessCommand (event);
@@ -574,8 +536,8 @@ void wxListBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
         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 ) );
 
@@ -632,8 +594,8 @@ void wxListBox::ChangeBackgroundColour()
     * function to change them (by default, taken from wxSystemSettings)
     */
     wxColour backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
-    wxDoChangeBackgroundColour((WXWidget) hsb, backgroundColour, TRUE);
-    wxDoChangeBackgroundColour((WXWidget) vsb, backgroundColour, TRUE);
+    wxDoChangeBackgroundColour((WXWidget) hsb, backgroundColour, true);
+    wxDoChangeBackgroundColour((WXWidget) vsb, backgroundColour, true);
 
     XtVaSetValues (hsb,
         XmNtroughColor, backgroundColour.AllocColour(XtDisplay(hsb)),
@@ -643,7 +605,7 @@ void wxListBox::ChangeBackgroundColour()
         NULL);
 
     // MBN: why change parent's background? It looks really ugly.
-    // wxDoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, TRUE);
+    // wxDoChangeBackgroundColour((WXWidget) parent, m_backgroundColour, true);
 }
 
 void wxListBox::ChangeForegroundColour()
@@ -667,7 +629,7 @@ void wxListBox::ChangeForegroundColour()
     */
 }
 
-int wxListBox::GetCount() const
+unsigned int wxListBox::GetCount() const
 {
     return m_noItems;
 }
@@ -719,3 +681,4 @@ wxSize wxListBox::DoGetBestSize() const
     return wxDoGetListBoxBestSize( (Widget)m_mainWidget, this );
 }
 
+#endif // wxUSE_LISTBOX