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

Replaces size_t with unsigned int in wxDataViewCtrl API.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-10-03 11:09:06 +00:00
parent 3ed1dc0add
commit 0a71f9e92f
7 changed files with 262 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
include/wx/dataview.h
View File

@@ -74,11 +74,11 @@ public:
virtual bool RowAppended() = 0;
virtual bool RowPrepended() = 0;
virtual bool RowInserted( size_t before ) = 0;
virtual bool RowDeleted( size_t row ) = 0;
virtual bool RowChanged( size_t row ) = 0;
virtual bool ValueChanged( size_t col, size_t row ) = 0;
virtual bool RowsReordered( size_t *new_order ) = 0;
virtual bool RowInserted( unsigned int before ) = 0;
virtual bool RowDeleted( unsigned int row ) = 0;
virtual bool RowChanged( unsigned int row ) = 0;
virtual bool ValueChanged( unsigned int col, unsigned int row ) = 0;
virtual bool RowsReordered( unsigned int *new_order ) = 0;
virtual bool Cleared() = 0;
void SetOwner( wxDataViewListModel *owner ) { m_owner = owner; }
@@ -95,14 +95,14 @@ private:
class WXDLLIMPEXP_ADV wxDataViewViewingColumn: public wxObject
{
public:
wxDataViewViewingColumn( wxDataViewColumn *view_column, size_t model_column )
wxDataViewViewingColumn( wxDataViewColumn *view_column, unsigned int model_column )
{
m_viewColumn = view_column;
m_modelColumn = model_column;
}
wxDataViewColumn *m_viewColumn;
size_t m_modelColumn;
unsigned int m_modelColumn;
};
class WXDLLIMPEXP_ADV wxDataViewListModel: public wxDataViewModel
@@ -111,27 +111,27 @@ public:
wxDataViewListModel();
virtual ~wxDataViewListModel();
virtual size_t GetNumberOfRows() = 0;
virtual size_t GetNumberOfCols() = 0;
virtual unsigned int GetNumberOfRows() = 0;
virtual unsigned int GetNumberOfCols() = 0;
// return type as reported by wxVariant
virtual wxString GetColType( size_t col ) = 0;
virtual wxString GetColType( unsigned int col ) = 0;
// get value into a wxVariant
virtual void GetValue( wxVariant &variant, size_t col, size_t row ) = 0;
virtual void GetValue( wxVariant &variant, unsigned int col, unsigned int row ) = 0;
// set value, call ValueChanged() afterwards!
virtual bool SetValue( wxVariant &variant, size_t col, size_t row ) = 0;
virtual bool SetValue( wxVariant &variant, unsigned int col, unsigned int row ) = 0;
// delegated notifiers
virtual bool RowAppended();
virtual bool RowPrepended();
virtual bool RowInserted( size_t before );
virtual bool RowDeleted( size_t row );
virtual bool RowChanged( size_t row );
virtual bool ValueChanged( size_t col, size_t row );
virtual bool RowsReordered( size_t *new_order );
virtual bool RowInserted( unsigned int before );
virtual bool RowDeleted( unsigned int row );
virtual bool RowChanged( unsigned int row );
virtual bool ValueChanged( unsigned int col, unsigned int row );
virtual bool RowsReordered( unsigned int *new_order );
virtual bool Cleared();
// Used internally
virtual void AddViewingColumn( wxDataViewColumn *view_column, size_t model_column );
virtual void AddViewingColumn( wxDataViewColumn *view_column, unsigned int model_column );
virtual void RemoveViewingColumn( wxDataViewColumn *column );
virtual void AddNotifier( wxDataViewListModelNotifier *notifier );
@@ -149,9 +149,9 @@ protected:
// ---------------------------------------------------------
typedef int (wxCALLBACK *wxDataViewListModelCompare)
(size_t row1, size_t row2, size_t col, wxDataViewListModel* model );
(unsigned int row1, unsigned int row2, unsigned int col, wxDataViewListModel* model );
WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(size_t, wxDataViewSortedIndexArray, WXDLLIMPEXP_ADV);
WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSortedIndexArray, WXDLLIMPEXP_ADV);
class WXDLLIMPEXP_ADV wxDataViewSortedListModel: public wxDataViewListModel
{
@@ -159,33 +159,33 @@ public:
wxDataViewSortedListModel( wxDataViewListModel *child );
virtual ~wxDataViewSortedListModel();
virtual size_t GetNumberOfRows();
virtual size_t GetNumberOfCols();
virtual unsigned int GetNumberOfRows();
virtual unsigned int GetNumberOfCols();
// return type as reported by wxVariant
virtual wxString GetColType( size_t col );
virtual wxString GetColType( unsigned int col );
// get value into a wxVariant
virtual void GetValue( wxVariant &variant, size_t col, size_t row );
virtual void GetValue( wxVariant &variant, unsigned int col, unsigned int row );
// set value, call ValueChanged() afterwards!
virtual bool SetValue( wxVariant &variant, size_t col, size_t row );
virtual bool SetValue( wxVariant &variant, unsigned int col, unsigned int row );
// called from user
virtual bool RowAppended();
virtual bool RowPrepended();
virtual bool RowInserted( size_t before );
virtual bool RowDeleted( size_t row );
virtual bool RowChanged( size_t row );
virtual bool ValueChanged( size_t col, size_t row );
virtual bool RowsReordered( size_t *new_order );
virtual bool RowInserted( unsigned int before );
virtual bool RowDeleted( unsigned int row );
virtual bool RowChanged( unsigned int row );
virtual bool ValueChanged( unsigned int col, unsigned int row );
virtual bool RowsReordered( unsigned int *new_order );
virtual bool Cleared();
// called if child's notifiers are called
bool ChildRowAppended();
bool ChildRowPrepended();
bool ChildRowInserted( size_t before );
bool ChildRowDeleted( size_t row );
bool ChildRowChanged( size_t row );
bool ChildValueChanged( size_t col, size_t row );
bool ChildRowsReordered( size_t *new_order );
bool ChildRowInserted( unsigned int before );
bool ChildRowDeleted( unsigned int row );
bool ChildRowChanged( unsigned int row );
bool ChildValueChanged( unsigned int col, unsigned int row );
bool ChildRowsReordered( unsigned int *new_order );
bool ChildCleared();
virtual void Resort();
@@ -256,7 +256,7 @@ enum wxDataViewColumnFlags
class WXDLLIMPEXP_ADV wxDataViewColumnBase: public wxObject
{
public:
wxDataViewColumnBase( const wxString &title, wxDataViewCell *cell, size_t model_column,
wxDataViewColumnBase( const wxString &title, wxDataViewCell *cell, unsigned int model_column,
int width = 80, int flags = wxDATAVIEW_COL_RESIZABLE );
virtual ~wxDataViewColumnBase();
@@ -265,7 +265,7 @@ public:
wxDataViewCell* GetCell() { return m_cell; }
size_t GetModelColumn() { return m_model_column; }
unsigned int GetModelColumn() { return m_model_column; }
void SetOwner( wxDataViewCtrl *owner ) { m_owner = owner; }
wxDataViewCtrl *GetOwner() { return m_owner; }
@@ -300,15 +300,15 @@ public:
virtual bool AssociateModel( wxDataViewListModel *model );
wxDataViewListModel* GetModel();
virtual bool AppendTextColumn( const wxString &label, size_t model_column );
virtual bool AppendToggleColumn( const wxString &label, size_t model_column );
virtual bool AppendProgressColumn( const wxString &label, size_t model_column );
virtual bool AppendDateColumn( const wxString &label, size_t model_column );
virtual bool AppendTextColumn( const wxString &label, unsigned int model_column );
virtual bool AppendToggleColumn( const wxString &label, unsigned int model_column );
virtual bool AppendProgressColumn( const wxString &label, unsigned int model_column );
virtual bool AppendDateColumn( const wxString &label, unsigned int model_column );
virtual bool AppendColumn( wxDataViewColumn *col );
virtual size_t GetNumberOfColumns();
virtual bool DeleteColumn( size_t pos );
virtual unsigned int GetNumberOfColumns();
virtual bool DeleteColumn( unsigned int pos );
virtual bool ClearColumns();
virtual wxDataViewColumn* GetColumn( size_t pos );
virtual wxDataViewColumn* GetColumn( unsigned int pos );
private:
wxDataViewListModel *m_model;

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

@@ -40,27 +40,27 @@ public:
virtual bool Activate( wxRect WXUNUSED(cell),
wxDataViewListModel *WXUNUSED(model),
size_t WXUNUSED(col),
size_t WXUNUSED(row) )
unsigned int WXUNUSED(col),
unsigned int WXUNUSED(row) )
{ return false; }
virtual bool LeftClick( wxPoint WXUNUSED(cursor),
wxRect WXUNUSED(cell),
wxDataViewListModel *WXUNUSED(model),
size_t WXUNUSED(col),
size_t WXUNUSED(row) )
unsigned int WXUNUSED(col),
unsigned int WXUNUSED(row) )
{ return false; }
virtual bool RightClick( wxPoint WXUNUSED(cursor),
wxRect WXUNUSED(cell),
wxDataViewListModel *WXUNUSED(model),
size_t WXUNUSED(col),
size_t WXUNUSED(row) )
unsigned int WXUNUSED(col),
unsigned int WXUNUSED(row) )
{ return false; }
virtual bool StartDrag( wxPoint WXUNUSED(cursor),
wxRect WXUNUSED(cell),
wxDataViewListModel *WXUNUSED(model),
size_t WXUNUSED(col),
size_t WXUNUSED(row) )
unsigned int WXUNUSED(col),
unsigned int WXUNUSED(row) )
{ return false; }
// Create DC on request
@@ -148,7 +148,7 @@ public:
bool GetValue( wxVariant &value );
bool Render( wxRect cell, wxDC *dc, int state );
bool Activate( wxRect cell, wxDataViewListModel *model, size_t col, size_t row );
bool Activate( wxRect cell, wxDataViewListModel *model, unsigned int col, unsigned int row );
wxSize GetSize();
private:
@@ -198,7 +198,7 @@ public:
virtual bool Render( wxRect cell, wxDC *dc, int state );
virtual wxSize GetSize();
virtual bool Activate( wxRect cell,
wxDataViewListModel *model, size_t col, size_t row );
wxDataViewListModel *model, unsigned int col, unsigned int row );
private:
wxDateTime m_date;
@@ -214,7 +214,7 @@ protected:
class WXDLLIMPEXP_ADV wxDataViewColumn: public wxDataViewColumnBase
{
public:
wxDataViewColumn( const wxString &title, wxDataViewCell *cell, size_t model_column,
wxDataViewColumn( const wxString &title, wxDataViewCell *cell, unsigned int model_column,
int width = 80, int flags = wxDATAVIEW_COL_RESIZABLE );
virtual ~wxDataViewColumn();

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

@@ -109,17 +109,17 @@ public:
virtual wxSize GetSize() = 0;
virtual bool Activate( wxRect cell,
wxDataViewListModel *model, size_t col, size_t row )
wxDataViewListModel *model, unsigned int col, unsigned int row )
{ return false; }
virtual bool LeftClick( wxPoint cursor, wxRect cell,
wxDataViewListModel *model, size_t col, size_t row )
wxDataViewListModel *model, unsigned int col, unsigned int row )
{ return false; }
virtual bool RightClick( wxPoint cursor, wxRect cell,
wxDataViewListModel *model, size_t col, size_t row )
wxDataViewListModel *model, unsigned int col, unsigned int row )
{ return false; }
virtual bool StartDrag( wxPoint cursor, wxRect cell,
wxDataViewListModel *model, size_t col, size_t row )
wxDataViewListModel *model, unsigned int col, unsigned int row )
{ return false; }
// Create DC on request
@@ -172,7 +172,7 @@ public:
virtual bool Render( wxRect cell, wxDC *dc, int state );
virtual wxSize GetSize();
virtual bool Activate( wxRect cell,
wxDataViewListModel *model, size_t col, size_t row );
wxDataViewListModel *model, unsigned int col, unsigned int row );
private:
wxDateTime m_date;
@@ -188,7 +188,7 @@ protected:
class WXDLLIMPEXP_CORE wxDataViewColumn: public wxDataViewColumnBase
{
public:
wxDataViewColumn( const wxString &title, wxDataViewCell *cell, size_t model_column,
wxDataViewColumn( const wxString &title, wxDataViewCell *cell, unsigned int model_column,
int width = 80, int flags = wxDATAVIEW_COL_RESIZABLE );
virtual ~wxDataViewColumn();

28
samples/dataview/dataview.cpp
View File

@@ -43,7 +43,7 @@ class MyTextModel: public wxDataViewListModel
public:
MyTextModel()
{
size_t i;
unsigned int i;
for (i = 0; i < 1000; i++)
m_list.Add( wxT("Test") );
for (i = 0; i < 500; i++)
@@ -59,13 +59,13 @@ public:
}
}
virtual size_t GetNumberOfRows()
virtual unsigned int GetNumberOfRows()
{ return 1000; }
virtual size_t GetNumberOfCols()
virtual unsigned int GetNumberOfCols()
{ return 7; }
// as reported by wxVariant
virtual wxString GetColType( size_t col )
virtual wxString GetColType( unsigned int col )
{
if (col == 6)
return wxT("datetime");
@@ -79,7 +79,7 @@ public:
return wxT("string");
}
virtual void GetValue( wxVariant &variant, size_t col, size_t row )
virtual void GetValue( wxVariant &variant, unsigned int col, unsigned int row )
{
if (col == 6)
{
@@ -108,7 +108,7 @@ public:
variant = tmp;
}
}
virtual bool SetValue( wxVariant &value, size_t col, size_t row )
virtual bool SetValue( wxVariant &value, unsigned int col, unsigned int row )
{
if (col == 6)
{
@@ -167,8 +167,8 @@ public:
}
bool Activate( wxRect WXUNUSED(rect),
wxDataViewListModel *WXUNUSED(model),
size_t WXUNUSED(col),
size_t WXUNUSED(row) )
unsigned int WXUNUSED(col),
unsigned int WXUNUSED(row) )
{
return false;
}
@@ -197,10 +197,10 @@ public:
m_bitmap = wxBitmap( null_xpm );
}
virtual size_t GetNumberOfRows() { return m_list.GetCount(); }
virtual size_t GetNumberOfCols() { return 2; }
virtual wxString GetColType( size_t WXUNUSED(col) ) { return wxT("string"); }
virtual void GetValue( wxVariant &variant, size_t col, size_t row )
virtual unsigned int GetNumberOfRows() { return m_list.GetCount(); }
virtual unsigned int GetNumberOfCols() { return 2; }
virtual wxString GetColType( unsigned int WXUNUSED(col) ) { return wxT("string"); }
virtual void GetValue( wxVariant &variant, unsigned int col, unsigned int row )
{
if (col == 0)
{
@@ -216,7 +216,7 @@ public:
tmp.Printf( wxT("item(%d;%d)"), (int)row, (int)col );
variant = tmp;
}
virtual bool SetValue( wxVariant &variant, size_t col, size_t row )
virtual bool SetValue( wxVariant &variant, unsigned int col, unsigned int row )
{
if (col == 0)
{
@@ -245,7 +245,7 @@ public:
RowInserted( 1 );
}
void DeleteRow( size_t index )
void DeleteRow( unsigned int index )
{
m_list.RemoveAt( index );
RowDeleted( index );

140
src/common/datavcmn.cpp
View File

@@ -79,7 +79,7 @@ bool wxDataViewListModel::RowPrepended()
return ret;
}
bool wxDataViewListModel::RowInserted( size_t before )
bool wxDataViewListModel::RowInserted( unsigned int before )
{
bool ret = true;
@@ -95,7 +95,7 @@ bool wxDataViewListModel::RowInserted( size_t before )
return ret;
}
bool wxDataViewListModel::RowDeleted( size_t row )
bool wxDataViewListModel::RowDeleted( unsigned int row )
{
bool ret = true;
@@ -111,7 +111,7 @@ bool wxDataViewListModel::RowDeleted( size_t row )
return ret;
}
bool wxDataViewListModel::RowChanged( size_t row )
bool wxDataViewListModel::RowChanged( unsigned int row )
{
bool ret = true;
@@ -127,7 +127,7 @@ bool wxDataViewListModel::RowChanged( size_t row )
return ret;
}
bool wxDataViewListModel::ValueChanged( size_t col, size_t row )
bool wxDataViewListModel::ValueChanged( unsigned int col, unsigned int row )
{
bool ret = true;
@@ -143,7 +143,7 @@ bool wxDataViewListModel::ValueChanged( size_t col, size_t row )
return ret;
}
bool wxDataViewListModel::RowsReordered( size_t *new_order )
bool wxDataViewListModel::RowsReordered( unsigned int *new_order )
{
bool ret = true;
@@ -175,7 +175,7 @@ bool wxDataViewListModel::Cleared()
return ret;
}
void wxDataViewListModel::AddViewingColumn( wxDataViewColumn *view_column, size_t model_column )
void wxDataViewListModel::AddViewingColumn( wxDataViewColumn *view_column, unsigned int model_column )
{
m_viewingColumns.Append( new wxDataViewViewingColumn( view_column, model_column ) );
}
@@ -224,19 +224,19 @@ public:
virtual bool RowPrepended()
{ return m_model->ChildRowPrepended(); }
virtual bool RowInserted( size_t before )
virtual bool RowInserted( unsigned int before )
{ return m_model->ChildRowInserted( before ); }
virtual bool RowDeleted( size_t row )
virtual bool RowDeleted( unsigned int row )
{ return m_model->ChildRowDeleted( row ); }
virtual bool RowChanged( size_t row )
virtual bool RowChanged( unsigned int row )
{ return m_model->ChildRowChanged( row ); }
virtual bool ValueChanged( size_t col, size_t row )
virtual bool ValueChanged( unsigned int col, unsigned int row )
{ return m_model->ChildValueChanged( col, row); }
virtual bool RowsReordered( size_t *new_order )
virtual bool RowsReordered( unsigned int *new_order )
{ return m_model->ChildRowsReordered( new_order ); }
virtual bool Cleared()
@@ -250,7 +250,7 @@ public:
// ---------------------------------------------------------
int wxCALLBACK wxDataViewListModelSortedDefaultCompare
(size_t row1, size_t row2, size_t col, wxDataViewListModel* model )
(unsigned int row1, unsigned int row2, unsigned int col, wxDataViewListModel* model )
{
wxVariant value1,value2;
model->GetValue( value1, col, row1 );
@@ -289,9 +289,9 @@ int wxCALLBACK wxDataViewListModelSortedDefaultCompare
static wxDataViewListModelCompare s_CmpFunc;
static wxDataViewListModel *s_CmpModel;
static size_t s_CmpCol;
static unsigned int s_CmpCol;
int LINKAGEMODE wxDataViewIntermediateCmp( size_t row1, size_t row2 )
int LINKAGEMODE wxDataViewIntermediateCmp( unsigned int row1, unsigned int row2 )
{
return s_CmpFunc( row1, row2, s_CmpCol, s_CmpModel );
}
@@ -324,17 +324,17 @@ wxDataViewSortedListModel::~wxDataViewSortedListModel()
void wxDataViewSortedListModel::Resort()
{
m_array.Clear();
size_t n = m_child->GetNumberOfRows();
size_t i;
unsigned int n = m_child->GetNumberOfRows();
unsigned int i;
for (i = 0; i < n; i++)
m_array.Add( i );
}
#if 0
static void Dump( wxDataViewListModel *model, size_t col )
static void Dump( wxDataViewListModel *model, unsigned int col )
{
size_t n = model->GetNumberOfRows();
size_t i;
unsigned int n = model->GetNumberOfRows();
unsigned int i;
for (i = 0; i < n; i++)
{
wxVariant variant;
@@ -350,9 +350,9 @@ bool wxDataViewSortedListModel::ChildRowAppended()
{
// no need to fix up array
size_t len = m_array.GetCount();
unsigned int len = m_array.GetCount();
size_t pos = m_array.Add( len );
unsigned int pos = m_array.Add( len );
if (pos == 0)
return wxDataViewListModel::RowPrepended();
@@ -366,15 +366,15 @@ bool wxDataViewSortedListModel::ChildRowAppended()
bool wxDataViewSortedListModel::ChildRowPrepended()
{
// fix up array
size_t i;
size_t len = m_array.GetCount();
unsigned int i;
unsigned int len = m_array.GetCount();
for (i = 0; i < len; i++)
{
size_t value = m_array[i];
unsigned int value = m_array[i];
m_array[i] = value+1;
}
size_t pos = m_array.Add( 0 );
unsigned int pos = m_array.Add( 0 );
if (pos == 0)
return wxDataViewListModel::RowPrepended();
@@ -385,19 +385,19 @@ bool wxDataViewSortedListModel::ChildRowPrepended()
return wxDataViewListModel::RowInserted( pos );
}
bool wxDataViewSortedListModel::ChildRowInserted( size_t before )
bool wxDataViewSortedListModel::ChildRowInserted( unsigned int before )
{
// fix up array
size_t i;
size_t len = m_array.GetCount();
unsigned int i;
unsigned int len = m_array.GetCount();
for (i = 0; i < len; i++)
{
size_t value = m_array[i];
unsigned int value = m_array[i];
if (value >= before)
m_array[i] = value+1;
}
size_t pos = m_array.Add( before );
unsigned int pos = m_array.Add( before );
if (pos == 0)
return wxDataViewListModel::RowPrepended();
@@ -408,14 +408,14 @@ bool wxDataViewSortedListModel::ChildRowInserted( size_t before )
return wxDataViewListModel::RowInserted( pos );
}
bool wxDataViewSortedListModel::ChildRowDeleted( size_t row )
bool wxDataViewSortedListModel::ChildRowDeleted( unsigned int row )
{
size_t i;
size_t len = m_array.GetCount();
unsigned int i;
unsigned int len = m_array.GetCount();
int pos = -1;
for (i = 0; i < len; i++)
{
size_t value = m_array[i];
unsigned int value = m_array[i];
if (value == row)
{
// delete later
@@ -433,19 +433,19 @@ bool wxDataViewSortedListModel::ChildRowDeleted( size_t row )
return false; // we should probably assert
// remove
m_array.RemoveAt( (size_t) pos );
m_array.RemoveAt( (unsigned int) pos );
return wxDataViewListModel::RowDeleted( (size_t) pos);
return wxDataViewListModel::RowDeleted( (unsigned int) pos);
}
bool wxDataViewSortedListModel::ChildRowChanged( size_t row )
bool wxDataViewSortedListModel::ChildRowChanged( unsigned int row )
{
size_t i;
size_t len = m_array.GetCount();
unsigned int i;
unsigned int len = m_array.GetCount();
// Remove and readd sorted. Find out at which
// position it was and where it ended.
size_t start_pos = 0,end_pos = 0;
unsigned int start_pos = 0,end_pos = 0;
for (i = 0; i < len; i++)
if (m_array[i] == row)
{
@@ -467,7 +467,7 @@ bool wxDataViewSortedListModel::ChildRowChanged( size_t row )
// Create an array where order[old] -> new_pos, so that
// if nothing changed order[0] -> 0 etc.
size_t *order = new size_t[ len ];
unsigned int *order = new unsigned int[ len ];
// Fill up initial values.
for (i = 0; i < len; i++)
order[i] = i;
@@ -492,14 +492,14 @@ bool wxDataViewSortedListModel::ChildRowChanged( size_t row )
return true;
}
bool wxDataViewSortedListModel::ChildValueChanged( size_t col, size_t row )
bool wxDataViewSortedListModel::ChildValueChanged( unsigned int col, unsigned int row )
{
size_t i;
size_t len = m_array.GetCount();
unsigned int i;
unsigned int len = m_array.GetCount();
// Remove and readd sorted. Find out at which
// position it was and where it ended.
size_t start_pos = 0,end_pos = 0;
unsigned int start_pos = 0,end_pos = 0;
for (i = 0; i < len; i++)
if (m_array[i] == row)
{
@@ -521,7 +521,7 @@ bool wxDataViewSortedListModel::ChildValueChanged( size_t col, size_t row )
// Create an array where order[old] -> new_pos, so that
// if nothing changed order[0] -> 0 etc.
size_t *order = new size_t[ len ];
unsigned int *order = new unsigned int[ len ];
// Fill up initial values.
for (i = 0; i < len; i++)
order[i] = i;
@@ -546,7 +546,7 @@ bool wxDataViewSortedListModel::ChildValueChanged( size_t col, size_t row )
return true;
}
bool wxDataViewSortedListModel::ChildRowsReordered( size_t *WXUNUSED(new_order) )
bool wxDataViewSortedListModel::ChildRowsReordered( unsigned int *WXUNUSED(new_order) )
{
// Nothing needs to be done. If the sort criteria
// of this list don't change, the order of the
@@ -559,30 +559,30 @@ bool wxDataViewSortedListModel::ChildCleared()
return wxDataViewListModel::Cleared();
}
size_t wxDataViewSortedListModel::GetNumberOfRows()
unsigned int wxDataViewSortedListModel::GetNumberOfRows()
{
return m_array.GetCount();
}
size_t wxDataViewSortedListModel::GetNumberOfCols()
unsigned int wxDataViewSortedListModel::GetNumberOfCols()
{
return m_child->GetNumberOfCols();
}
wxString wxDataViewSortedListModel::GetColType( size_t col )
wxString wxDataViewSortedListModel::GetColType( unsigned int col )
{
return m_child->GetColType( col );
}
void wxDataViewSortedListModel::GetValue( wxVariant &variant, size_t col, size_t row )
void wxDataViewSortedListModel::GetValue( wxVariant &variant, unsigned int col, unsigned int row )
{
size_t child_row = m_array[row];
unsigned int child_row = m_array[row];
m_child->GetValue( variant, col, child_row );
}
bool wxDataViewSortedListModel::SetValue( wxVariant &variant, size_t col, size_t row )
bool wxDataViewSortedListModel::SetValue( wxVariant &variant, unsigned int col, unsigned int row )
{
size_t child_row = m_array[row];
unsigned int child_row = m_array[row];
bool ret = m_child->SetValue( variant, col, child_row );
// Do nothing here as the change in the
@@ -613,7 +613,7 @@ bool wxDataViewSortedListModel::RowPrepended()
return ret;
}
bool wxDataViewSortedListModel::RowInserted( size_t WXUNUSED(before) )
bool wxDataViewSortedListModel::RowInserted( unsigned int WXUNUSED(before) )
{
// you can only append
bool ret = m_child->RowAppended();
@@ -624,9 +624,9 @@ bool wxDataViewSortedListModel::RowInserted( size_t WXUNUSED(before) )
return ret;
}
bool wxDataViewSortedListModel::RowDeleted( size_t row )
bool wxDataViewSortedListModel::RowDeleted( unsigned int row )
{
size_t child_row = m_array[row];
unsigned int child_row = m_array[row];
bool ret = m_child->RowDeleted( child_row );
@@ -636,9 +636,9 @@ bool wxDataViewSortedListModel::RowDeleted( size_t row )
return ret;
}
bool wxDataViewSortedListModel::RowChanged( size_t row )
bool wxDataViewSortedListModel::RowChanged( unsigned int row )
{
size_t child_row = m_array[row];
unsigned int child_row = m_array[row];
bool ret = m_child->RowChanged( child_row );
// Do nothing here as the change in the
@@ -647,9 +647,9 @@ bool wxDataViewSortedListModel::RowChanged( size_t row )
return ret;
}
bool wxDataViewSortedListModel::ValueChanged( size_t col, size_t row )
bool wxDataViewSortedListModel::ValueChanged( unsigned int col, unsigned int row )
{
size_t child_row = m_array[row];
unsigned int child_row = m_array[row];
bool ret = m_child->ValueChanged( col, child_row );
// Do nothing here as the change in the
@@ -658,7 +658,7 @@ bool wxDataViewSortedListModel::ValueChanged( size_t col, size_t row )
return ret;
}
bool wxDataViewSortedListModel::RowsReordered( size_t *WXUNUSED(new_order) )
bool wxDataViewSortedListModel::RowsReordered( unsigned int *WXUNUSED(new_order) )
{
// We sort them ourselves.
@@ -695,7 +695,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumnBase, wxObject)
wxDataViewColumnBase::wxDataViewColumnBase(const wxString& title,
wxDataViewCell *cell,
size_t model_column,
unsigned int model_column,
int WXUNUSED(width),
int flags )
{
@@ -756,22 +756,22 @@ wxDataViewListModel* wxDataViewCtrlBase::GetModel()
return m_model;
}
bool wxDataViewCtrlBase::AppendTextColumn( const wxString &label, size_t model_column )
bool wxDataViewCtrlBase::AppendTextColumn( const wxString &label, unsigned int model_column )
{
return AppendColumn( new wxDataViewColumn( label, new wxDataViewTextCell(), model_column ) );
}
bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, size_t model_column )
bool wxDataViewCtrlBase::AppendToggleColumn( const wxString &label, unsigned int model_column )
{
return AppendColumn( new wxDataViewColumn( label, new wxDataViewToggleCell(), model_column, 30 ) );
}
bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, size_t model_column )
bool wxDataViewCtrlBase::AppendProgressColumn( const wxString &label, unsigned int model_column )
{
return AppendColumn( new wxDataViewColumn( label, new wxDataViewProgressCell(), model_column, 70 ) );
}
bool wxDataViewCtrlBase::AppendDateColumn( const wxString &label, size_t model_column )
bool wxDataViewCtrlBase::AppendDateColumn( const wxString &label, unsigned int model_column )
{
return AppendColumn( new wxDataViewColumn( label, new wxDataViewDateCell(), model_column ) );
}
@@ -784,12 +784,12 @@ bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )
return true;
}
size_t wxDataViewCtrlBase::GetNumberOfColumns()
unsigned int wxDataViewCtrlBase::GetNumberOfColumns()
{
return m_cols.GetCount();
}
bool wxDataViewCtrlBase::DeleteColumn( size_t WXUNUSED(pos) )
bool wxDataViewCtrlBase::DeleteColumn( unsigned int WXUNUSED(pos) )
{
return false;
}
@@ -799,7 +799,7 @@ bool wxDataViewCtrlBase::ClearColumns()
return false;
}
wxDataViewColumn* wxDataViewCtrlBase::GetColumn( size_t pos )
wxDataViewColumn* wxDataViewCtrlBase::GetColumn( unsigned int pos )
{
return (wxDataViewColumn*) m_cols[ pos ];
}

178
src/generic/datavgen.cpp
View File

@@ -98,7 +98,7 @@ public:
wxDataViewTextCtrlWrapper( wxDataViewMainWindow *owner,
wxTextCtrl *text,
wxDataViewListModel *model,
size_t col, size_t row,
unsigned int col, unsigned int row,
wxRect cellLabel );
wxTextCtrl *GetText() const { return m_text; }
@@ -118,8 +118,8 @@ private:
wxTextCtrl *m_text;
wxString m_startValue;
wxDataViewListModel *m_model;
size_t m_col;
size_t m_row;
unsigned int m_col;
unsigned int m_row;
bool m_finished;
bool m_aboutToFinish;
@@ -130,7 +130,7 @@ private:
// wxDataViewMainWindow
//-----------------------------------------------------------------------------
WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(size_t, wxDataViewSelection, WXDLLIMPEXP_ADV);
WX_DEFINE_SORTED_USER_EXPORTED_ARRAY_SIZE_T(unsigned int, wxDataViewSelection, WXDLLIMPEXP_ADV);
class wxDataViewMainWindow: public wxWindow
{
@@ -145,18 +145,18 @@ public:
// notifications from wxDataViewListModel
bool RowAppended();
bool RowPrepended();
bool RowInserted( size_t before );
bool RowDeleted( size_t row );
bool RowChanged( size_t row );
bool ValueChanged( size_t col, size_t row );
bool RowsReordered( size_t *new_order );
bool RowInserted( unsigned int before );
bool RowDeleted( unsigned int row );
bool RowChanged( unsigned int row );
bool ValueChanged( unsigned int col, unsigned int row );
bool RowsReordered( unsigned int *new_order );
bool Cleared();
void SetOwner( wxDataViewCtrl* owner ) { m_owner = owner; }
wxDataViewCtrl *GetOwner() { return m_owner; }
void OnPaint( wxPaintEvent &event );
void OnArrowChar(size_t newCurrent, const wxKeyEvent& event);
void OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event);
void OnChar( wxKeyEvent &event );
void OnMouse( wxMouseEvent &event );
void OnSetFocus( wxFocusEvent &event );
@@ -171,27 +171,27 @@ public:
void ScrollWindow( int dx, int dy, const wxRect *rect );
bool HasCurrentRow() { return m_currentRow != (size_t)-1; }
void ChangeCurrentRow( size_t row );
bool HasCurrentRow() { return m_currentRow != (unsigned int)-1; }
void ChangeCurrentRow( unsigned int row );
bool IsSingleSel() const { return !GetParent()->HasFlag(wxDV_MULTIPLE); };
bool IsEmpty() { return GetRowCount() == 0; }
int GetCountPerPage();
int GetEndOfLastCol();
size_t GetFirstVisibleRow();
size_t GetLastVisibleRow();
size_t GetRowCount();
unsigned int GetFirstVisibleRow();
unsigned int GetLastVisibleRow();
unsigned int GetRowCount();
void SelectAllRows( bool on );
void SelectRow( size_t row, bool on );
void SelectRows( size_t from, size_t to, bool on );
void ReverseRowSelection( size_t row );
bool IsRowSelected( size_t row );
void SelectRow( unsigned int row, bool on );
void SelectRows( unsigned int from, unsigned int to, bool on );
void ReverseRowSelection( unsigned int row );
bool IsRowSelected( unsigned int row );
void RefreshRow( size_t row );
void RefreshRows( size_t from, size_t to );
void RefreshRowsAfter( size_t firstRow );
void RefreshRow( unsigned int row );
void RefreshRows( unsigned int from, unsigned int to );
void RefreshRowsAfter( unsigned int firstRow );
private:
wxDataViewCtrl *m_owner;
@@ -199,7 +199,7 @@ private:
bool m_dirty;
wxDataViewColumn *m_currentCol;
size_t m_currentRow;
unsigned int m_currentRow;
wxDataViewSelection m_selection;
wxDataViewRenameTimer *m_renameTimer;
@@ -212,7 +212,7 @@ private:
wxPoint m_dragStart;
// for double click logic
size_t m_lineLastClicked,
unsigned int m_lineLastClicked,
m_lineBeforeLastClicked,
m_lineSelectSingleOnUp;
@@ -235,15 +235,15 @@ public:
{ return m_mainWindow->RowAppended(); }
virtual bool RowPrepended()
{ return m_mainWindow->RowPrepended(); }
virtual bool RowInserted( size_t before )
virtual bool RowInserted( unsigned int before )
{ return m_mainWindow->RowInserted( before ); }
virtual bool RowDeleted( size_t row )
virtual bool RowDeleted( unsigned int row )
{ return m_mainWindow->RowDeleted( row ); }
virtual bool RowChanged( size_t row )
virtual bool RowChanged( unsigned int row )
{ return m_mainWindow->RowChanged( row ); }
virtual bool ValueChanged( size_t col, size_t row )
virtual bool ValueChanged( unsigned int col, unsigned int row )
{ return m_mainWindow->ValueChanged( col, row ); }
virtual bool RowsReordered( size_t *new_order )
virtual bool RowsReordered( unsigned int *new_order )
{ return m_mainWindow->RowsReordered( new_order ); }
virtual bool Cleared()
{ return m_mainWindow->Cleared(); }
@@ -426,7 +426,7 @@ bool wxDataViewToggleCell::Render( wxRect cell, wxDC *dc, int WXUNUSED(state) )
return true;
}
bool wxDataViewToggleCell::Activate( wxRect WXUNUSED(cell), wxDataViewListModel *model, size_t col, size_t row )
bool wxDataViewToggleCell::Activate( wxRect WXUNUSED(cell), wxDataViewListModel *model, unsigned int col, unsigned int row )
{
bool value = !m_toggle;
wxVariant variant = value;
@@ -497,7 +497,7 @@ class wxDataViewDateCellPopupTransient: public wxPopupTransientWindow
{
public:
wxDataViewDateCellPopupTransient( wxWindow* parent, wxDateTime *value,
wxDataViewListModel *model, size_t col, size_t row ) :
wxDataViewListModel *model, unsigned int col, unsigned int row ) :
wxPopupTransientWindow( parent, wxBORDER_SIMPLE )
{
m_model = model;
@@ -514,8 +514,8 @@ public:
wxCalendarCtrl *m_cal;
wxDataViewListModel *m_model;
size_t m_col;
size_t m_row;
unsigned int m_col;
unsigned int m_row;
protected:
virtual void OnDismiss()
@@ -572,7 +572,7 @@ wxSize wxDataViewDateCell::GetSize()
return wxSize(x,y+d);
}
bool wxDataViewDateCell::Activate( wxRect WXUNUSED(cell), wxDataViewListModel *model, size_t col, size_t row )
bool wxDataViewDateCell::Activate( wxRect WXUNUSED(cell), wxDataViewListModel *model, unsigned int col, unsigned int row )
{
wxVariant variant;
model->GetValue( variant, col, row );
@@ -594,7 +594,7 @@ bool wxDataViewDateCell::Activate( wxRect WXUNUSED(cell), wxDataViewListModel *m
IMPLEMENT_ABSTRACT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell, size_t model_column,
wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell, unsigned int model_column,
int width, int flags ) :
wxDataViewColumnBase( title, cell, model_column, width, flags )
{
@@ -668,8 +668,8 @@ void wxDataViewHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
dc.SetFont( GetFont() );
size_t cols = GetOwner()->GetNumberOfColumns();
size_t i;
unsigned int cols = GetOwner()->GetNumberOfColumns();
unsigned int i;
int xpos = 0;
for (i = 0; i < cols; i++)
{
@@ -732,7 +732,7 @@ wxDataViewTextCtrlWrapper::wxDataViewTextCtrlWrapper(
wxDataViewMainWindow *owner,
wxTextCtrl *text,
wxDataViewListModel *model,
size_t col, size_t row,
unsigned int col, unsigned int row,
wxRect rectLabel )
{
m_owner = owner;
@@ -865,7 +865,7 @@ void wxDataViewTextCtrlWrapper::Finish()
// wxDataViewMainWindow
//-----------------------------------------------------------------------------
int LINKAGEMODE wxDataViewSelectionCmp( size_t row1, size_t row2 )
int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 )
{
if (row1 > row2) return 1;
if (row1 == row2) return 0;
@@ -904,9 +904,9 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i
m_dragCount = 0;
m_dragStart = wxPoint(0,0);
m_lineLastClicked = (size_t) -1;
m_lineBeforeLastClicked = (size_t) -1;
m_lineSelectSingleOnUp = (size_t) -1;
m_lineLastClicked = (unsigned int) -1;
m_lineBeforeLastClicked = (unsigned int) -1;
m_lineSelectSingleOnUp = (unsigned int) -1;
m_hasFocus = false;
@@ -929,8 +929,8 @@ void wxDataViewMainWindow::OnRenameTimer()
int xpos = 0;
size_t cols = GetOwner()->GetNumberOfColumns();
size_t i;
unsigned int cols = GetOwner()->GetNumberOfColumns();
unsigned int i;
for (i = 0; i < cols; i++)
{
wxDataViewColumn *c = GetOwner()->GetColumn( i );
@@ -965,22 +965,22 @@ bool wxDataViewMainWindow::RowPrepended()
return false;
}
bool wxDataViewMainWindow::RowInserted( size_t WXUNUSED(before) )
bool wxDataViewMainWindow::RowInserted( unsigned int WXUNUSED(before) )
{
return false;
}
bool wxDataViewMainWindow::RowDeleted( size_t WXUNUSED(row) )
bool wxDataViewMainWindow::RowDeleted( unsigned int WXUNUSED(row) )
{
return false;
}
bool wxDataViewMainWindow::RowChanged( size_t WXUNUSED(row) )
bool wxDataViewMainWindow::RowChanged( unsigned int WXUNUSED(row) )
{
return false;
}
bool wxDataViewMainWindow::ValueChanged( size_t WXUNUSED(col), size_t row )
bool wxDataViewMainWindow::ValueChanged( unsigned int WXUNUSED(col), unsigned int row )
{
wxRect rect( 0, row*m_lineHeight, 10000, m_lineHeight );
m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
@@ -989,7 +989,7 @@ bool wxDataViewMainWindow::ValueChanged( size_t WXUNUSED(col), size_t row )
return true;
}
bool wxDataViewMainWindow::RowsReordered( size_t *WXUNUSED(new_order) )
bool wxDataViewMainWindow::RowsReordered( unsigned int *WXUNUSED(new_order) )
{
Refresh();
@@ -1027,8 +1027,8 @@ void wxDataViewMainWindow::RecalculateDisplay()
}
int width = 0;
size_t cols = GetOwner()->GetNumberOfColumns();
size_t i;
unsigned int cols = GetOwner()->GetNumberOfColumns();
unsigned int i;
for (i = 0; i < cols; i++)
{
wxDataViewColumn *col = GetOwner()->GetColumn( i );
@@ -1062,13 +1062,13 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
wxDataViewListModel *model = GetOwner()->GetModel();
size_t item_start = wxMax( 0, (update.y / m_lineHeight) );
size_t item_count = wxMin( (int)(((update.y + update.height) / m_lineHeight) - item_start + 1),
unsigned int item_start = wxMax( 0, (update.y / m_lineHeight) );
unsigned int item_count = wxMin( (int)(((update.y + update.height) / m_lineHeight) - item_start + 1),
(int)(model->GetNumberOfRows()-item_start) );
size_t item;
unsigned int item;
for (item = item_start; item < item_start+item_count; item++)
{
if (m_selection.Index( item ) != wxNOT_FOUND)
@@ -1110,8 +1110,8 @@ void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
wxRect cell_rect;
cell_rect.x = 0;
cell_rect.height = m_lineHeight;
size_t cols = GetOwner()->GetNumberOfColumns();
size_t i;
unsigned int cols = GetOwner()->GetNumberOfColumns();
unsigned int i;
for (i = 0; i < cols; i++)
{
wxDataViewColumn *col = GetOwner()->GetColumn( i );
@@ -1152,7 +1152,7 @@ int wxDataViewMainWindow::GetCountPerPage()
int wxDataViewMainWindow::GetEndOfLastCol()
{
int width = 0;
size_t i;
unsigned int i;
for (i = 0; i < GetOwner()->GetNumberOfColumns(); i++)
{
wxDataViewColumn *c = GetOwner()->GetColumn( i );
@@ -1161,7 +1161,7 @@ int wxDataViewMainWindow::GetEndOfLastCol()
return width;
}
size_t wxDataViewMainWindow::GetFirstVisibleRow()
unsigned int wxDataViewMainWindow::GetFirstVisibleRow()
{
int x = 0;
int y = 0;
@@ -1170,7 +1170,7 @@ size_t wxDataViewMainWindow::GetFirstVisibleRow()
return y / m_lineHeight;
}
size_t wxDataViewMainWindow::GetLastVisibleRow()
unsigned int wxDataViewMainWindow::GetLastVisibleRow()
{
wxSize client_size = GetClientSize();
m_owner->CalcUnscrolledPosition( client_size.x, client_size.y, &client_size.x, &client_size.y );
@@ -1178,12 +1178,12 @@ size_t wxDataViewMainWindow::GetLastVisibleRow()
return wxMin( GetRowCount()-1, ((unsigned)client_size.y/m_lineHeight)+1 );
}
size_t wxDataViewMainWindow::GetRowCount()
unsigned int wxDataViewMainWindow::GetRowCount()
{
return GetOwner()->GetModel()->GetNumberOfRows();
}
void wxDataViewMainWindow::ChangeCurrentRow( size_t row )
void wxDataViewMainWindow::ChangeCurrentRow( unsigned int row )
{
m_currentRow = row;
@@ -1198,18 +1198,18 @@ void wxDataViewMainWindow::SelectAllRows( bool on )
if (on)
{
m_selection.Clear();
for (size_t i = 0; i < GetRowCount(); i++)
for (unsigned int i = 0; i < GetRowCount(); i++)
m_selection.Add( i );
Refresh();
}
else
{
size_t first_visible = GetFirstVisibleRow();
size_t last_visible = GetLastVisibleRow();
size_t i;
unsigned int first_visible = GetFirstVisibleRow();
unsigned int last_visible = GetLastVisibleRow();
unsigned int i;
for (i = 0; i < m_selection.GetCount(); i++)
{
size_t row = m_selection[i];
unsigned int row = m_selection[i];
if ((row >= first_visible) && (row <= last_visible))
RefreshRow( row );
}
@@ -1217,7 +1217,7 @@ void wxDataViewMainWindow::SelectAllRows( bool on )
}
}
void wxDataViewMainWindow::SelectRow( size_t row, bool on )
void wxDataViewMainWindow::SelectRow( unsigned int row, bool on )
{
if (m_selection.Index( row ) == wxNOT_FOUND)
{
@@ -1237,16 +1237,16 @@ void wxDataViewMainWindow::SelectRow( size_t row, bool on )
}
}
void wxDataViewMainWindow::SelectRows( size_t from, size_t to, bool on )
void wxDataViewMainWindow::SelectRows( unsigned int from, unsigned int to, bool on )
{
if (from > to)
{
size_t tmp = from;
unsigned int tmp = from;
from = to;
to = tmp;
}
size_t i;
unsigned int i;
for (i = from; i <= to; i++)
{
if (m_selection.Index( i ) == wxNOT_FOUND)
@@ -1263,7 +1263,7 @@ void wxDataViewMainWindow::SelectRows( size_t from, size_t to, bool on )
RefreshRows( from, to );
}
void wxDataViewMainWindow::ReverseRowSelection( size_t row )
void wxDataViewMainWindow::ReverseRowSelection( unsigned int row )
{
if (m_selection.Index( row ) == wxNOT_FOUND)
m_selection.Add( row );
@@ -1272,12 +1272,12 @@ void wxDataViewMainWindow::ReverseRowSelection( size_t row )
RefreshRow( row );
}
bool wxDataViewMainWindow::IsRowSelected( size_t row )
bool wxDataViewMainWindow::IsRowSelected( unsigned int row )
{
return (m_selection.Index( row ) != wxNOT_FOUND);
}
void wxDataViewMainWindow::RefreshRow( size_t row )
void wxDataViewMainWindow::RefreshRow( unsigned int row )
{
wxRect rect( 0, row*m_lineHeight, GetEndOfLastCol(), m_lineHeight );
m_owner->CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
@@ -1289,11 +1289,11 @@ void wxDataViewMainWindow::RefreshRow( size_t row )
Refresh( true, &intersect_rect );
}
void wxDataViewMainWindow::RefreshRows( size_t from, size_t to )
void wxDataViewMainWindow::RefreshRows( unsigned int from, unsigned int to )
{
if (from > to)
{
size_t tmp = to;
unsigned int tmp = to;
to = from;
from = tmp;
}
@@ -1308,9 +1308,9 @@ void wxDataViewMainWindow::RefreshRows( size_t from, size_t to )
Refresh( true, &intersect_rect );
}
void wxDataViewMainWindow::RefreshRowsAfter( size_t firstRow )
void wxDataViewMainWindow::RefreshRowsAfter( unsigned int firstRow )
{
size_t count = GetRowCount();
unsigned int count = GetRowCount();
if (firstRow > count)
return;
@@ -1324,7 +1324,7 @@ void wxDataViewMainWindow::RefreshRowsAfter( size_t firstRow )
Refresh( true, &intersect_rect );
}
void wxDataViewMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event)
void wxDataViewMainWindow::OnArrowChar(unsigned int newCurrent, const wxKeyEvent& event)
{
wxCHECK_RET( newCurrent < GetRowCount(),
_T("invalid item index in OnArrowChar()") );
@@ -1333,7 +1333,7 @@ void wxDataViewMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& even
if (!HasCurrentRow())
return;
size_t oldCurrent = m_currentRow;
unsigned int oldCurrent = m_currentRow;
// in single selection we just ignore Shift as we can't select several
// items anyhow
@@ -1431,8 +1431,8 @@ void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
case WXK_PAGEDOWN:
{
int steps = pageSize - 1;
size_t index = m_currentRow + steps;
size_t count = GetRowCount();
unsigned int index = m_currentRow + steps;
unsigned int count = GetRowCount();
if ( index >= count )
index = count - 1;
@@ -1461,8 +1461,8 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
wxDataViewColumn *col = NULL;
int xpos = 0;
size_t cols = GetOwner()->GetNumberOfColumns();
size_t i;
unsigned int cols = GetOwner()->GetNumberOfColumns();
unsigned int i;
for (i = 0; i < cols; i++)
{
wxDataViewColumn *c = GetOwner()->GetColumn( i );
@@ -1477,7 +1477,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
return;
wxDataViewCell *cell = col->GetCell();
size_t current = y / m_lineHeight;
unsigned int current = y / m_lineHeight;
if ((current > GetRowCount()) || (x > GetEndOfLastCol()))
{
@@ -1545,7 +1545,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
if (event.LeftUp())
{
if (m_lineSelectSingleOnUp != (size_t)-1)
if (m_lineSelectSingleOnUp != (unsigned int)-1)
{
// select single line
SelectAllRows( false );
@@ -1562,7 +1562,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
}
m_lastOnSame = false;
m_lineSelectSingleOnUp = (size_t)-1;
m_lineSelectSingleOnUp = (unsigned int)-1;
}
else
{
@@ -1570,7 +1570,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
// from and to ourself, the up event is swallowed by the
// DnD code. So on next non-up event (which means here and
// now) m_lineSelectSingleOnUp should be reset.
m_lineSelectSingleOnUp = (size_t)-1;
m_lineSelectSingleOnUp = (unsigned int)-1;
}
if (event.RightDown())
@@ -1607,7 +1607,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
m_lineBeforeLastClicked = m_lineLastClicked;
m_lineLastClicked = current;
size_t oldCurrentRow = m_currentRow;
unsigned int oldCurrentRow = m_currentRow;
bool oldWasSelected = IsRowSelected(m_currentRow);
bool cmdModifierDown = event.CmdDown();
@@ -1639,7 +1639,7 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
{
ChangeCurrentRow(current);
size_t lineFrom = oldCurrentRow,
unsigned int lineFrom = oldCurrentRow,
lineTo = current;
if ( lineTo < lineFrom )

56
src/gtk/dataview.cpp
View File

@@ -247,7 +247,7 @@ wxgtk_list_store_get_column_type (GtkTreeModel *tree_model,
GType gtype = G_TYPE_INVALID;
wxString wxtype = list_store->model->GetColType( (size_t) index );
wxString wxtype = list_store->model->GetColType( (unsigned int) index );
if (wxtype == wxT("string"))
gtype = G_TYPE_STRING;
@@ -264,7 +264,7 @@ wxgtk_list_store_get_iter (GtkTreeModel *tree_model,
g_return_val_if_fail (GTK_IS_WX_LIST_STORE (tree_model), FALSE);
g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
size_t i = (size_t)gtk_tree_path_get_indices (path)[0];
unsigned int i = (unsigned int)gtk_tree_path_get_indices (path)[0];
if (i >= list_store->model->GetNumberOfRows())
return FALSE;
@@ -300,12 +300,12 @@ wxgtk_list_store_get_value (GtkTreeModel *tree_model,
g_return_if_fail (GTK_IS_WX_LIST_STORE (tree_model) );
wxDataViewListModel *model = list_store->model;
wxString mtype = model->GetColType( (size_t) column );
wxString mtype = model->GetColType( (unsigned int) column );
if (mtype == wxT("string"))
{
wxVariant variant;
g_value_init( value, G_TYPE_STRING );
model->GetValue( variant, (size_t) column, (size_t) iter->user_data );
model->GetValue( variant, (unsigned int) column, (unsigned int) iter->user_data );
g_value_set_string( value, wxGTK_CONV(variant.GetString()) );
}
else
@@ -685,10 +685,10 @@ gtk_wx_cell_renderer_activate(
wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel();
GtkTreePath *treepath = gtk_tree_path_new_from_string( path );
size_t model_row = (size_t)gtk_tree_path_get_indices (treepath)[0];
unsigned int model_row = (unsigned int)gtk_tree_path_get_indices (treepath)[0];
gtk_tree_path_free( treepath );
size_t model_col = cell->GetOwner()->GetModelColumn();
unsigned int model_col = cell->GetOwner()->GetModelColumn();
if (event->type == GDK_BUTTON_PRESS)
{
@@ -731,11 +731,11 @@ public:
virtual bool RowAppended();
virtual bool RowPrepended();
virtual bool RowInserted( size_t before );
virtual bool RowDeleted( size_t row );
virtual bool RowChanged( size_t row );
virtual bool ValueChanged( size_t col, size_t row );
virtual bool RowsReordered( size_t *new_order );
virtual bool RowInserted( unsigned int before );
virtual bool RowDeleted( unsigned int row );
virtual bool RowChanged( unsigned int row );
virtual bool ValueChanged( unsigned int col, unsigned int row );
virtual bool RowsReordered( unsigned int *new_order );
virtual bool Cleared();
GtkWxListStore *m_gtk_store;
@@ -755,7 +755,7 @@ wxGtkDataViewListModelNotifier::wxGtkDataViewListModelNotifier(
bool wxGtkDataViewListModelNotifier::RowAppended()
{
size_t pos = m_wx_model->GetNumberOfRows()-1;
unsigned int pos = m_wx_model->GetNumberOfRows()-1;
GtkTreeIter iter;
iter.stamp = m_gtk_store->stamp;
@@ -783,7 +783,7 @@ bool wxGtkDataViewListModelNotifier::RowPrepended()
return true;
}
bool wxGtkDataViewListModelNotifier::RowInserted( size_t before )
bool wxGtkDataViewListModelNotifier::RowInserted( unsigned int before )
{
GtkTreeIter iter;
iter.stamp = m_gtk_store->stamp;
@@ -797,7 +797,7 @@ bool wxGtkDataViewListModelNotifier::RowInserted( size_t before )
return true;
}
bool wxGtkDataViewListModelNotifier::RowDeleted( size_t row )
bool wxGtkDataViewListModelNotifier::RowDeleted( unsigned int row )
{
GtkTreePath *path = gtk_tree_path_new ();
gtk_tree_path_append_index (path, (gint) row);
@@ -807,7 +807,7 @@ bool wxGtkDataViewListModelNotifier::RowDeleted( size_t row )
return true;
}
bool wxGtkDataViewListModelNotifier::RowChanged( size_t row )
bool wxGtkDataViewListModelNotifier::RowChanged( unsigned int row )
{
GtkTreeIter iter;
iter.stamp = m_gtk_store->stamp;
@@ -819,7 +819,7 @@ bool wxGtkDataViewListModelNotifier::RowChanged( size_t row )
return true;
}
bool wxGtkDataViewListModelNotifier::ValueChanged( size_t model_col, size_t model_row )
bool wxGtkDataViewListModelNotifier::ValueChanged( unsigned int model_col, unsigned int model_row )
{
// This adds GTK+'s missing MVC logic for ValueChanged
wxNode *node = GetOwner()->m_viewingColumns.GetFirst();
@@ -850,9 +850,9 @@ bool wxGtkDataViewListModelNotifier::ValueChanged( size_t model_col, size_t mode
return true;
}
bool wxGtkDataViewListModelNotifier::RowsReordered( size_t *new_order )
bool wxGtkDataViewListModelNotifier::RowsReordered( unsigned int *new_order )
{
// Assume sizeof(size_t)= == sizeof(gint)
// Assume sizeof(unsigned int)= == sizeof(gint)
GtkTreePath *path = gtk_tree_path_new ();
gtk_tree_model_rows_reordered (GTK_TREE_MODEL (m_gtk_store), path, NULL, (gint*)new_order);
@@ -912,10 +912,10 @@ static void wxGtkTextRendererEditedCallback( GtkCellRendererText *renderer,
wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel();
GtkTreePath *path = gtk_tree_path_new_from_string( arg1 );
size_t model_row = (size_t)gtk_tree_path_get_indices (path)[0];
unsigned int model_row = (unsigned int)gtk_tree_path_get_indices (path)[0];
gtk_tree_path_free( path );
size_t model_col = cell->GetOwner()->GetModelColumn();
unsigned int model_col = cell->GetOwner()->GetModelColumn();
model->SetValue( value, model_col, model_row );
model->ValueChanged( model_col, model_row );
@@ -1054,10 +1054,10 @@ static void wxGtkToggleRendererToggledCallback( GtkCellRendererToggle *renderer,
wxDataViewListModel *model = cell->GetOwner()->GetOwner()->GetModel();
GtkTreePath *gtk_path = gtk_tree_path_new_from_string( path );
size_t model_row = (size_t)gtk_tree_path_get_indices (gtk_path)[0];
unsigned int model_row = (unsigned int)gtk_tree_path_get_indices (gtk_path)[0];
gtk_tree_path_free( gtk_path );
size_t model_col = cell->GetOwner()->GetModelColumn();
unsigned int model_col = cell->GetOwner()->GetModelColumn();
model->SetValue( value, model_col, model_row );
model->ValueChanged( model_col, model_row );
@@ -1290,7 +1290,7 @@ class wxDataViewDateCellPopupTransient: public wxPopupTransientWindow
{
public:
wxDataViewDateCellPopupTransient( wxWindow* parent, wxDateTime *value,
wxDataViewListModel *model, size_t col, size_t row ) :
wxDataViewListModel *model, unsigned int col, unsigned int row ) :
wxPopupTransientWindow( parent, wxBORDER_SIMPLE )
{
m_model = model;
@@ -1311,8 +1311,8 @@ public:
wxCalendarCtrl *m_cal;
wxDataViewListModel *m_model;
size_t m_col;
size_t m_row;
unsigned int m_col;
unsigned int m_row;
private:
DECLARE_EVENT_TABLE()
@@ -1364,7 +1364,7 @@ wxSize wxDataViewDateCell::GetSize()
return wxSize(x,y+d);
}
bool wxDataViewDateCell::Activate( wxRect cell, wxDataViewListModel *model, size_t col, size_t row )
bool wxDataViewDateCell::Activate( wxRect cell, wxDataViewListModel *model, unsigned int col, unsigned int row )
{
wxVariant variant;
model->GetValue( variant, col, row );
@@ -1404,7 +1404,7 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
wxDataViewCell *cell = (wxDataViewCell*) data;
size_t model_row = (size_t) iter->user_data;
unsigned int model_row = (unsigned int) iter->user_data;
wxVariant value;
list_store->model->GetValue( value, cell->GetOwner()->GetModelColumn(), model_row );
@@ -1419,7 +1419,7 @@ static void wxGtkTreeCellDataFunc( GtkTreeViewColumn *column,
IMPLEMENT_CLASS(wxDataViewColumn, wxDataViewColumnBase)
wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell, size_t model_column,
wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewCell *cell, unsigned int model_column,
int width, int flags ) :
wxDataViewColumnBase( title, cell, model_column, width, flags )
{