undoing my duplicate efforts to solve the same problem ...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/private.h b/include/wx/mac/carbon/private.h
index 675feea1f68598e92d3ec54db4c98cc5004170df..dd8276070d16157a75894751acb91743db52cac5 100644 (file)
--- a/include/wx/mac/carbon/private.h
+++ b/include/wx/mac/carbon/private.h
@@ -908,8 +908,8 @@ public :
     void            UpdateItems(const wxMacDataItem *container, wxArrayMacDataItemPtr &items,
                         DataBrowserPropertyID property) const;
 
     void            UpdateItems(const wxMacDataItem *container, wxArrayMacDataItemPtr &items,
                         DataBrowserPropertyID property) const;
 

-    void            InsertColumn(int colId, DataBrowserPropertyType colType, DataBrowserPropertyFlags flags ,
-                            const wxString& title, SInt16 just = teFlushDefault, int minWidth = -1, int maxWidth = -1);
+    void            InsertColumn(int colId, DataBrowserPropertyType colType,
+                            const wxString& title, SInt16 just = teFlushDefault, int defaultWidth = -1);

                             
     int             GetColumnWidth(int colId);
     void            SetColumnWidth(int colId, int width);
                             
     int             GetColumnWidth(int colId);
     void            SetColumnWidth(int colId, int width);

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 6f92c8713da59a17e64034b21a9af1f2223f8d8f..b4ac2b78d67eea425cf4e24d2d462d574d1dacc1 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -1879,7 +1879,7 @@ void wxMacDataItemBrowserControl::UpdateItems(const wxMacDataItem *container,
     delete [] items;
 }
 
     delete [] items;
 }
 

-void wxMacDataItemBrowserControl::InsertColumn(int colId, DataBrowserPropertyType colType, DataBrowserPropertyFlags flags ,
+void wxMacDataItemBrowserControl::InsertColumn(int colId, DataBrowserPropertyType colType,

                                             const wxString& title, SInt16 just, int defaultWidth)
 {
     DataBrowserListViewColumnDesc columnDesc;
                                             const wxString& title, SInt16 just, int defaultWidth)
 {
     DataBrowserListViewColumnDesc columnDesc;


@@ -1910,7 +1910,7 @@ void wxMacDataItemBrowserControl::InsertColumn(int colId, DataBrowserPropertyTyp
 
     columnDesc.propertyDesc.propertyID = (kMinColumnId + colId);
     columnDesc.propertyDesc.propertyType = colType;
 
     columnDesc.propertyDesc.propertyID = (kMinColumnId + colId);
     columnDesc.propertyDesc.propertyType = colType;

-    columnDesc.propertyDesc.propertyFlags = flags; 
+    columnDesc.propertyDesc.propertyFlags = kDataBrowserListViewDefaultColumnFlags | kDataBrowserListViewNoGapForIconInHeaderButton; 

 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
     columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn;
 #endif
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2
     columnDesc.propertyDesc.propertyFlags |= kDataBrowserListViewTypeSelectColumn;
 #endif