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

Removed some irritating flags.

Browse Source 
Implmented the remaining ones under GTK.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-10-01 21:09:56 +00:00
parent c4ad618c2f
commit 008b5a66f7
6 changed files with 24 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/dataview.h
View File

@@ -253,18 +253,11 @@ enum wxDataViewColumnFlags
wxDATAVIEW_COL_HIDDEN = 4
};
enum wxDataViewColumnSizing
{
wxDATAVIEW_COL_WIDTH_FIXED,
wxDATAVIEW_COL_WIDTH_AUTO,
wxDATAVIEW_COL_WIDTH_GROW
};
class WXDLLIMPEXP_ADV wxDataViewColumnBase: public wxObject
{
public:
wxDataViewColumnBase( const wxString &title, wxDataViewCell *cell, size_t model_column,
int fixed_width = 80, wxDataViewColumnSizing sizing = wxDATAVIEW_COL_WIDTH_FIXED, int flags = 0 );
int width = 80, int flags = wxDATAVIEW_COL_RESIZABLE );
virtual ~wxDataViewColumnBase();
virtual void SetTitle( const wxString &title );
@@ -279,9 +272,6 @@ public:
virtual int GetWidth() = 0;
virtual void SetFixedWidth( int width ) = 0;
virtual int GetFixedWidth() = 0;
private:
wxDataViewCtrl *m_ctrl;
wxDataViewCell *m_cell;

6
include/wx/generic/dataview.h
View File

@@ -215,19 +215,15 @@ class WXDLLIMPEXP_ADV wxDataViewColumn: public wxDataViewColumnBase
{
public:
wxDataViewColumn( const wxString &title, wxDataViewCell *cell, size_t model_column,
int fixed_width = 80, wxDataViewColumnSizing sizing = wxDATAVIEW_COL_WIDTH_FIXED, int flags = 0 );
int width = 80, int flags = wxDATAVIEW_COL_RESIZABLE );
virtual ~wxDataViewColumn();
virtual void SetTitle( const wxString &title );
virtual int GetWidth();
virtual void SetFixedWidth( int width );
virtual int GetFixedWidth();
private:
int m_width;
wxDataViewColumnSizing m_sizing;
int m_fixedWidth;
protected:

2
include/wx/gtk/dataview.h
View File

@@ -189,7 +189,7 @@ class WXDLLIMPEXP_CORE wxDataViewColumn: public wxDataViewColumnBase
{
public:
wxDataViewColumn( const wxString &title, wxDataViewCell *cell, size_t model_column,
int fixed_width = 80, wxDataViewColumnSizing sizing = wxDATAVIEW_COL_WIDTH_FIXED, int flags = 0 );
int width = 80, int flags = wxDATAVIEW_COL_RESIZABLE );
virtual ~wxDataViewColumn();
virtual void SetTitle( const wxString &title );

5
src/common/datavcmn.cpp
View File

@@ -696,9 +696,8 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject)
wxDataViewColumnBase::wxDataViewColumnBase(const wxString& title,
wxDataViewCell *cell,
size_t model_column,
int WXUNUSED(fixed_width),
wxDataViewColumnSizing WXUNUSED(sizing),
int flags )
int WXUNUSED(width),
int flags )
{
m_cell = cell;
m_model_column = model_column;

27
src/generic/datavgen.cpp
View File

@@ -595,13 +595,12 @@ bool wxDataViewDateCell::Activate( wxRect WXUNUSED(cell), wxDataViewListModel *m
IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell, size_t model_column,
int fixed_width, wxDataViewColumnSizing sizing, int flags ) :
wxDataViewColumnBase( title, cell, model_column, flags )
int width, int flags ) :
wxDataViewColumnBase( title, cell, model_column, width, flags )
{
m_sizing = sizing;
m_width = fixed_width;
m_fixedWidth = fixed_width;
m_width = width;
if (m_width < 0)
m_width = 80;
}
wxDataViewColumn::~wxDataViewColumn()
@@ -619,22 +618,6 @@ int wxDataViewColumn::GetWidth()
return m_width;
}
void wxDataViewColumn::SetFixedWidth( int width )
{
m_fixedWidth = width;
if (m_sizing == wxDATAVIEW_COL_WIDTH_FIXED)
{
m_width = width;
// Set dirty
}
}
int wxDataViewColumn::GetFixedWidth()
{
return m_fixedWidth;
}
//-----------------------------------------------------------------------------
// wxDataViewHeaderWindow
//-----------------------------------------------------------------------------

25
src/gtk/dataview.cpp
View File

@@ -1420,8 +1420,8 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
IMPLEMENT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell, size_t model_column,
int fixed_width, wxDataViewColumnSizing sizing, int flags ) :
wxDataViewColumnBase( title, cell, model_column, flags )
int width, int flags ) :
wxDataViewColumnBase( title, cell, model_column, width, flags )
{
GtkCellRenderer *renderer = (GtkCellRenderer *) cell->GetGtkHandle();
@@ -1429,17 +1429,20 @@ wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell,
gtk_tree_view_column_set_title( column, wxGTK_CONV(title) );
if (sizing == wxDATAVIEW_COL_WIDTH_FIXED)
if (flags & wxDATAVIEW_COL_RESIZABLE)
gtk_tree_view_column_set_resizable( column, true );
if (flags & wxDATAVIEW_COL_HIDDEN)
gtk_tree_view_column_set_visible( column, false );
if (flags & wxDATAVIEW_COL_SORTABLE)
gtk_tree_view_column_set_sort_indicator( column, true );
if (width > 0)
{
gtk_tree_view_column_set_fixed_width( column, width );
gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_FIXED );
else if (sizing == wxDATAVIEW_COL_WIDTH_GROW)
gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_GROW_ONLY );
else
gtk_tree_view_column_set_sizing( column, GTK_TREE_VIEW_COLUMN_AUTOSIZE );
}
if (fixed_width > 0)
gtk_tree_view_column_set_fixed_width( column, fixed_width );
gtk_tree_view_column_pack_start( column, renderer, TRUE );
gtk_tree_view_column_pack_end( column, renderer, FALSE );
gtk_tree_view_column_set_cell_data_func( column, renderer,
wxGtkTreeCellDataFunc, (gpointer) cell, NULL );