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 );