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

extract setters from wxHeaderColumnBase into a separate wxSettableHeaderColumn class as we don't always need to implement them in order to use this class; also renamed wxHeaderColumnBase to just wxHeaderColumn as we didn't have any wxHeaderColumn at all

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-12-11 13:05:48 +00:00
parent 953aebc2d5
commit dcb6cbecc8
10 changed files with 235 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/common/headercolcmn.cpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////////
// Name: src/common/headercolcmn.cpp
// Purpose: wxHeaderColumnBase implementation
// Purpose: wxHeaderColumn implementation
// Author: Vadim Zeitlin
// Created: 2008-12-02
// RCS-ID: $Id$
@@ -29,18 +29,10 @@
#include "wx/headercol.h"
// ============================================================================
// wxHeaderColumnBase implementation
// wxHeaderColumn implementation
// ============================================================================
void wxHeaderColumnBase::SetIndividualFlags(int flags)
{
SetResizeable((flags & wxCOL_RESIZABLE) != 0);
SetSortable((flags & wxCOL_SORTABLE) != 0);
SetReorderable((flags & wxCOL_REORDERABLE) != 0);
SetHidden((flags & wxCOL_HIDDEN) != 0);
}
int wxHeaderColumnBase::GetFromIndividualFlags() const
int wxHeaderColumn::GetFromIndividualFlags() const
{
int flags = 0;
@@ -56,27 +48,39 @@ int wxHeaderColumnBase::GetFromIndividualFlags() const
return flags;
}
void wxHeaderColumnBase::ChangeFlag(int flag, bool set)
// ============================================================================
// wxSettableHeaderColumn implementation
// ============================================================================
void wxSettableHeaderColumn::SetIndividualFlags(int flags)
{
SetResizeable((flags & wxCOL_RESIZABLE) != 0);
SetSortable((flags & wxCOL_SORTABLE) != 0);
SetReorderable((flags & wxCOL_REORDERABLE) != 0);
SetHidden((flags & wxCOL_HIDDEN) != 0);
}
void wxSettableHeaderColumn::ChangeFlag(int flag, bool set)
{
if ( HasFlag(flag) != set )
ToggleFlag(flag);
}
void wxHeaderColumnBase::SetFlag(int flag)
void wxSettableHeaderColumn::SetFlag(int flag)
{
int flags = GetFlags();
if ( !(flags & flag) )
SetFlags(flags | flag);
}
void wxHeaderColumnBase::ClearFlag(int flag)
void wxSettableHeaderColumn::ClearFlag(int flag)
{
int flags = GetFlags();
if ( flags & flag )
SetFlags(flags & ~flag);
}
void wxHeaderColumnBase::ToggleFlag(int flag)
void wxSettableHeaderColumn::ToggleFlag(int flag)
{
int flags = GetFlags();
if ( flags & flag )