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

no changes, just remove trailing whitespace

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-12-07 14:19:18 +00:00
parent 2859935bb1
commit bc0289bf5e
2 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,22 +12,22 @@
#include "wx/list.h" #include "wx/list.h"
// --------------------------------------------------------- // ---------------------------------------------------------
// classes // classes
// --------------------------------------------------------- // ---------------------------------------------------------
class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl; class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl;
class WXDLLIMPEXP_FWD_ADV wxDataViewCtrlInternal; class WXDLLIMPEXP_FWD_ADV wxDataViewCtrlInternal;
// --------------------------------------------------------- // ---------------------------------------------------------
// wxDataViewRenderer // wxDataViewRenderer
// --------------------------------------------------------- // ---------------------------------------------------------
class WXDLLIMPEXP_ADV wxDataViewRenderer: public wxDataViewRendererBase class WXDLLIMPEXP_ADV wxDataViewRenderer: public wxDataViewRendererBase
{ {
public: public:
wxDataViewRenderer( const wxString &varianttype, wxDataViewRenderer( const wxString &varianttype,
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT ); int align = wxDVR_DEFAULT_ALIGNMENT );
@@ -51,14 +51,14 @@ protected:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer) DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer)
}; };
// --------------------------------------------------------- // ---------------------------------------------------------
// wxDataViewTextRenderer // wxDataViewTextRenderer
// --------------------------------------------------------- // ---------------------------------------------------------
class WXDLLIMPEXP_ADV wxDataViewTextRenderer: public wxDataViewRenderer class WXDLLIMPEXP_ADV wxDataViewTextRenderer: public wxDataViewRenderer
{ {
public: public:
wxDataViewTextRenderer( const wxString &varianttype = wxT("string"), wxDataViewTextRenderer( const wxString &varianttype = wxT("string"),
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT ); int align = wxDVR_DEFAULT_ALIGNMENT );
@@ -70,69 +70,69 @@ public:
protected: protected:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer) DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)
}; };
// --------------------------------------------------------- // ---------------------------------------------------------
// wxDataViewTextRendererAttr // wxDataViewTextRendererAttr
// --------------------------------------------------------- // ---------------------------------------------------------
class WXDLLIMPEXP_ADV wxDataViewTextRendererAttr: public wxDataViewTextRenderer class WXDLLIMPEXP_ADV wxDataViewTextRendererAttr: public wxDataViewTextRenderer
{ {
public: public:
wxDataViewTextRendererAttr( const wxString &varianttype = wxT("string"), wxDataViewTextRendererAttr( const wxString &varianttype = wxT("string"),
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT ); int align = wxDVR_DEFAULT_ALIGNMENT );
// implementation // implementation
bool GtkHasAttributes() { return true; } bool GtkHasAttributes() { return true; }
protected: protected:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRendererAttr) DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRendererAttr)
}; };
// --------------------------------------------------------- // ---------------------------------------------------------
// wxDataViewBitmapRenderer // wxDataViewBitmapRenderer
// --------------------------------------------------------- // ---------------------------------------------------------
class WXDLLIMPEXP_ADV wxDataViewBitmapRenderer: public wxDataViewRenderer class WXDLLIMPEXP_ADV wxDataViewBitmapRenderer: public wxDataViewRenderer
{ {
public: public:
wxDataViewBitmapRenderer( const wxString &varianttype = wxT("wxBitmap"), wxDataViewBitmapRenderer( const wxString &varianttype = wxT("wxBitmap"),
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT ); int align = wxDVR_DEFAULT_ALIGNMENT );
bool SetValue( const wxVariant &value ); bool SetValue( const wxVariant &value );
bool GetValue( wxVariant &value ) const; bool GetValue( wxVariant &value ) const;
protected: protected:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer) DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer)
}; };
// --------------------------------------------------------- // ---------------------------------------------------------
// wxDataViewToggleRenderer // wxDataViewToggleRenderer
// --------------------------------------------------------- // ---------------------------------------------------------
class WXDLLIMPEXP_ADV wxDataViewToggleRenderer: public wxDataViewRenderer class WXDLLIMPEXP_ADV wxDataViewToggleRenderer: public wxDataViewRenderer
{ {
public: public:
wxDataViewToggleRenderer( const wxString &varianttype = wxT("bool"), wxDataViewToggleRenderer( const wxString &varianttype = wxT("bool"),
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT ); int align = wxDVR_DEFAULT_ALIGNMENT );
bool SetValue( const wxVariant &value ); bool SetValue( const wxVariant &value );
bool GetValue( wxVariant &value ) const; bool GetValue( wxVariant &value ) const;
protected: protected:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer) DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer)
}; };
// --------------------------------------------------------- // ---------------------------------------------------------
// wxDataViewCustomRenderer // wxDataViewCustomRenderer
// --------------------------------------------------------- // ---------------------------------------------------------
class WXDLLIMPEXP_ADV wxDataViewCustomRenderer: public wxDataViewRenderer class WXDLLIMPEXP_ADV wxDataViewCustomRenderer: public wxDataViewRenderer
{ {
public: public:
wxDataViewCustomRenderer( const wxString &varianttype = wxT("string"), wxDataViewCustomRenderer( const wxString &varianttype = wxT("string"),
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT, int align = wxDVR_DEFAULT_ALIGNMENT,
bool no_init = false ); bool no_init = false );
@@ -140,25 +140,25 @@ public:
virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0; virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0;
void RenderText( const wxString &text, int xoffset, wxRect cell, wxDC *dc, int state ); void RenderText( const wxString &text, int xoffset, wxRect cell, wxDC *dc, int state );
virtual wxSize GetSize() const = 0; virtual wxSize GetSize() const = 0;
virtual bool Activate( wxRect WXUNUSED(cell), virtual bool Activate( wxRect WXUNUSED(cell),
wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col) ) wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col) )
{ return false; } { return false; }
virtual bool LeftClick( wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell), virtual bool LeftClick( wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell),
wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col) ) wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col) )
{ return false; } { return false; }
virtual bool StartDrag( wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell), virtual bool StartDrag( wxPoint WXUNUSED(cursor), wxRect WXUNUSED(cell),
wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col) ) wxDataViewModel *WXUNUSED(model), const wxDataViewItem &WXUNUSED(item), unsigned int WXUNUSED(col) )
{ return false; } { return false; }
// Create DC on request // Create DC on request
virtual wxDC *GetDC(); virtual wxDC *GetDC();
protected: protected:
@@ -167,7 +167,7 @@ protected:
private: private:
wxDC *m_dc; wxDC *m_dc;
public: public:
// Internal, temporay for RenderText. // Internal, temporay for RenderText.
GtkCellRenderer *m_text_renderer; GtkCellRenderer *m_text_renderer;
GdkWindow *window; GdkWindow *window;
@@ -180,89 +180,89 @@ public:
protected: protected:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer) DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer)
}; };
// --------------------------------------------------------- // ---------------------------------------------------------
// wxDataViewProgressRenderer // wxDataViewProgressRenderer
// --------------------------------------------------------- // ---------------------------------------------------------
class WXDLLIMPEXP_ADV wxDataViewProgressRenderer: public wxDataViewCustomRenderer class WXDLLIMPEXP_ADV wxDataViewProgressRenderer: public wxDataViewCustomRenderer
{ {
public: public:
wxDataViewProgressRenderer( const wxString &label = wxEmptyString, wxDataViewProgressRenderer( const wxString &label = wxEmptyString,
const wxString &varianttype = wxT("long"), const wxString &varianttype = wxT("long"),
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT ); int align = wxDVR_DEFAULT_ALIGNMENT );
virtual ~wxDataViewProgressRenderer(); virtual ~wxDataViewProgressRenderer();
bool SetValue( const wxVariant &value ); bool SetValue( const wxVariant &value );
bool GetValue( wxVariant &value ) const; bool GetValue( wxVariant &value ) const;
virtual bool Render( wxRect cell, wxDC *dc, int state ); virtual bool Render( wxRect cell, wxDC *dc, int state );
virtual wxSize GetSize() const; virtual wxSize GetSize() const;
private: private:
wxString m_label; wxString m_label;
int m_value; int m_value;
protected: protected:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer) DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer)
}; };
// --------------------------------------------------------- // ---------------------------------------------------------
// wxDataViewIconTextRenderer // wxDataViewIconTextRenderer
// --------------------------------------------------------- // ---------------------------------------------------------
class WXDLLIMPEXP_ADV wxDataViewIconTextRenderer: public wxDataViewCustomRenderer class WXDLLIMPEXP_ADV wxDataViewIconTextRenderer: public wxDataViewCustomRenderer
{ {
public: public:
wxDataViewIconTextRenderer( const wxString &varianttype = wxT("wxDataViewIconText"), wxDataViewIconTextRenderer( const wxString &varianttype = wxT("wxDataViewIconText"),
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT ); int align = wxDVR_DEFAULT_ALIGNMENT );
virtual ~wxDataViewIconTextRenderer(); virtual ~wxDataViewIconTextRenderer();
bool SetValue( const wxVariant &value ); bool SetValue( const wxVariant &value );
bool GetValue( wxVariant &value ) const; bool GetValue( wxVariant &value ) const;
virtual bool Render( wxRect cell, wxDC *dc, int state ); virtual bool Render( wxRect cell, wxDC *dc, int state );
virtual wxSize GetSize() const; virtual wxSize GetSize() const;
virtual bool HasEditorCtrl() { return true; } virtual bool HasEditorCtrl() { return true; }
virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value ); virtual wxControl* CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value );
virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value ); virtual bool GetValueFromEditorCtrl( wxControl* editor, wxVariant &value );
private: private:
wxDataViewIconText m_value; wxDataViewIconText m_value;
protected: protected:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer) DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer)
}; };
// --------------------------------------------------------- // ---------------------------------------------------------
// wxDataViewDateRenderer // wxDataViewDateRenderer
// --------------------------------------------------------- // ---------------------------------------------------------
class WXDLLIMPEXP_ADV wxDataViewDateRenderer: public wxDataViewCustomRenderer class WXDLLIMPEXP_ADV wxDataViewDateRenderer: public wxDataViewCustomRenderer
{ {
public: public:
wxDataViewDateRenderer( const wxString &varianttype = wxT("datetime"), wxDataViewDateRenderer( const wxString &varianttype = wxT("datetime"),
wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE, wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE,
int align = wxDVR_DEFAULT_ALIGNMENT ); int align = wxDVR_DEFAULT_ALIGNMENT );
bool SetValue( const wxVariant &value ); bool SetValue( const wxVariant &value );
bool GetValue( wxVariant &value ) const; bool GetValue( wxVariant &value ) const;
virtual bool Render( wxRect cell, wxDC *dc, int state ); virtual bool Render( wxRect cell, wxDC *dc, int state );
virtual wxSize GetSize() const; virtual wxSize GetSize() const;
virtual bool Activate( wxRect cell, virtual bool Activate( wxRect cell,
wxDataViewModel *model, const wxDataViewItem &item, unsigned int col ); wxDataViewModel *model, const wxDataViewItem &item, unsigned int col );
private: private:
wxDateTime m_date; wxDateTime m_date;
protected: protected:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer) DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer)
}; };
// ------------------------------------- // -------------------------------------
// wxDataViewChoiceRenderer // wxDataViewChoiceRenderer
// ------------------------------------- // -------------------------------------
@@ -284,9 +284,9 @@ private:
wxString m_data; wxString m_data;
}; };
// --------------------------------------------------------- // ---------------------------------------------------------
// wxDataViewColumn // wxDataViewColumn
// --------------------------------------------------------- // ---------------------------------------------------------
class WXDLLIMPEXP_ADV wxDataViewColumn: public wxDataViewColumnBase class WXDLLIMPEXP_ADV wxDataViewColumn: public wxDataViewColumnBase
{ {
@@ -311,7 +311,7 @@ public:
virtual void SetOwner( wxDataViewCtrl *owner ); virtual void SetOwner( wxDataViewCtrl *owner );
virtual void SetAlignment( wxAlignment align ); virtual void SetAlignment( wxAlignment align );
virtual void SetSortable( bool sortable ); virtual void SetSortable( bool sortable );
virtual void SetSortOrder( bool ascending ); virtual void SetSortOrder( bool ascending );
@@ -337,7 +337,7 @@ public:
virtual int GetWidth() const; virtual int GetWidth() const;
virtual int GetMinWidth() const; virtual int GetMinWidth() const;
virtual bool IsReorderable() const; virtual bool IsReorderable() const;
virtual int GetFlags() const { return GetFromIndividualFlags(); } virtual int GetFlags() const { return GetFromIndividualFlags(); }
@@ -349,11 +349,11 @@ public:
private: private:
// holds the GTK handle // holds the GTK handle
GtkWidget *m_column; GtkWidget *m_column;
// holds GTK handles for title/bitmap in the header // holds GTK handles for title/bitmap in the header
GtkWidget *m_image; GtkWidget *m_image;
GtkWidget *m_label; GtkWidget *m_label;
// delayed connection to mouse events // delayed connection to mouse events
friend class wxDataViewCtrl; friend class wxDataViewCtrl;
void OnInternalIdle(); void OnInternalIdle();
@@ -368,18 +368,18 @@ protected:
WX_DECLARE_LIST_WITH_DECL(wxDataViewColumn, wxDataViewColumnList, WX_DECLARE_LIST_WITH_DECL(wxDataViewColumn, wxDataViewColumnList,
class WXDLLIMPEXP_ADV); class WXDLLIMPEXP_ADV);
// --------------------------------------------------------- // ---------------------------------------------------------
// wxDataViewCtrl // wxDataViewCtrl
// --------------------------------------------------------- // ---------------------------------------------------------
class WXDLLIMPEXP_ADV wxDataViewCtrl: public wxDataViewCtrlBase class WXDLLIMPEXP_ADV wxDataViewCtrl: public wxDataViewCtrlBase
{ {
public: public:
wxDataViewCtrl() wxDataViewCtrl()
{ {
Init(); Init();
} }
wxDataViewCtrl( wxWindow *parent, wxWindowID id, wxDataViewCtrl( wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
@@ -398,11 +398,11 @@ public:
const wxValidator& validator = wxDefaultValidator ); const wxValidator& validator = wxDefaultValidator );
virtual bool AssociateModel( wxDataViewModel *model ); virtual bool AssociateModel( wxDataViewModel *model );
virtual bool PrependColumn( wxDataViewColumn *col ); virtual bool PrependColumn( wxDataViewColumn *col );
virtual bool AppendColumn( wxDataViewColumn *col ); virtual bool AppendColumn( wxDataViewColumn *col );
virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col ); virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col );
virtual unsigned int GetColumnCount() const; virtual unsigned int GetColumnCount() const;
virtual wxDataViewColumn* GetColumn( unsigned int pos ) const; virtual wxDataViewColumn* GetColumn( unsigned int pos ) const;
virtual bool DeleteColumn( wxDataViewColumn *column ); virtual bool DeleteColumn( wxDataViewColumn *column );
@@ -420,12 +420,12 @@ public:
virtual void SelectAll(); virtual void SelectAll();
virtual void UnselectAll(); virtual void UnselectAll();
virtual void EnsureVisible( const wxDataViewItem& item, virtual void EnsureVisible( const wxDataViewItem& item,
const wxDataViewColumn *column = NULL ); const wxDataViewColumn *column = NULL );
virtual void HitTest( const wxPoint &point, virtual void HitTest( const wxPoint &point,
wxDataViewItem &item, wxDataViewItem &item,
wxDataViewColumn *&column ) const; wxDataViewColumn *&column ) const;
virtual wxRect GetItemRect( const wxDataViewItem &item, virtual wxRect GetItemRect( const wxDataViewItem &item,
const wxDataViewColumn *column = NULL ) const; const wxDataViewColumn *column = NULL ) const;
virtual void Expand( const wxDataViewItem & item ); virtual void Expand( const wxDataViewItem & item );
@@ -433,9 +433,9 @@ public:
static wxVisualAttributes static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
wxWindow *GetMainWindow() { return (wxWindow*) this; } wxWindow *GetMainWindow() { return (wxWindow*) this; }
GtkWidget *GtkGetTreeView() { return m_treeview; } GtkWidget *GtkGetTreeView() { return m_treeview; }
wxDataViewCtrlInternal* GtkGetInternal() { return m_internal; } wxDataViewCtrlInternal* GtkGetInternal() { return m_internal; }
@@ -450,7 +450,7 @@ private:
friend class wxDataViewColumn; friend class wxDataViewColumn;
friend class wxGtkDataViewModelNotifier; friend class wxGtkDataViewModelNotifier;
friend class wxDataViewCtrlInternal; friend class wxDataViewCtrlInternal;
GtkWidget *m_treeview; GtkWidget *m_treeview;
wxDataViewModelNotifier *m_notifier; wxDataViewModelNotifier *m_notifier;
wxDataViewCtrlInternal *m_internal; wxDataViewCtrlInternal *m_internal;
@@ -459,7 +459,7 @@ private:
virtual void AddChildGTK(wxWindowGTK* child); virtual void AddChildGTK(wxWindowGTK* child);
void GtkEnableSelectionEvents(); void GtkEnableSelectionEvents();
void GtkDisableSelectionEvents(); void GtkDisableSelectionEvents();
DECLARE_DYNAMIC_CLASS(wxDataViewCtrl) DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
DECLARE_NO_COPY_CLASS(wxDataViewCtrl) DECLARE_NO_COPY_CLASS(wxDataViewCtrl)
}; };

30
src/gtk/dataview.cpp
View File

@@ -975,11 +975,11 @@ static GtkCellEditable *gtk_wx_cell_renderer_start_editing(
{ {
GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer; GtkWxCellRenderer *wxrenderer = (GtkWxCellRenderer *) renderer;
wxDataViewCustomRenderer *cell = wxrenderer->cell; wxDataViewCustomRenderer *cell = wxrenderer->cell;
// Renderer doesn't support in-place editing // Renderer doesn't support in-place editing
if (!cell->HasEditorCtrl()) if (!cell->HasEditorCtrl())
return NULL; return NULL;
// An in-place editing control is still around // An in-place editing control is still around
if (cell->GetEditorCtrl()) if (cell->GetEditorCtrl())
return NULL; return NULL;
@@ -1086,7 +1086,7 @@ gtk_wx_cell_renderer_render (GtkCellRenderer *renderer,
rect.y += cell_area->y; rect.y += cell_area->y;
rect.width -= renderer->xpad * 2; rect.width -= renderer->xpad * 2;
rect.height -= renderer->ypad * 2; rect.height -= renderer->ypad * 2;
GdkRectangle dummy; GdkRectangle dummy;
if (gdk_rectangle_intersect (expose_area, &rect, &dummy)) if (gdk_rectangle_intersect (expose_area, &rect, &dummy))
{ {
@@ -1477,18 +1477,18 @@ wxDataViewCellMode wxDataViewRenderer::GetMode() const
void wxDataViewRenderer::GtkUpdateAlignment() void wxDataViewRenderer::GtkUpdateAlignment()
{ {
int align = m_alignment; int align = m_alignment;
// query alignment from column ? // query alignment from column ?
if (align == -1) if (align == -1)
{ {
// None there yet // None there yet
if (GetOwner() == NULL) if (GetOwner() == NULL)
return; return;
align = GetOwner()->GetAlignment(); align = GetOwner()->GetAlignment();
align |= wxALIGN_CENTRE_VERTICAL; align |= wxALIGN_CENTRE_VERTICAL;
} }
// horizontal alignment: // horizontal alignment:
gfloat xalign = 0.0; gfloat xalign = 0.0;
@@ -2040,18 +2040,18 @@ wxDataViewChoiceRenderer::wxDataViewChoiceRenderer( const wxArrayString &choices
size_t n; size_t n;
for (n = 0; n < m_choices.GetCount(); n++) for (n = 0; n < m_choices.GetCount(); n++)
gtk_list_store_insert_with_values( store, NULL, n, 0, m_choices[n].utf8_str(), -1 ); gtk_list_store_insert_with_values( store, NULL, n, 0, m_choices[n].utf8_str(), -1 );
g_object_set (m_renderer, g_object_set (m_renderer,
"model", store, "model", store,
"text-column", 0, "text-column", 0,
"has-entry", FALSE, "has-entry", FALSE,
NULL); NULL);
bool editable = (mode & wxDATAVIEW_CELL_EDITABLE); bool editable = (mode & wxDATAVIEW_CELL_EDITABLE);
g_object_set (m_renderer, "editable", editable, NULL); g_object_set (m_renderer, "editable", editable, NULL);
SetAlignment(alignment); SetAlignment(alignment);
g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this ); g_signal_connect_after( m_renderer, "edited", G_CALLBACK(wxGtkTextRendererEditedCallback), this );
GtkInitHandlers(); GtkInitHandlers();
@@ -2077,7 +2077,7 @@ wxSize wxDataViewChoiceRenderer::GetSize() const
bool wxDataViewChoiceRenderer::SetValue( const wxVariant &value ) bool wxDataViewChoiceRenderer::SetValue( const wxVariant &value )
{ {
#ifdef __WXGTK26__ #ifdef __WXGTK26__
if (!gtk_check_version(2,6,0)) if (!gtk_check_version(2,6,0))
{ {
@@ -2134,7 +2134,7 @@ void wxDataViewChoiceRenderer::SetAlignment( int align )
g_object_set_property( G_OBJECT(m_renderer), "alignment", &gvalue ); g_object_set_property( G_OBJECT(m_renderer), "alignment", &gvalue );
g_value_unset( &gvalue ); g_value_unset( &gvalue );
} }
// --------------------------------------------------------- // ---------------------------------------------------------
// wxDataViewDateRenderer // wxDataViewDateRenderer
// --------------------------------------------------------- // ---------------------------------------------------------
@@ -2563,7 +2563,7 @@ void wxDataViewColumn::Init(wxAlignment align, int flags, int width)
m_label = gtk_label_new(""); m_label = gtk_label_new("");
gtk_box_pack_end( GTK_BOX(box), GTK_WIDGET(m_label), FALSE, FALSE, 1 ); gtk_box_pack_end( GTK_BOX(box), GTK_WIDGET(m_label), FALSE, FALSE, 1 );
gtk_tree_view_column_set_widget( column, box ); gtk_tree_view_column_set_widget( column, box );
gtk_tree_view_column_pack_end( column, renderer, TRUE ); gtk_tree_view_column_pack_end( column, renderer, TRUE );
gtk_tree_view_column_set_cell_data_func( column, renderer, gtk_tree_view_column_set_cell_data_func( column, renderer,
@@ -2672,7 +2672,7 @@ void wxDataViewColumn::SetAlignment( wxAlignment align )
xalign = 0.5; xalign = 0.5;
gtk_tree_view_column_set_alignment( column, xalign ); gtk_tree_view_column_set_alignment( column, xalign );
if (m_renderer && m_renderer->GetAlignment() == -1) if (m_renderer && m_renderer->GetAlignment() == -1)
m_renderer->GtkUpdateAlignment(); m_renderer->GtkUpdateAlignment();
} }
@@ -3697,7 +3697,7 @@ void wxDataViewCtrl::Init()
{ {
m_notifier = NULL; m_notifier = NULL;
m_internal = NULL; m_internal = NULL;
m_cols.DeleteContents( true ); m_cols.DeleteContents( true );
} }