From: Stefan Csomor Date: Wed, 20 Sep 2006 15:37:25 +0000 (+0000) Subject: undoing my duplicate efforts to solve the same problem ... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3ef4e126a2198e33ad3ec09a0211d5579865d880?ds=sidebyside 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 675feea1f6..dd8276070d 100644 --- 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 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); diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp index 6f92c8713d..b4ac2b78d6 100644 --- a/src/mac/carbon/utils.cpp +++ b/src/mac/carbon/utils.cpp @@ -1879,7 +1879,7 @@ void wxMacDataItemBrowserControl::UpdateItems(const wxMacDataItem *container, 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; @@ -1910,7 +1910,7 @@ void wxMacDataItemBrowserControl::InsertColumn(int colId, DataBrowserPropertyTyp 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