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

Add support for bitmaps in headers.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-10-05 19:06:21 +00:00
parent 3ff07edb0b
commit 07a84e7bbb
7 changed files with 150 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/dataview.h
View File

@@ -24,7 +24,7 @@
#if defined(__WXGTK20__)
// for testing
// #define wxUSE_GENERICDATAVIEWCTRL 1
#define wxUSE_GENERICDATAVIEWCTRL 1
#elif defined(__WXMAC__)
#define wxUSE_GENERICDATAVIEWCTRL 1
#else
@@ -258,11 +258,16 @@ class WXDLLIMPEXP_ADV wxDataViewColumnBase: public wxObject
public:
wxDataViewColumnBase( const wxString &title, wxDataViewRenderer *renderer, unsigned int model_column,
int width = 80, int flags = wxDATAVIEW_COL_RESIZABLE );
wxDataViewColumnBase( const wxBitmap &bitmap, wxDataViewRenderer *renderer, unsigned int model_column,
int width = 80, int flags = wxDATAVIEW_COL_RESIZABLE );
virtual ~wxDataViewColumnBase();
virtual void SetTitle( const wxString &title );
virtual wxString GetTitle();
virtual void SetBitmap( const wxBitmap &bitmap );
virtual const wxBitmap &GetBitmap();
wxDataViewRenderer* GetRenderer() { return m_renderer; }
unsigned int GetModelColumn() { return m_model_column; }
@@ -278,6 +283,7 @@ private:
int m_model_column;
int m_flags;
wxString m_title;
wxBitmap m_bitmap;
wxDataViewCtrl *m_owner;
protected:
@@ -300,10 +306,18 @@ public:
virtual bool AssociateModel( wxDataViewListModel *model );
wxDataViewListModel* GetModel();
// short cuts
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 AppendBitmapColumn( const wxString &label, unsigned int model_column );
virtual bool AppendTextColumn( const wxBitmap &label, unsigned int model_column );
virtual bool AppendToggleColumn( const wxBitmap &label, unsigned int model_column );
virtual bool AppendProgressColumn( const wxBitmap &label, unsigned int model_column );
virtual bool AppendDateColumn( const wxBitmap &label, unsigned int model_column );
virtual bool AppendBitmapColumn( const wxBitmap &label, unsigned int model_column );
virtual bool AppendColumn( wxDataViewColumn *col );
virtual unsigned int GetNumberOfColumns();
virtual bool DeleteColumn( unsigned int pos );

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

@@ -216,6 +216,8 @@ class WXDLLIMPEXP_ADV wxDataViewColumn: public wxDataViewColumnBase
public:
wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer, unsigned int model_column,
int width = 80, int flags = wxDATAVIEW_COL_RESIZABLE );
wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *renderer, unsigned int model_column,
int width = 80, int flags = wxDATAVIEW_COL_RESIZABLE );
virtual ~wxDataViewColumn();
virtual void SetTitle( const wxString &title );

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

@@ -190,10 +190,13 @@ class WXDLLIMPEXP_CORE wxDataViewColumn: public wxDataViewColumnBase
public:
wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer, unsigned int model_column,
int width = 80, int flags = wxDATAVIEW_COL_RESIZABLE );
wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *renderer, unsigned int model_column,
int width = 80, int flags = wxDATAVIEW_COL_RESIZABLE );
virtual ~wxDataViewColumn();
virtual void SetTitle( const wxString &title );
virtual void SetBitmap( const wxBitmap &bitmap );
virtual int GetWidth();
virtual void SetFixedWidth( int width );

2
samples/dataview/dataview.cpp
View File

@@ -509,7 +509,7 @@ MySortingFrame::MySortingFrame(wxFrame *frame, wxChar *title, int x, int y, int
wxDataViewColumn *column = new wxDataViewColumn( wxT("editable"), text_renderer, 0 );
dataview_left->AppendColumn( column );
dataview_left->AppendTextColumn( wxT("second"), 1 );
dataview_left->AppendColumn( new wxDataViewColumn( wxT("icon"), new wxDataViewBitmapRenderer, 2, 25 ) );
dataview_left->AppendColumn( new wxDataViewColumn( wxBitmap(null_xpm), new wxDataViewBitmapRenderer, 2, 25 ) );
dataview_left->AppendColumn( new wxDataViewColumn( wxT("icon"), new wxDataViewBitmapRenderer, 3, 25 ) );
// Right wxDataViewCtrl using the sorting model

54
src/common/datavcmn.cpp
View File

@@ -707,6 +707,20 @@ wxDataViewColumnBase::wxDataViewColumnBase(const wxString& title,
m_renderer->SetOwner( (wxDataViewColumn*) this );
}
wxDataViewColumnBase::wxDataViewColumnBase(const wxBitmap& bitmap,
wxDataViewRenderer *renderer,
unsigned int model_column,
int WXUNUSED(width),
int flags )
{
m_renderer = renderer;
m_model_column = model_column;
m_flags = flags;
m_bitmap = bitmap;
m_owner = NULL;
m_renderer->SetOwner( (wxDataViewColumn*) this );
}
wxDataViewColumnBase::~wxDataViewColumnBase()
{
if (m_renderer)
@@ -728,6 +742,16 @@ wxString wxDataViewColumnBase::GetTitle()
return m_title;
}
void wxDataViewColumnBase::SetBitmap( const wxBitmap &bitmap )
{
m_bitmap = bitmap;
}
const wxBitmap &wxDataViewColumnBase::GetBitmap()
{
return m_bitmap;
}
// ---------------------------------------------------------
// wxDataViewCtrlBase
// ---------------------------------------------------------
@@ -776,6 +800,36 @@ bool wxDataViewCtrlBase::AppendDateColumn( const wxString &label, unsigned int m
return AppendColumn( new wxDataViewColumn( label, new wxDataViewDateRenderer(), model_column ) );
}
bool wxDataViewCtrlBase::AppendBitmapColumn( const wxString &label, unsigned int model_column )
{
return AppendColumn( new wxDataViewColumn( label, new wxDataViewBitmapRenderer(), model_column ) );
}
bool wxDataViewCtrlBase::AppendTextColumn( const wxBitmap &label, unsigned int model_column )
{
return AppendColumn( new wxDataViewColumn( label, new wxDataViewTextRenderer(), model_column ) );
}
bool wxDataViewCtrlBase::AppendToggleColumn( const wxBitmap &label, unsigned int model_column )
{
return AppendColumn( new wxDataViewColumn( label, new wxDataViewToggleRenderer(), model_column, 30 ) );
}
bool wxDataViewCtrlBase::AppendProgressColumn( const wxBitmap &label, unsigned int model_column )
{
return AppendColumn( new wxDataViewColumn( label, new wxDataViewProgressRenderer(), model_column, 70 ) );
}
bool wxDataViewCtrlBase::AppendDateColumn( const wxBitmap &label, unsigned int model_column )
{
return AppendColumn( new wxDataViewColumn( label, new wxDataViewDateRenderer(), model_column ) );
}
bool wxDataViewCtrlBase::AppendBitmapColumn( const wxBitmap &label, unsigned int model_column )
{
return AppendColumn( new wxDataViewColumn( label, new wxDataViewBitmapRenderer(), model_column ) );
}
bool wxDataViewCtrlBase::AppendColumn( wxDataViewColumn *col )
{
m_cols.Append( (wxObject*) col );

9
src/generic/datavgen.cpp
View File

@@ -603,6 +603,15 @@ wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *c
m_width = 80;
}
wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *cell, unsigned int model_column,
int width, int flags ) :
wxDataViewColumnBase( bitmap, cell, model_column, width, flags )
{
m_width = width;
if (m_width < 0)
m_width = 30;
}
wxDataViewColumn::~wxDataViewColumn()
{
}

65
src/gtk/dataview.cpp
View File

@@ -1450,6 +1450,36 @@ wxDataViewColumn::wxDataViewColumn( const wxString &title, wxDataViewRenderer *c
m_column = (void*) column;
}
wxDataViewColumn::wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *cell, unsigned int model_column,
int width, int flags ) :
wxDataViewColumnBase( bitmap, cell, model_column, width, flags )
{
GtkCellRenderer *renderer = (GtkCellRenderer *) cell->GetGtkHandle();
GtkTreeViewColumn *column = gtk_tree_view_column_new();
m_column = (void*) column;
SetBitmap( bitmap );
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 );
}
gtk_tree_view_column_pack_end( column, renderer, FALSE );
gtk_tree_view_column_set_cell_data_func( column, renderer,
wxGtkTreeCellDataFunc, (gpointer) cell, NULL );
}
wxDataViewColumn::~wxDataViewColumn()
{
}
@@ -1460,6 +1490,41 @@ void wxDataViewColumn::SetTitle( const wxString &title )
GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
gtk_tree_view_column_set_title( column, wxGTK_CONV(title) );
gtk_tree_view_column_set_widget( column, NULL );
}
void wxDataViewColumn::SetBitmap( const wxBitmap &bitmap )
{
wxDataViewColumnBase::SetBitmap( bitmap );
GtkTreeViewColumn *column = (GtkTreeViewColumn *)m_column;
if (bitmap.Ok())
{
GtkImage *gtk_image = GTK_IMAGE( gtk_image_new() );
GdkBitmap *mask = (GdkBitmap *) NULL;
if (bitmap.GetMask())
mask = bitmap.GetMask()->GetBitmap();
if (bitmap.HasPixbuf())
{
gtk_image_set_from_pixbuf(GTK_IMAGE(gtk_image),
bitmap.GetPixbuf());
}
else
{
gtk_image_set_from_pixmap(GTK_IMAGE(gtk_image),
bitmap.GetPixmap(), mask);
}
gtk_widget_show( GTK_WIDGET(gtk_image) );
gtk_tree_view_column_set_widget( column, GTK_WIDGET(gtk_image) );
}
else
{
gtk_tree_view_column_set_widget( column, NULL );
}
}
int wxDataViewColumn::GetWidth()