fix warnings in EventsSuppressor ctor from gcc with -O option

[wxWidgets.git] / include / wx / generic / dataview.h

diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index d6ba452ae11a2389e5832b0ab6afe546cf830a61..efa5a11c7494e1ee877756fd04a94f8e6a0b7dd3 100644 (file)
--- a/include/wx/generic/dataview.h
+++ b/include/wx/generic/dataview.h
@@ -99,6 +99,8 @@ public:
                               wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
                               int align = wxDVR_DEFAULT_ALIGNMENT );
 
                               wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
                               int align = wxDVR_DEFAULT_ALIGNMENT );
 

+    void RenderText( const wxString &text, int xoffset, wxRect cell, wxDC *dc, int state );
+

 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer)
 };
 protected:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer)
 };


@@ -343,7 +345,8 @@ protected:
 // wxDataViewCtrl
 // ---------------------------------------------------------
 
 // wxDataViewCtrl
 // ---------------------------------------------------------
 

-WX_DECLARE_LIST(wxDataViewColumn, wxDataViewColumnList );
+WX_DECLARE_LIST_WITH_DECL(wxDataViewColumn, wxDataViewColumnList,
+                          class WXDLLIMPEXP_ADV);

 
 class WXDLLIMPEXP_ADV wxDataViewCtrl: public wxDataViewCtrlBase,
                                        public wxScrollHelperNative
 
 class WXDLLIMPEXP_ADV wxDataViewCtrl: public wxDataViewCtrlBase,
                                        public wxScrollHelperNative


@@ -383,6 +386,7 @@ public:
 
     virtual bool AssociateModel( wxDataViewModel *model );
     virtual bool AppendColumn( wxDataViewColumn *col );
 
     virtual bool AssociateModel( wxDataViewModel *model );
     virtual bool AppendColumn( wxDataViewColumn *col );

+    virtual bool PrependColumn( wxDataViewColumn *col );

 
     virtual void DoSetExpanderColumn();
     virtual void DoSetIndent();
 
     virtual void DoSetExpanderColumn();
     virtual void DoSetIndent();


@@ -391,6 +395,7 @@ public:
     virtual wxDataViewColumn* GetColumn( unsigned int pos ) const;
     virtual bool DeleteColumn( wxDataViewColumn *column );
     virtual bool ClearColumns();
     virtual wxDataViewColumn* GetColumn( unsigned int pos ) const;
     virtual bool DeleteColumn( wxDataViewColumn *column );
     virtual bool ClearColumns();

+    virtual int GetColumnPosition( const wxDataViewColumn *column ) const;

 
     virtual wxDataViewColumn *GetSortingColumn() const;
     
 
     virtual wxDataViewColumn *GetSortingColumn() const;