Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add wxTL_NO_HEADER style to wxTreeListCtrl.

Browse Source 
Closes #14838.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-11-19 18:07:55 +00:00
parent ab7f003482
commit c71b5269df
4 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -593,6 +593,7 @@ All (GUI):
- Added wxEVT_COMMAND_DIRCTRL_CHANGED event (troelsk). - Added wxEVT_COMMAND_DIRCTRL_CHANGED event (troelsk).
- Added wxControl::GetSizeFromTextSize() (Manuel Martin). - Added wxControl::GetSizeFromTextSize() (Manuel Martin).
- Optionally allow showing tooltips for disabled ribbon buttons (wxBen). - Optionally allow showing tooltips for disabled ribbon buttons (wxBen).
- Add wxTL_NO_HEADER style to wxTreeListCtrl (robboto).
wxGTK: wxGTK:

3
include/wx/treelist.h
View File

@@ -3,7 +3,7 @@
// Purpose: wxTreeListCtrl class declaration. // Purpose: wxTreeListCtrl class declaration.
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
// Created: 2011-08-17 // Created: 2011-08-17
// RCS-ID: $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $ // RCS-ID: $Id$
// Copyright: (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org> // Copyright: (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWindows licence // Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@@ -47,6 +47,7 @@ enum
wxTL_CHECKBOX = 0x0002, // Show checkboxes in the first column. wxTL_CHECKBOX = 0x0002, // Show checkboxes in the first column.
wxTL_3STATE = 0x0004, // Allow 3rd state in checkboxes. wxTL_3STATE = 0x0004, // Allow 3rd state in checkboxes.
wxTL_USER_3STATE = 0x0008, // Allow user to set 3rd state. wxTL_USER_3STATE = 0x0008, // Allow user to set 3rd state.
wxTL_NO_HEADER = 0x0010, // Column titles not visible.
wxTL_DEFAULT_STYLE = wxTL_SINGLE, wxTL_DEFAULT_STYLE = wxTL_SINGLE,
wxTL_STYLE_MASK = wxTL_SINGLE | wxTL_STYLE_MASK = wxTL_SINGLE |

9
interface/wx/treelist.h
View File

@@ -21,6 +21,15 @@ enum
wxTL_CHECKBOX = 0x0002, /// Show checkboxes in the first column. wxTL_CHECKBOX = 0x0002, /// Show checkboxes in the first column.
wxTL_3STATE = 0x0004, /// Allow 3rd state in checkboxes. wxTL_3STATE = 0x0004, /// Allow 3rd state in checkboxes.
wxTL_USER_3STATE = 0x0008, /// Allow user to set 3rd state. wxTL_USER_3STATE = 0x0008, /// Allow user to set 3rd state.
/**
Don't show the column headers.
By default this control shows the column headers, using this class
allows to avoid this and show only the data.
@since 2.9.5
*/
wxTL_NO_HEADER = 0x0010,
wxTL_DEFAULT_STYLE = wxTL_SINGLE, wxTL_DEFAULT_STYLE = wxTL_SINGLE,
wxTL_STYLE_MASK = wxTL_SINGLE | wxTL_STYLE_MASK = wxTL_SINGLE |

10
src/generic/treelist.cpp
View File

@@ -3,7 +3,7 @@
// Purpose: Generic wxTreeListCtrl implementation. // Purpose: Generic wxTreeListCtrl implementation.
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
// Created: 2011-08-19 // Created: 2011-08-19
// RCS-ID: $Id: wxhead.cpp,v 1.11 2010-04-22 12:44:51 zeitlin Exp $ // RCS-ID: $Id$
// Copyright: (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org> // Copyright: (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWindows licence // Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@@ -1029,10 +1029,14 @@ bool wxTreeListCtrl::Create(wxWindow* parent,
} }
m_view = new wxDataViewCtrl; m_view = new wxDataViewCtrl;
long styleDataView = HasFlag(wxTL_MULTIPLE) ? wxDV_MULTIPLE
: wxDV_SINGLE;
if ( HasFlag(wxTL_NO_HEADER) )
styleDataView |= wxDV_NO_HEADER;
if ( !m_view->Create(this, wxID_ANY, if ( !m_view->Create(this, wxID_ANY,
wxPoint(0, 0), GetClientSize(), wxPoint(0, 0), GetClientSize(),
HasFlag(wxTL_MULTIPLE) ? wxDV_MULTIPLE styleDataView) )
: wxDV_SINGLE) )
{ {
delete m_view; delete m_view;
m_view = NULL; m_view = NULL;