make cocoa mediactrl usable. Some touchups to carbon mediactrl code. Add notebook...

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

diff --git a/src/univ/listbox.cpp b/src/univ/listbox.cpp
index 84cd3a79a14d3e570f7fb557beafb6fa5eafd952..1188a594b4d454f54636dd233897b9492e21bfed 100644 (file)
--- a/src/univ/listbox.cpp
+++ b/src/univ/listbox.cpp
@@ -63,11 +63,12 @@ void wxListBox::Init()
     m_maxWidth = 0;
     m_scrollRangeY = 0;
     m_maxWidthItem = -1;
     m_maxWidth = 0;
     m_scrollRangeY = 0;
     m_maxWidthItem = -1;

+    m_strings = NULL;

 
     // 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;


@@ -76,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,


@@ -105,14 +135,13 @@ bool wxListBox::Create(wxWindow *parent,
         style |= wxBORDER_SUNKEN;
 #endif
 
         style |= wxBORDER_SUNKEN;
 #endif
 

-    if ( !wxControl::Create(parent, id, pos, size, style, 
+    if ( !wxControl::Create(parent, id, pos, size, style,

                             validator, name) )
                             validator, name) )

-        return FALSE;
+        return false;

 
     SetWindow(this);
 
 
     SetWindow(this);
 

-    if ( style & wxLB_SORT )
-        m_strings = wxArrayString(TRUE /* auto sort */);
+    m_strings = new wxArrayString;

 
     Set(n, choices);
 
 
     Set(n, choices);
 


@@ -120,25 +149,54 @@ bool wxListBox::Create(wxWindow *parent,
 
     CreateInputHandler(wxINP_HANDLER_LISTBOX);
 
 
     CreateInputHandler(wxINP_HANDLER_LISTBOX);
 

-    return TRUE;
+    return true;

 }
 
 wxListBox::~wxListBox()
 {
     // call this just to free the client data -- and avoid leaking memory
     DoClear();
 }
 
 wxListBox::~wxListBox()
 {
     // call this just to free the client data -- and avoid leaking memory
     DoClear();

+
+    delete m_strings;
+
+    m_strings = NULL;

 }
 
 // ----------------------------------------------------------------------------
 // adding/inserting strings
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // adding/inserting strings
 // ----------------------------------------------------------------------------
 

+int wxCMPFUNC_CONV wxListBoxSortNoCase(wxString* s1, wxString* s2)
+{
+    return  s1->CmpNoCase(*s2);
+}
+
+int wxListBox::DoAppendOnly(const wxString& item)
+{
+    size_t index;
+
+    if ( IsSorted() )
+    {
+        m_strings->Add(item);
+        m_strings->Sort(wxListBoxSortNoCase);
+        index = m_strings->Index(item);
+    }
+    else
+    {
+        index = m_strings->GetCount();
+        m_strings->Add(item);
+    }
+
+    return index;
+}
+

 int wxListBox::DoAppend(const wxString& item)
 {
 int wxListBox::DoAppend(const wxString& item)
 {

-    size_t index = m_strings.Add(item);
+    size_t index = DoAppendOnly( item );
+

     m_itemsClientData.Insert(NULL, index);
 
     m_itemsClientData.Insert(NULL, index);
 

-    m_updateScrollbarY = TRUE;
+    m_updateScrollbarY = true;

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


@@ -149,7 +207,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;

         }
     }
 
         }
     }
 


@@ -167,12 +225,12 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
     size_t count = items.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {
     size_t count = items.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {

-        m_strings.Insert(items[n], pos + n);
+        m_strings->Insert(items[n], pos + n);

         m_itemsClientData.Insert(NULL, pos + n);
     }
 
     // the number of items has changed so we might have to show the scrollbar
         m_itemsClientData.Insert(NULL, pos + n);
     }
 
     // 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


@@ -192,27 +250,33 @@ void wxListBox::DoSetItems(const wxArrayString& items, void **clientData)
     if ( !count )
         return;
 
     if ( !count )
         return;
 

-    m_strings.Alloc(count);
+    m_strings->Alloc(count);
+

     m_itemsClientData.Alloc(count);
     for ( size_t n = 0; n < count; n++ )
     {
     m_itemsClientData.Alloc(count);
     for ( size_t n = 0; n < count; n++ )
     {

-        size_t index = m_strings.Add(items[n]);
+        size_t index = DoAppendOnly(items[n]);
+

         m_itemsClientData.Insert(clientData ? clientData[n] : NULL, index);
     }
 
         m_itemsClientData.Insert(clientData ? clientData[n] : NULL, index);
     }
 

-    m_updateScrollbarY = TRUE;
+    m_updateScrollbarY = true;

 
     RefreshAll();
 }
 
 void wxListBox::SetString(int n, const wxString& s)
 {
 
     RefreshAll();
 }
 
 void wxListBox::SetString(int n, const wxString& s)
 {

+    wxCHECK_RET( !IsSorted(), _T("can't set string in sorted listbox") );
+
+    (*m_strings)[n] = s;
+

     if ( HasHorzScrollbar() )
     {
         // we need to update m_maxWidth as changing the string may cause the
         // horz scrollbar [dis]appear
         wxCoord width;
     if ( HasHorzScrollbar() )
     {
         // we need to update m_maxWidth as changing the string may cause the
         // horz scrollbar [dis]appear
         wxCoord width;

-        m_strings[n] = s;
+

         GetTextExtent(s, &width, NULL);
 
         // it might have increased if the new string is long
         GetTextExtent(s, &width, NULL);
 
         // it might have increased if the new string is long


@@ -220,7 +284,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 )


@@ -228,10 +292,6 @@ void wxListBox::SetString(int n, const wxString& s)
             RefreshHorzScrollbar();
         }
     }
             RefreshHorzScrollbar();
         }
     }

-    else // no horz scrollbar
-    {
-        m_strings[n] = s;
-    }

 
     RefreshItem(n);
 }
 
     RefreshItem(n);
 }


@@ -242,7 +302,7 @@ void wxListBox::SetString(int n, const wxString& s)
 
 void wxListBox::DoClear()
 {
 
 void wxListBox::DoClear()
 {

-    m_strings.Clear();
+    m_strings->Clear();

 
     if ( HasClientObjectData() )
     {
 
     if ( HasClientObjectData() )
     {


@@ -263,7 +323,7 @@ void wxListBox::Clear()
 {
     DoClear();
 
 {
     DoClear();
 

-    m_updateScrollbarY = TRUE;
+    m_updateScrollbarY = true;

 
     RefreshHorzScrollbar();
 
 
     RefreshHorzScrollbar();
 


@@ -279,7 +339,7 @@ void wxListBox::Delete(int n)
     // refreshed (as GetCount() will be decremented)
     RefreshFromItemToEnd(n);
 
     // refreshed (as GetCount() will be decremented)
     RefreshFromItemToEnd(n);
 

-    m_strings.RemoveAt(n);
+    m_strings->RemoveAt(n);

 
     if ( HasClientObjectData() )
     {
 
     if ( HasClientObjectData() )
     {


@@ -324,7 +384,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 )


@@ -511,7 +571,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()


@@ -535,7 +595,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?


@@ -595,7 +655,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);

     }
 }
 
     }
 }
 


@@ -606,14 +666,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 )


@@ -622,6 +682,7 @@ void wxListBox::OnInternalIdle()
 
         m_updateCount = 0;
     }
 
         m_updateCount = 0;
     }

+    wxListBoxBase::OnInternalIdle();

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -651,7 +712,7 @@ void wxListBox::DoDraw(wxControlRenderer *renderer)
     wxCoord lineHeight = GetLineHeight();
     size_t itemFirst = yTop / lineHeight,
            itemLast = (yBottom + lineHeight - 1) / lineHeight,
     wxCoord lineHeight = GetLineHeight();
     size_t itemFirst = yTop / lineHeight,
            itemLast = (yBottom + lineHeight - 1) / lineHeight,

-           itemMax = m_strings.GetCount();
+           itemMax = m_strings->GetCount();

 
     if ( itemFirst >= itemMax )
         return;
 
     if ( itemFirst >= itemMax )
         return;


@@ -679,13 +740,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()


@@ -720,10 +781,10 @@ wxCoord wxListBox::GetMaxWidth() const
     {
         wxListBox *self = wxConstCast(this, wxListBox);
         wxCoord width;
     {
         wxListBox *self = wxConstCast(this, wxListBox);
         wxCoord width;

-        size_t count = m_strings.GetCount();
+        size_t count = m_strings->GetCount();

         for ( size_t n = 0; n < count; n++ )
         {
         for ( size_t n = 0; n < count; n++ )
         {

-            GetTextExtent(m_strings[n], &width, NULL);
+            GetTextExtent(this->GetString(n), &width, NULL);

             if ( width > m_maxWidth )
             {
                 self->m_maxWidth = width;
             if ( width > m_maxWidth )
             {
                 self->m_maxWidth = width;


@@ -742,7 +803,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();
 }


@@ -777,11 +838,11 @@ wxSize wxListBox::DoGetBestClientSize() const
     wxCoord width = 0,
             height = 0;
 
     wxCoord width = 0,
             height = 0;
 

-    size_t count = m_strings.GetCount();
+    size_t count = m_strings->GetCount();

     for ( size_t n = 0; n < count; n++ )
     {
         wxCoord w,h;
     for ( size_t n = 0; n < count; n++ )
     {
         wxCoord w,h;

-        GetTextExtent(m_strings[n], &w, &h);
+        GetTextExtent(this->GetString(n), &w, &h);

 
         if ( w > width )
             width = w;
 
         if ( w > width )
             width = w;


@@ -831,7 +892,7 @@ bool wxListBox::SendEvent(wxEventType type, int item)
         event.SetString(GetString(item));
     }
 
         event.SetString(GetString(item));
     }
 

-    event.m_commandInt = item;
+    event.SetInt(item);

 
     return GetEventHandler()->ProcessEvent(event);
 }
 
     return GetEventHandler()->ProcessEvent(event);
 }


@@ -847,7 +908,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);
         }


@@ -861,7 +922,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


@@ -889,7 +950,7 @@ bool wxListBox::FindItem(const wxString& prefix, bool strictlyAfter)
     // loop over all items in the listbox
     for ( int item = first; item != last; item < count - 1 ? item++ : item = 0 )
     {
     // loop over all items in the listbox
     for ( int item = first; item != last; item < count - 1 ? item++ : item = 0 )
     {

-        if ( wxStrnicmp(m_strings[item], prefix, len) == 0 )
+        if ( wxStrnicmp(this->GetString(item).c_str(), prefix, len) == 0 )

         {
             SetCurrentItem(item);
 
         {
             SetCurrentItem(item);
 


@@ -902,12 +963,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)


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

-        m_updateScrollbarY = FALSE;
+        m_updateScrollbarY = false;

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


@@ -1131,7 +1192,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;

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


@@ -1145,7 +1206,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,


@@ -1253,7 +1314,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;
 }


@@ -1265,7 +1326,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;


@@ -1308,24 +1369,24 @@ 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:

-                if ( (keycode < 255) && wxIsalnum(keycode) )
+                if ( (keycode < 255) && wxIsalnum((wxChar)keycode) )

                 {
                     action = wxACTION_LISTBOX_FIND;
                     strArg = (wxChar)keycode;
                 }
         }
 
                 {
                     action = wxACTION_LISTBOX_FIND;
                     strArg = (wxChar)keycode;
                 }
         }
 

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

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


@@ -1350,7 +1411,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;

         }
     }
 
         }
     }
 


@@ -1392,11 +1453,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);


@@ -1416,7 +1477,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);


@@ -1427,7 +1488,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) )