possibly fix compilo error w/xcode

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

diff --git a/src/univ/listbox.cpp b/src/univ/listbox.cpp
index d845c548cf006ba1ee70b53e7fcb42fd11f357a1..1ece01a74bc13c6357450a6f71a669f1ab53498e 100644 (file)
--- a/src/univ/listbox.cpp
+++ b/src/univ/listbox.cpp
@@ -55,26 +55,6 @@ END_EVENT_TABLE()
 // construction
 // ----------------------------------------------------------------------------
 
 // construction
 // ----------------------------------------------------------------------------
 

-wxListBox::wxListBox()
-{
-    Init();
-}
-
-wxListBox::wxListBox(wxWindow *parent,
-                     wxWindowID id,
-                     const wxPoint& pos,
-                     const wxSize& size,
-                     int n,
-                     const wxString choices[],
-                     long style,
-                     const wxValidator& validator,
-                     const wxString& name)
-{
-    Init();
-
-    Create(parent, id, pos, size, n, choices, style, validator, name);
-}
-

 void wxListBox::Init()
 {
     // will be calculated later when needed
 void wxListBox::Init()
 {
     // will be calculated later when needed


@@ -88,7 +68,7 @@ void wxListBox::Init()
     // no items hence no current item
     m_current = -1;
     m_selAnchor = -1;
     // no items hence no current item
     m_current = -1;
     m_selAnchor = -1;

-    m_currentChanged = FALSE;
+    m_currentChanged = false;

 
     // no need to update anything initially
     m_updateCount = 0;
 
     // no need to update anything initially
     m_updateCount = 0;


@@ -97,7 +77,36 @@ void wxListBox::Init()
     m_updateScrollbarX =
     m_showScrollbarX =
     m_updateScrollbarY =
     m_updateScrollbarX =
     m_showScrollbarX =
     m_updateScrollbarY =

-    m_showScrollbarY = FALSE;
+    m_showScrollbarY = false;
+}
+
+wxListBox::wxListBox(wxWindow *parent,
+                     wxWindowID id,
+                     const wxPoint &pos,
+                     const wxSize &size,
+                     const wxArrayString& choices,
+                     long style,
+                     const wxValidator& validator,
+                     const wxString &name)
+{
+    Init();
+
+    Create(parent, id, pos, size, choices, style, validator, name);
+}
+
+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);

 }
 
 bool wxListBox::Create(wxWindow *parent,
 }
 
 bool wxListBox::Create(wxWindow *parent,


@@ -128,7 +137,7 @@ bool wxListBox::Create(wxWindow *parent,
 
     if ( !wxControl::Create(parent, id, pos, size, style, 
                             validator, name) )
 
     if ( !wxControl::Create(parent, id, pos, size, style, 
                             validator, name) )

-        return FALSE;
+        return false;

 
     SetWindow(this);
 
 
     SetWindow(this);
 


@@ -143,7 +152,7 @@ bool wxListBox::Create(wxWindow *parent,
 
     CreateInputHandler(wxINP_HANDLER_LISTBOX);
 
 
     CreateInputHandler(wxINP_HANDLER_LISTBOX);
 

-    return TRUE;
+    return true;

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


@@ -179,7 +188,7 @@ int wxListBox::DoAppend(const wxString& item)
 
     m_itemsClientData.Insert(NULL, index);
 
 
     m_itemsClientData.Insert(NULL, index);
 

-    m_updateScrollbarY = TRUE;
+    m_updateScrollbarY = true;

 
     if ( HasHorzScrollbar() )
     {
 
     if ( HasHorzScrollbar() )
     {


@@ -190,7 +199,7 @@ int wxListBox::DoAppend(const wxString& item)
         {
             m_maxWidth = width;
             m_maxWidthItem = index;
         {
             m_maxWidth = width;
             m_maxWidthItem = index;

-            m_updateScrollbarX = TRUE;
+            m_updateScrollbarX = true;

         }
     }
 
         }
     }
 


@@ -213,7 +222,7 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
     }
 
     // the number of items has changed so we might have to show the scrollbar
     }
 
     // the number of items has changed so we might have to show the scrollbar

-    m_updateScrollbarY = TRUE;
+    m_updateScrollbarY = true;

 
     // the max width also might have changed - just recalculate it instead of
     // keeping track of it here, this is probably more efficient for a typical
 
     // the max width also might have changed - just recalculate it instead of
     // keeping track of it here, this is probably more efficient for a typical


@@ -252,7 +261,7 @@ void wxListBox::DoSetItems(const wxArrayString& items, void **clientData)
         m_itemsClientData.Insert(clientData ? clientData[n] : NULL, index);
     }
 
         m_itemsClientData.Insert(clientData ? clientData[n] : NULL, index);
     }
 

-    m_updateScrollbarY = TRUE;
+    m_updateScrollbarY = true;

 
     RefreshAll();
 }
 
     RefreshAll();
 }


@@ -272,7 +281,7 @@ void wxListBox::SetString(int n, const wxString& s)
         {
             m_maxWidth = width;
             m_maxWidthItem = n;
         {
             m_maxWidth = width;
             m_maxWidthItem = n;

-            m_updateScrollbarX = TRUE;
+            m_updateScrollbarX = true;

         }
         // or also decreased if the old string was the longest one
         else if ( n == m_maxWidthItem )
         }
         // or also decreased if the old string was the longest one
         else if ( n == m_maxWidthItem )


@@ -315,7 +324,7 @@ void wxListBox::Clear()
 {
     DoClear();
 
 {
     DoClear();
 

-    m_updateScrollbarY = TRUE;
+    m_updateScrollbarY = true;

 
     RefreshHorzScrollbar();
 
 
     RefreshHorzScrollbar();
 


@@ -376,7 +385,7 @@ void wxListBox::Delete(int n)
     }
 
     // the number of items has changed, hence the scrollbar may disappear
     }
 
     // the number of items has changed, hence the scrollbar may disappear

-    m_updateScrollbarY = TRUE;
+    m_updateScrollbarY = true;

 
     // finally, if the longest item was deleted the scrollbar may disappear
     if ( n == m_maxWidthItem )
 
     // finally, if the longest item was deleted the scrollbar may disappear
     if ( n == m_maxWidthItem )


@@ -563,7 +572,7 @@ void wxListBox::RefreshAll()
 void wxListBox::RefreshHorzScrollbar()
 {
     m_maxWidth = 0; // recalculate it
 void wxListBox::RefreshHorzScrollbar()
 {
     m_maxWidth = 0; // recalculate it

-    m_updateScrollbarX = TRUE;
+    m_updateScrollbarX = true;

 }
 
 void wxListBox::UpdateScrollbars()
 }
 
 void wxListBox::UpdateScrollbars()


@@ -587,7 +596,7 @@ void wxListBox::UpdateScrollbars()
     else // never show it
     {
         charWidth = maxWidth = 0;
     else // never show it
     {
         charWidth = maxWidth = 0;

-        showScrollbarX = FALSE;
+        showScrollbarX = false;

     }
 
     // what should be the scrollbar range now?
     }
 
     // what should be the scrollbar range now?


@@ -647,7 +656,7 @@ void wxListBox::UpdateItems()
                    m_updateFrom, m_updateFrom + m_updateCount - 1,
                    rect.GetTop(), rect.GetBottom());
 
                    m_updateFrom, m_updateFrom + m_updateCount - 1,
                    rect.GetTop(), rect.GetBottom());
 

-        Refresh(TRUE, &rect);
+        Refresh(true, &rect);

     }
 }
 
     }
 }
 


@@ -658,14 +667,14 @@ void wxListBox::OnInternalIdle()
         UpdateScrollbars();
 
         m_updateScrollbarX =
         UpdateScrollbars();
 
         m_updateScrollbarX =

-        m_updateScrollbarY = FALSE;
+        m_updateScrollbarY = false;

     }
 
     if ( m_currentChanged )
     {
         DoEnsureVisible(m_current);
 
     }
 
     if ( m_currentChanged )
     {
         DoEnsureVisible(m_current);
 

-        m_currentChanged = FALSE;
+        m_currentChanged = false;

     }
 
     if ( m_updateCount )
     }
 
     if ( m_updateCount )


@@ -732,13 +741,13 @@ void wxListBox::DoDrawRange(wxControlRenderer *renderer,
 bool wxListBox::SetFont(const wxFont& font)
 {
     if ( !wxControl::SetFont(font) )
 bool wxListBox::SetFont(const wxFont& font)
 {
     if ( !wxControl::SetFont(font) )

-        return FALSE;
+        return false;

 
     CalcItemsPerPage();
 
     RefreshAll();
 
 
     CalcItemsPerPage();
 
     RefreshAll();
 

-    return TRUE;
+    return true;

 }
 
 void wxListBox::CalcItemsPerPage()
 }
 
 void wxListBox::CalcItemsPerPage()


@@ -795,7 +804,7 @@ void wxListBox::OnSize(wxSizeEvent& event)
 
     // the scrollbars might [dis]appear
     m_updateScrollbarX =
 
     // the scrollbars might [dis]appear
     m_updateScrollbarX =

-    m_updateScrollbarY = TRUE;
+    m_updateScrollbarY = true;

 
     event.Skip();
 }
 
     event.Skip();
 }


@@ -900,7 +909,7 @@ void wxListBox::SetCurrentItem(int n)
 
         if ( m_current != -1 )
         {
 
         if ( m_current != -1 )
         {

-            m_currentChanged = TRUE;
+            m_currentChanged = true;

 
             RefreshItem(m_current);
         }
 
             RefreshItem(m_current);
         }


@@ -914,7 +923,7 @@ bool wxListBox::FindItem(const wxString& prefix, bool strictlyAfter)
     if ( !count )
     {
         // empty listbox, we can't find anything in it
     if ( !count )
     {
         // empty listbox, we can't find anything in it

-        return FALSE;
+        return false;

     }
 
     // start either from the current item or from the next one if strictlyAfter
     }
 
     // start either from the current item or from the next one if strictlyAfter


@@ -955,12 +964,12 @@ bool wxListBox::FindItem(const wxString& prefix, bool strictlyAfter)
                     AnchorSelection(item);
             }
 
                     AnchorSelection(item);
             }
 

-            return TRUE;
+            return true;

         }
     }
 
     // nothing found
         }
     }
 
     // nothing found

-    return FALSE;
+    return false;

 }
 
 void wxListBox::EnsureVisible(int n)
 }
 
 void wxListBox::EnsureVisible(int n)


@@ -970,7 +979,7 @@ void wxListBox::EnsureVisible(int n)
         UpdateScrollbars();
 
         m_updateScrollbarX =
         UpdateScrollbars();
 
         m_updateScrollbarX =

-        m_updateScrollbarY = FALSE;
+        m_updateScrollbarY = false;

     }
 
     DoEnsureVisible(n);
     }
 
     DoEnsureVisible(n);


@@ -1184,7 +1193,7 @@ bool wxListBox::PerformAction(const wxControlAction& action,
     else
         return wxControl::PerformAction(action, numArg, strArg);
 
     else
         return wxControl::PerformAction(action, numArg, strArg);
 

-    return TRUE;
+    return true;

 }
 
 // ============================================================================
 }
 
 // ============================================================================


@@ -1198,7 +1207,7 @@ wxStdListboxInputHandler::wxStdListboxInputHandler(wxInputHandler *handler,
     m_btnCapture = 0;
     m_toggleOnPressAlways = toggleOnPressAlways;
     m_actionMouse = wxACTION_NONE;
     m_btnCapture = 0;
     m_toggleOnPressAlways = toggleOnPressAlways;
     m_actionMouse = wxACTION_NONE;

-    m_trackMouseOutside = TRUE;
+    m_trackMouseOutside = true;

 }
 
 int wxStdListboxInputHandler::HitTest(const wxListBox *lbox,
 }
 
 int wxStdListboxInputHandler::HitTest(const wxListBox *lbox,


@@ -1306,7 +1315,7 @@ wxStdListboxInputHandler::SetupCapture(wxListBox *lbox,
     }
 
     // by default we always do track it
     }
 
     // by default we always do track it

-    m_trackMouseOutside = TRUE;
+    m_trackMouseOutside = true;

 
     return action;
 }
 
     return action;
 }


@@ -1318,7 +1327,7 @@ bool wxStdListboxInputHandler::HandleKey(wxInputConsumer *consumer,
     // we're only interested in the key press events
     if ( pressed && !event.AltDown() )
     {
     // we're only interested in the key press events
     if ( pressed && !event.AltDown() )
     {

-        bool isMoveCmd = TRUE;
+        bool isMoveCmd = true;

         int style = consumer->GetInputWindow()->GetWindowStyle();
 
         wxControlAction action;
         int style = consumer->GetInputWindow()->GetWindowStyle();
 
         wxControlAction action;


@@ -1361,13 +1370,13 @@ bool wxStdListboxInputHandler::HandleKey(wxInputConsumer *consumer,
                 if ( style & wxLB_MULTIPLE )
                 {
                     action = wxACTION_LISTBOX_TOGGLE;
                 if ( style & wxLB_MULTIPLE )
                 {
                     action = wxACTION_LISTBOX_TOGGLE;

-                    isMoveCmd = FALSE;
+                    isMoveCmd = false;

                 }
                 break;
 
             case WXK_RETURN:
                 action = wxACTION_LISTBOX_ACTIVATE;
                 }
                 break;
 
             case WXK_RETURN:
                 action = wxACTION_LISTBOX_ACTIVATE;

-                isMoveCmd = FALSE;
+                isMoveCmd = false;

                 break;
 
             default:
                 break;
 
             default:


@@ -1378,7 +1387,7 @@ bool wxStdListboxInputHandler::HandleKey(wxInputConsumer *consumer,
                 }
         }
 
                 }
         }
 

-        if ( !!action )
+        if ( !action.IsEmpty() )

         {
             consumer->PerformAction(action, -1, strArg);
 
         {
             consumer->PerformAction(action, -1, strArg);
 


@@ -1403,7 +1412,7 @@ bool wxStdListboxInputHandler::HandleKey(wxInputConsumer *consumer,
                 //else: nothing to do for multiple selection listboxes
             }
 
                 //else: nothing to do for multiple selection listboxes
             }
 

-            return TRUE;
+            return true;

         }
     }
 
         }
     }
 


@@ -1445,11 +1454,11 @@ bool wxStdListboxInputHandler::HandleMouse(wxInputConsumer *consumer,
         action = wxACTION_LISTBOX_ACTIVATE;
     }
 
         action = wxACTION_LISTBOX_ACTIVATE;
     }
 

-    if ( !!action )
+    if ( !action.IsEmpty() )

     {
         lbox->PerformAction(action, item);
 
     {
         lbox->PerformAction(action, item);
 

-        return TRUE;
+        return true;

     }
 
     return wxStdInputHandler::HandleMouse(consumer, event);
     }
 
     return wxStdInputHandler::HandleMouse(consumer, event);


@@ -1469,7 +1478,7 @@ bool wxStdListboxInputHandler::HandleMouseMove(wxInputConsumer *consumer,
             // when we do it ourselves): in this case we only react to
             // the mouse messages when they happen inside the listbox
             if ( lbox->HitTest(event.GetPosition()) != wxHT_WINDOW_INSIDE )
             // when we do it ourselves): in this case we only react to
             // the mouse messages when they happen inside the listbox
             if ( lbox->HitTest(event.GetPosition()) != wxHT_WINDOW_INSIDE )

-                return FALSE;
+                return false;

         }
 
         int item = HitTest(lbox, event);
         }
 
         int item = HitTest(lbox, event);


@@ -1480,7 +1489,7 @@ bool wxStdListboxInputHandler::HandleMouseMove(wxInputConsumer *consumer,
             // events
             SetupCapture(lbox, event, item);
 
             // events
             SetupCapture(lbox, event, item);
 

-            m_trackMouseOutside = FALSE;
+            m_trackMouseOutside = false;

         }
 
         if ( IsValidIndex(lbox, item) )
         }
 
         if ( IsValidIndex(lbox, item) )