Explicitly unregister custom wxWebViewIE namespaces when we are done with them. Also...

[wxWidgets.git] / src / common / listctrlcmn.cpp

diff --git a/src/common/listctrlcmn.cpp b/src/common/listctrlcmn.cpp
index b19ed6e38cb42d7ca401e5f53ff9e8ab9c82e335..a4cd12f2889ac372a1d384ee5a5565f691bcc330 100644 (file)
--- a/src/common/listctrlcmn.cpp
+++ b/src/common/listctrlcmn.cpp
@@ -153,7 +153,9 @@ wxListCtrlBase::InsertColumn(long col,
     wxListItem item;
     item.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_FORMAT;
     item.m_text = heading;
     wxListItem item;
     item.m_mask = wxLIST_MASK_TEXT | wxLIST_MASK_FORMAT;
     item.m_text = heading;

-    if ( width > -1 )
+    if ( width >= 0
+            || width == wxLIST_AUTOSIZE
+                || width == wxLIST_AUTOSIZE_USEHEADER )

     {
         item.m_mask |= wxLIST_MASK_WIDTH;
         item.m_width = width;
     {
         item.m_mask |= wxLIST_MASK_WIDTH;
         item.m_width = width;


@@ -183,6 +185,9 @@ wxSize wxListCtrlBase::DoGetBestClientSize() const
     if ( !InReportView() )
         return wxControl::DoGetBestClientSize();
 
     if ( !InReportView() )
         return wxControl::DoGetBestClientSize();
 

+    int totalWidth;
+    wxClientDC dc(const_cast<wxListCtrlBase*>(this));
+

     // In report mode, we use only the column headers, not items, to determine
     // the best width. The reason for this is that it's easier (we can't just
     // iterate over all items, especially not in a virtual control, so we'd
     // In report mode, we use only the column headers, not items, to determine
     // the best width. The reason for this is that it's easier (we can't just
     // iterate over all items, especially not in a virtual control, so we'd


@@ -194,15 +199,17 @@ wxSize wxListCtrlBase::DoGetBestClientSize() const
     // headers are just truncated if there is not enough place for them.
     const int columns = GetColumnCount();
     if ( HasFlag(wxLC_NO_HEADER) || !columns )
     // headers are just truncated if there is not enough place for them.
     const int columns = GetColumnCount();
     if ( HasFlag(wxLC_NO_HEADER) || !columns )

-        return wxControl::DoGetBestClientSize();
-
-    wxClientDC dc(const_cast<wxListCtrlBase*>(this));
-
-    // Total width of all headers determines the best control width.
-    int totalWidth = 0;
-    for ( int col = 0; col < columns; col++ )

     {
     {

-        totalWidth += GetColumnWidth(col);
+        // Use some arbitrary width.
+        totalWidth = 50*dc.GetCharWidth();
+    }
+    else // We do have columns, use them to determine the best width.
+    {
+        totalWidth = 0;
+        for ( int col = 0; col < columns; col++ )
+        {
+            totalWidth += GetColumnWidth(col);
+        }

     }
 
     // Use some arbitrary height, there is no good way to determine it.
     }
 
     // Use some arbitrary height, there is no good way to determine it.