Disable typemap for wxImage constructors

[wxWidgets.git] / src / generic / listctrl.cpp

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 1126d66902b435775aa6a762be072dba0b27caa9..5c5a6b521c89be50294d4872d96d02e9d88cd10b 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -153,6 +153,25 @@ static const int IMAGE_MARGIN_IN_REPORT_MODE = 5;
 // private classes
 // ============================================================================
 
 // private classes
 // ============================================================================
 

+//-----------------------------------------------------------------------------
+//  wxColWidthInfo (internal)
+//-----------------------------------------------------------------------------
+
+struct wxColWidthInfo
+{
+    int     nMaxWidth;
+    bool    bNeedsUpdate;   //  only set to true when an item whose
+                            //  width == nMaxWidth is removed
+
+    wxColWidthInfo(int w = 0, bool needsUpdate = false)
+    {
+        nMaxWidth = w;
+        bNeedsUpdate = needsUpdate;
+    }
+};
+
+WX_DEFINE_ARRAY_PTR(wxColWidthInfo *, ColWidthArray);
+

 //-----------------------------------------------------------------------------
 //  wxListItemData (internal)
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //  wxListItemData (internal)
 //-----------------------------------------------------------------------------


@@ -294,7 +313,7 @@ public:
         // the part to be highlighted
         wxRect m_rectHighlight;
 
         // the part to be highlighted
         wxRect m_rectHighlight;
 

-        // extend all our rects to be centered inside theo ne of given width
+        // extend all our rects to be centered inside the one of given width

         void ExtendWidth(wxCoord w)
         {
             wxASSERT_MSG( m_rectAll.width <= w,
         void ExtendWidth(wxCoord w)
         {
             wxASSERT_MSG( m_rectAll.width <= w,


@@ -687,6 +706,7 @@ public:
     long HitTest( int x, int y, int &flags );
     void InsertItem( wxListItem &item );
     void InsertColumn( long col, wxListItem &item );
     long HitTest( int x, int y, int &flags );
     void InsertItem( wxListItem &item );
     void InsertColumn( long col, wxListItem &item );

+    int GetItemWidthWithImage(wxListItem * item);

     void SortItems( wxListCtrlCompare fn, long data );
 
     size_t GetItemCount() const;
     void SortItems( wxListCtrlCompare fn, long data );
 
     size_t GetItemCount() const;


@@ -768,6 +788,7 @@ public:
     bool                 m_isCreated;
     int                  m_dragCount;
     wxPoint              m_dragStart;
     bool                 m_isCreated;
     int                  m_dragCount;
     wxPoint              m_dragStart;

+    ColWidthArray        m_aColWidths;

 
     // for double click logic
     size_t m_lineLastClicked,
 
     // for double click logic
     size_t m_lineLastClicked,


@@ -2126,7 +2147,7 @@ void wxListTextCtrl::OnKeyUp( wxKeyEvent &event )
 
 void wxListTextCtrl::OnKillFocus( wxFocusEvent &event )
 {
 
 void wxListTextCtrl::OnKillFocus( wxFocusEvent &event )
 {

-    if ( !m_finished )
+    if ( !m_finished && !m_aboutToFinish  )

     {
         // We must finish regardless of success, otherwise we'll get
         // focus problems:
     {
         // We must finish regardless of success, otherwise we'll get
         // focus problems:


@@ -2242,6 +2263,7 @@ wxListMainWindow::~wxListMainWindow()
 {
     DoDeleteAllItems();
     WX_CLEAR_LIST(wxListHeaderDataList, m_columns);
 {
     DoDeleteAllItems();
     WX_CLEAR_LIST(wxListHeaderDataList, m_columns);

+    WX_CLEAR_ARRAY(m_aColWidths);

 
     delete m_highlightBrush;
     delete m_highlightUnfocusedBrush;
 
     delete m_highlightBrush;
     delete m_highlightUnfocusedBrush;


@@ -3040,7 +3062,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
 
         size_t oldCurrent = m_current;
         bool cmdModifierDown = event.CmdDown();
 
         size_t oldCurrent = m_current;
         bool cmdModifierDown = event.CmdDown();

-        if ( !(cmdModifierDown || event.ShiftDown()) )
+        if ( IsSingleSel() || !(cmdModifierDown || event.ShiftDown()) )

         {
             if( IsSingleSel() || !IsHighlighted(current) )
             {
         {
             if( IsSingleSel() || !IsHighlighted(current) )
             {


@@ -3548,34 +3570,30 @@ void wxListMainWindow::SetColumnWidth( int col, int width )
 
             int max = AUTOSIZE_COL_MARGIN;
 
 
             int max = AUTOSIZE_COL_MARGIN;
 

-            for ( size_t i = 0; i < count; i++ )
+            //  if the cached column width isn't valid then recalculate it
+            if (m_aColWidths.Item(col)->bNeedsUpdate)

             {
             {

-                wxListLineData *line = GetLine(i);
-                wxListItemDataList::compatibility_iterator n = line->m_items.Item( col );
-
-                wxCHECK_RET( n, _T("no subitem?") );
+                for (size_t i = 0; i < count; i++)
+                {
+                    wxListLineData *line = GetLine(i);
+                    wxListItemDataList::compatibility_iterator n = line->m_items.Item( col );

 
 

-                wxListItemData *item = n->GetData();
-                int current = 0;
+                    wxCHECK_RET( n, _T("no subitem?") );

 
 

-                if (item->HasImage())
-                {
-                    int ix, iy;
-                    GetImageSize( item->GetImage(), ix, iy );
-                    current += ix + 5;
-                }
+                    wxListItemData *itemData = n->GetData();
+                    wxListItem      item;

 
 

-                if (item->HasText())
-                {
-                    wxCoord w;
-                    dc.GetTextExtent( item->GetText(), &w, NULL );
-                    current += w;
+                    itemData->GetItem(item);
+                    int itemWidth = GetItemWidthWithImage(&item);
+                    if (itemWidth > max)
+                        max = itemWidth;

                 }
 
                 }
 

-                if (current > max)
-                    max = current;
+                m_aColWidths.Item(col)->bNeedsUpdate = false;
+                m_aColWidths.Item(col)->nMaxWidth = max;

             }
 
             }
 

+            max = m_aColWidths.Item(col)->nMaxWidth;

             width = max + AUTOSIZE_COL_MARGIN;
         }
     }
             width = max + AUTOSIZE_COL_MARGIN;
         }
     }


@@ -3634,6 +3652,15 @@ void wxListMainWindow::SetItem( wxListItem &item )
     {
         wxListLineData *line = GetLine((size_t)id);
         line->SetItem( item.m_col, item );
     {
         wxListLineData *line = GetLine((size_t)id);
         line->SetItem( item.m_col, item );

+
+        if (InReportView())
+        {
+            //  update the Max Width Cache if needed
+            int width = GetItemWidthWithImage(&item);
+
+            if (width > m_aColWidths.Item(item.m_col)->nMaxWidth)
+                m_aColWidths.Item(item.m_col)->nMaxWidth = width;
+        }

     }
 
     // update the item on screen
     }
 
     // update the item on screen


@@ -4222,6 +4249,26 @@ void wxListMainWindow::DeleteItem( long lindex )
 
     if ( InReportView() )
     {
 
     if ( InReportView() )
     {

+    //  mark the Column Max Width cache as dirty if the items in the line
+    //  we're deleting contain the Max Column Width
+        wxListLineData * const line = GetLine(index);
+        wxListItemDataList::compatibility_iterator n;
+        wxListItemData *itemData;
+        wxListItem      item;
+        int             itemWidth;
+
+        for (size_t i = 0; i < m_columns.GetCount(); i++)
+        {
+            n = line->m_items.Item( i );
+            itemData = n->GetData();
+            itemData->GetItem(item);
+
+            itemWidth = GetItemWidthWithImage(&item);
+
+            if (itemWidth >= m_aColWidths.Item(i)->nMaxWidth)
+                m_aColWidths.Item(i)->bNeedsUpdate = true;
+        }
+

         ResetVisibleLinesRange();
     }
 
         ResetVisibleLinesRange();
     }
 


@@ -4266,6 +4313,12 @@ void wxListMainWindow::DeleteColumn( int col )
         }
     }
 
         }
     }
 

+    if ( InReportView() )   //  we only cache max widths when in Report View
+    {
+        delete m_aColWidths.Item(col);
+        m_aColWidths.RemoveAt(col);
+    }
+

     // invalidate it as it has to be recalculated
     m_headerWidth = 0;
 }
     // invalidate it as it has to be recalculated
     m_headerWidth = 0;
 }


@@ -4299,6 +4352,10 @@ void wxListMainWindow::DoDeleteAllItems()
     if ( InReportView() )
     {
         ResetVisibleLinesRange();
     if ( InReportView() )
     {
         ResetVisibleLinesRange();

+        for (size_t i = 0; i < m_aColWidths.GetCount(); i++)
+        {
+            m_aColWidths.Item(i)->bNeedsUpdate = true;
+        }

     }
 
     m_lines.Clear();
     }
 
     m_lines.Clear();


@@ -4314,6 +4371,7 @@ void wxListMainWindow::DeleteAllItems()
 void wxListMainWindow::DeleteEverything()
 {
     WX_CLEAR_LIST(wxListHeaderDataList, m_columns);
 void wxListMainWindow::DeleteEverything()
 {
     WX_CLEAR_LIST(wxListHeaderDataList, m_columns);

+    WX_CLEAR_ARRAY(m_aColWidths);

 
     DeleteAllItems();
 }
 
     DeleteAllItems();
 }


@@ -4439,42 +4497,16 @@ void wxListMainWindow::InsertItem( wxListItem &item )
 
     m_dirty = true;
 
 
     m_dirty = true;
 

-    #if 0
-    // this is unused variable
-    int mode = 0;
-    #endif

     if ( InReportView() )
     {
     if ( InReportView() )
     {

-        #if 0
-        // this is unused variable
-        mode = wxLC_REPORT;
-        #endif

         ResetVisibleLinesRange();
         ResetVisibleLinesRange();

-    }
-    else if ( HasFlag(wxLC_LIST) )
-        #if 0
-        // this is unused variable
-        mode = wxLC_LIST;
-        #else
-        {}
-        #endif
-    else if ( HasFlag(wxLC_ICON) )
-        #if 0
-        // this is unused variable
-        mode = wxLC_ICON;
-        #else
-        {}
-        #endif
-    else if ( HasFlag(wxLC_SMALL_ICON) )
-        #if 0
-        // this is unused variable
-        mode = wxLC_ICON;  // no typo
-        #else
-        {}
-        #endif
-    else
-    {
-        wxFAIL_MSG( _T("unknown mode") );
+
+        // calculate the width of the item and adjust the max column width
+        wxColWidthInfo *pWidthInfo = m_aColWidths.Item(item.GetColumn());
+        int width = GetItemWidthWithImage(&item);
+        item.SetWidth(width);
+        if (width > pWidthInfo->nMaxWidth)
+            pWidthInfo->nMaxWidth = width;

     }
 
     wxListLineData *line = new wxListLineData(this);
     }
 
     wxListLineData *line = new wxListLineData(this);


@@ -4507,15 +4539,20 @@ void wxListMainWindow::InsertColumn( long col, wxListItem &item )
             item.m_width = GetTextLength( item.m_text );
 
         wxListHeaderData *column = new wxListHeaderData( item );
             item.m_width = GetTextLength( item.m_text );
 
         wxListHeaderData *column = new wxListHeaderData( item );

+        wxColWidthInfo *colWidthInfo = new wxColWidthInfo();
+

         bool insert = (col >= 0) && ((size_t)col < m_columns.GetCount());
         if ( insert )
         {
         bool insert = (col >= 0) && ((size_t)col < m_columns.GetCount());
         if ( insert )
         {

-            wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col );
+            wxListHeaderDataList::compatibility_iterator
+                node = m_columns.Item( col );

             m_columns.Insert( node, column );
             m_columns.Insert( node, column );

+            m_aColWidths.Insert( colWidthInfo, col );

         }
         else
         {
             m_columns.Append( column );
         }
         else
         {
             m_columns.Append( column );

+            m_aColWidths.Add( colWidthInfo );

         }
 
         if ( !IsVirtual() )
         }
 
         if ( !IsVirtual() )


@@ -4537,6 +4574,30 @@ void wxListMainWindow::InsertColumn( long col, wxListItem &item )
     }
 }
 
     }
 }
 

+int wxListMainWindow::GetItemWidthWithImage(wxListItem * item)
+{
+    int width = 0;
+    wxClientDC dc(this);
+
+    dc.SetFont( GetFont() );
+
+    if (item->GetImage() != -1)
+    {
+        int ix, iy;
+        GetImageSize( item->GetImage(), ix, iy );
+        width += ix + 5;
+    }
+
+    if (!item->GetText().empty())
+    {
+        wxCoord w;
+        dc.GetTextExtent( item->GetText(), &w, NULL );
+        width += w;
+    }
+
+    return width;
+}
+

 // ----------------------------------------------------------------------------
 // sorting
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // sorting
 // ----------------------------------------------------------------------------


@@ -4575,7 +4636,7 @@ void wxListMainWindow::OnScroll(wxScrollWinEvent& event)
     ResetVisibleLinesRange();
 
     // FIXME
     ResetVisibleLinesRange();
 
     // FIXME

-#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
+#if ( defined(__WXGTK__) || defined(__WXMAC__) ) && !defined(__WXUNIVERSAL__)

     wxScrolledWindow::OnScroll(event);
 #else
     HandleOnScroll( event );
     wxScrolledWindow::OnScroll(event);
 #else
     HandleOnScroll( event );