X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0fdc2321bc8a1ccf967c26b656b207cae9d03925..bacd54f604fe87c622d4ab57070759ad6f1791a7:/include/wx/generic/dataview.h diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h index a662c899d9..89d16535c0 100644 --- a/include/wx/generic/dataview.h +++ b/include/wx/generic/dataview.h @@ -16,19 +16,19 @@ #include "wx/control.h" #include "wx/scrolwin.h" -// --------------------------------------------------------- +// --------------------------------------------------------- // classes -// --------------------------------------------------------- +// --------------------------------------------------------- -class WXDLLIMPEXP_CORE wxDataViewCtrl; -class WXDLLIMPEXP_CORE wxDataViewMainWindow; -class WXDLLIMPEXP_CORE wxDataViewHeaderWindow; +class WXDLLIMPEXP_ADV wxDataViewCtrl; +class WXDLLIMPEXP_ADV wxDataViewMainWindow; +class WXDLLIMPEXP_ADV wxDataViewHeaderWindow; -// --------------------------------------------------------- +// --------------------------------------------------------- // wxDataViewCell -// --------------------------------------------------------- +// --------------------------------------------------------- -class wxDataViewCell: public wxDataViewCellBase +class WXDLLIMPEXP_ADV wxDataViewCell: public wxDataViewCellBase { public: wxDataViewCell( const wxString &varianttype, wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT ); @@ -36,168 +36,184 @@ public: virtual bool Render( wxRect cell, wxDC *dc, int state ) = 0; virtual wxSize GetSize() = 0; - - virtual bool Activate( wxRect cell, - wxDataViewListModel *model, size_t col, size_t row ) - { return false; } - - virtual bool LeftClick( wxPoint cursor, wxRect cell, - wxDataViewListModel *model, size_t col, size_t row ) - { return false; } - virtual bool RightClick( wxPoint cursor, wxRect cell, - wxDataViewListModel *model, size_t col, size_t row ) - { return false; } - virtual bool StartDrag( wxPoint cursor, wxRect cell, - wxDataViewListModel *model, size_t col, size_t row ) + + virtual bool Activate( wxRect WXUNUSED(cell), + wxDataViewListModel *WXUNUSED(model), + size_t WXUNUSED(col), + size_t WXUNUSED(row) ) { return false; } - + + virtual bool LeftClick( wxPoint WXUNUSED(cursor), + wxRect WXUNUSED(cell), + wxDataViewListModel *WXUNUSED(model), + size_t WXUNUSED(col), + size_t WXUNUSED(row) ) + { return false; } + virtual bool RightClick( wxPoint WXUNUSED(cursor), + wxRect WXUNUSED(cell), + wxDataViewListModel *WXUNUSED(model), + size_t WXUNUSED(col), + size_t WXUNUSED(row) ) + { return false; } + virtual bool StartDrag( wxPoint WXUNUSED(cursor), + wxRect WXUNUSED(cell), + wxDataViewListModel *WXUNUSED(model), + size_t WXUNUSED(col), + size_t WXUNUSED(row) ) + { return false; } + // Create DC on request virtual wxDC *GetDC(); - + private: wxDC *m_dc; - + protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCell) }; - -// --------------------------------------------------------- + +// --------------------------------------------------------- // wxDataViewCustomCell -// --------------------------------------------------------- +// --------------------------------------------------------- -class wxDataViewCustomCell: public wxDataViewCell +class WXDLLIMPEXP_ADV wxDataViewCustomCell: public wxDataViewCell { public: - wxDataViewCustomCell( const wxString &varianttype = wxT("string"), + wxDataViewCustomCell( const wxString &varianttype = wxT("string"), wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT ); - + protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomCell) }; - -// --------------------------------------------------------- + +// --------------------------------------------------------- // wxDataViewTextCell -// --------------------------------------------------------- +// --------------------------------------------------------- -class wxDataViewTextCell: public wxDataViewCustomCell +class WXDLLIMPEXP_ADV wxDataViewTextCell: public wxDataViewCustomCell { public: - wxDataViewTextCell( const wxString &varianttype = wxT("string"), + wxDataViewTextCell( const wxString &varianttype = wxT("string"), wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT ); bool SetValue( const wxVariant &value ); bool GetValue( wxVariant &value ); - + bool Render( wxRect cell, wxDC *dc, int state ); wxSize GetSize(); - + private: wxString m_text; - + protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextCell) }; - -// --------------------------------------------------------- + +// --------------------------------------------------------- // wxDataViewToggleCell -// --------------------------------------------------------- +// --------------------------------------------------------- -class wxDataViewToggleCell: public wxDataViewCustomCell +class WXDLLIMPEXP_ADV wxDataViewToggleCell: public wxDataViewCustomCell { public: - wxDataViewToggleCell( const wxString &varianttype = wxT("bool"), + wxDataViewToggleCell( const wxString &varianttype = wxT("bool"), wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT ); bool SetValue( const wxVariant &value ); bool GetValue( wxVariant &value ); - + bool Render( wxRect cell, wxDC *dc, int state ); bool Activate( wxRect cell, wxDataViewListModel *model, size_t col, size_t row ); wxSize GetSize(); - + private: bool m_toggle; - + protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleCell) }; - -// --------------------------------------------------------- + +// --------------------------------------------------------- // wxDataViewProgressCell -// --------------------------------------------------------- +// --------------------------------------------------------- -class wxDataViewProgressCell: public wxDataViewCustomCell +class WXDLLIMPEXP_ADV wxDataViewProgressCell: public wxDataViewCustomCell { public: - wxDataViewProgressCell( const wxString &label = wxEmptyString, - const wxString &varianttype = wxT("long"), + wxDataViewProgressCell( const wxString &label = wxEmptyString, + const wxString &varianttype = wxT("long"), wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT ); ~wxDataViewProgressCell(); - + bool SetValue( const wxVariant &value ); - + virtual bool Render( wxRect cell, wxDC *dc, int state ); virtual wxSize GetSize(); - + private: wxString m_label; int m_value; - + protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressCell) }; - -// --------------------------------------------------------- + +// --------------------------------------------------------- // wxDataViewDateCell -// --------------------------------------------------------- +// --------------------------------------------------------- -class wxDataViewDateCell: public wxDataViewCustomCell +class WXDLLIMPEXP_ADV wxDataViewDateCell: public wxDataViewCustomCell { public: - wxDataViewDateCell( const wxString &varianttype = wxT("datetime"), + wxDataViewDateCell( const wxString &varianttype = wxT("datetime"), wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE ); - + bool SetValue( const wxVariant &value ); - + 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 ); - + private: wxDateTime m_date; - + protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateCell) }; - -// --------------------------------------------------------- + +// --------------------------------------------------------- // wxDataViewColumn -// --------------------------------------------------------- +// --------------------------------------------------------- -class WXDLLIMPEXP_CORE wxDataViewColumn: public wxDataViewColumnBase +class WXDLLIMPEXP_ADV wxDataViewColumn: public wxDataViewColumnBase { public: - wxDataViewColumn( const wxString &title, wxDataViewCell *cell, size_t model_column, int flags = 0 ); + wxDataViewColumn( const wxString &title, wxDataViewCell *cell, size_t model_column, + int fixed_width = 80, wxDataViewColumnSizing sizing = wxDATAVIEW_COL_WIDTH_FIXED, int flags = 0 ); virtual ~wxDataViewColumn(); virtual void SetTitle( const wxString &title ); - - void SetWidth( int width ) { m_width = width; } - int GetWidth() { return m_width; } + + virtual int GetWidth(); + + virtual void SetFixedWidth( int width ); + virtual int GetFixedWidth(); private: - int m_width; + int m_width; + wxDataViewColumnSizing m_sizing; + int m_fixedWidth; protected: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewColumn) }; -// --------------------------------------------------------- +// --------------------------------------------------------- // wxDataViewCtrl -// --------------------------------------------------------- +// --------------------------------------------------------- -class WXDLLIMPEXP_CORE wxDataViewCtrl: public wxDataViewCtrlBase, +class WXDLLIMPEXP_ADV wxDataViewCtrl: public wxDataViewCtrlBase, public wxScrollHelperNative { public: @@ -205,11 +221,11 @@ public: { Init(); } - + wxDataViewCtrl( wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator ) + const wxValidator& validator = wxDefaultValidator ) : wxScrollHelperNative(this) { Create(parent, id, pos, size, style, validator ); @@ -226,17 +242,17 @@ public: virtual bool AssociateModel( wxDataViewListModel *model ); virtual bool AppendColumn( wxDataViewColumn *col ); - + private: friend class wxDataViewMainWindow; friend class wxDataViewHeaderWindow; wxDataViewListModelNotifier *m_notifier; wxDataViewMainWindow *m_clientArea; wxDataViewHeaderWindow *m_headerArea; - + private: void OnSize( wxSizeEvent &event ); - + // we need to return a special WM_GETDLGCODE value to process just the // arrows but let the other navigation characters through #ifdef __WXMSW__