X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/194027acb360e71d5c378db3eb08d63e01e164d0..0d6fba37931bde89e7161ff173e2f818e4b15ac0:/include/wx/mac/carbon/dataview.h diff --git a/include/wx/mac/carbon/dataview.h b/include/wx/mac/carbon/dataview.h index 960a176182..24a5a673af 100644 --- a/include/wx/mac/carbon/dataview.h +++ b/include/wx/mac/carbon/dataview.h @@ -7,29 +7,22 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __MACCARBONDATAVIEWCTRL_H__ -#define __MACCARBONDATAVIEWCTRL_H__ +#ifndef _WX_MACCARBONDATAVIEWCTRL_H_ +#define _WX_MACCARBONDATAVIEWCTRL_H_ -#include +// -------------------------------------------------------- +// Type definitions to mask native types +// -------------------------------------------------------- -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/list.h" -#include "wx/control.h" -#include "wx/scrolwin.h" -#include "wx/icon.h" - -// --------------------------------------------------------- -// classes -// --------------------------------------------------------- - -class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl; +typedef void* WXDataBrowserItemDataRef; +typedef unsigned long WXDataBrowserPropertyType; +typedef wxUint32 WXDataBrowserPropertyID; // --------------------------------------------------------- // wxDataViewRenderer // --------------------------------------------------------- -class WXDLLIMPEXP_ADV wxDataViewRenderer: public wxDataViewRendererBase +class WXDLLIMPEXP_ADV wxDataViewRenderer : public wxDataViewRendererBase { public: // @@ -67,7 +60,7 @@ public: // // implementation // - DataBrowserItemDataRef GetDataReference(void) const + WXDataBrowserItemDataRef GetDataReference(void) const { return this->m_dataReference; } @@ -76,12 +69,12 @@ public: return this->m_value; } - virtual DataBrowserPropertyType GetPropertyType(void) const = 0; + virtual WXDataBrowserPropertyType GetPropertyType(void) const = 0; virtual bool Render(void) = 0; // a call to the appropriate data browser function filling the data reference with the stored datum; // returns 'true' if the data value could be rendered, 'false' otherwise - void SetDataReference(DataBrowserItemDataRef const& newDataReference) + void SetDataReference(WXDataBrowserItemDataRef const& newDataReference) { this->m_dataReference = newDataReference; } @@ -90,7 +83,7 @@ private: // // variables // - DataBrowserItemDataRef m_dataReference; // data reference of the data browser; the data will be assigned to this reference during rendering + WXDataBrowserItemDataRef m_dataReference; // data reference of the data browser; the data will be assigned to this reference during rendering int m_alignment; // contains the alignment flags @@ -118,6 +111,8 @@ public: virtual ~wxDataViewCustomRenderer(void); + void RenderText( const wxString &text, int xoffset, wxRect cell, wxDC *dc, int state ); + // // methods handling render space // @@ -179,7 +174,7 @@ public: return false; } - virtual bool StartEditing(unsigned int WXUNUSED(row), wxRect WXUNUSED(labelRect)) + virtual bool StartEditing(wxDataViewItem const& WXUNUSED(item), wxRect WXUNUSED(labelRect)) { return false; } @@ -193,12 +188,9 @@ public: // implementation // virtual bool Render(void); // declared in wxDataViewRenderer but will not be used here, therefore calling this function will - // return 'false' without having done anything + // return 'true' without having done anything - virtual DataBrowserPropertyType GetPropertyType(void) const - { - return kDataBrowserCustomType; - } + virtual WXDataBrowserPropertyType GetPropertyType(void) const; void SetDC(wxDC* newDCPtr); // this method takes ownership of the pointer @@ -237,16 +229,29 @@ public: // // implementation // - virtual DataBrowserPropertyType GetPropertyType(void) const - { - return kDataBrowserTextType; - } + virtual WXDataBrowserPropertyType GetPropertyType(void) const; protected: private: DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer) }; +// --------------------------------------------------------- +// wxDataViewTextRendererAttr +// --------------------------------------------------------- + +class WXDLLIMPEXP_ADV wxDataViewTextRendererAttr: public wxDataViewTextRenderer +{ +public: +// +// constructors / destructor +// + wxDataViewTextRendererAttr(wxString const& varianttype=wxT("string"), wxDataViewCellMode mode=wxDATAVIEW_CELL_INERT, int align=wxDVR_DEFAULT_ALIGNMENT); + +private: + DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRendererAttr) +}; + // --------------------------------------------------------- // wxDataViewBitmapRenderer // --------------------------------------------------------- @@ -267,10 +272,7 @@ public: // // implementation // - virtual DataBrowserPropertyType GetPropertyType(void) const - { - return kDataBrowserIconType; - } + virtual WXDataBrowserPropertyType GetPropertyType(void) const; protected: private: @@ -281,6 +283,30 @@ private: // wxDataViewToggleRenderer // --------------------------------------------------------- +class WXDLLIMPEXP_ADV wxDataViewIconTextRenderer: public wxDataViewRenderer +{ +public: + wxDataViewIconTextRenderer(wxString const& varianttype = wxT("wxDataViewIconText"), wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, int align=wxDVR_DEFAULT_ALIGNMENT); + +// +// inherited functions from wxDataViewRenderer +// + virtual bool Render(void); + +// +// implementation +// + virtual WXDataBrowserPropertyType GetPropertyType(void) const; + +protected: +private: + DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer) +}; + +// --------------------------------------------------------- +// wxDataViewToggleRenderer +// --------------------------------------------------------- + class WXDLLIMPEXP_ADV wxDataViewToggleRenderer: public wxDataViewRenderer { public: @@ -294,10 +320,7 @@ public: // // implementation // - virtual DataBrowserPropertyType GetPropertyType(void) const - { - return kDataBrowserCheckboxType; - } + virtual WXDataBrowserPropertyType GetPropertyType(void) const; protected: private: @@ -322,10 +345,7 @@ public: // // implementation // - virtual DataBrowserPropertyType GetPropertyType(void) const - { - return kDataBrowserProgressBarType; - } + virtual WXDataBrowserPropertyType GetPropertyType(void) const; protected: private: @@ -349,10 +369,7 @@ public: // // implementation // - virtual DataBrowserPropertyType GetPropertyType(void) const - { - return kDataBrowserDateTimeType; - } + virtual WXDataBrowserPropertyType GetPropertyType(void) const; protected: private: @@ -436,15 +453,19 @@ public: // // implementation // - DataBrowserPropertyID GetPropertyID(void) const + WXDataBrowserPropertyID GetPropertyID() const { return this->m_propertyID; } - void SetPropertyID(DataBrowserPropertyID newID) + void SetPropertyID(WXDataBrowserPropertyID newID) { this->m_propertyID = newID; } + void SetWidthVariable(int NewWidth) + { + this->m_width = NewWidth; + } protected: private: @@ -453,7 +474,7 @@ private: // bool m_ascending; // sorting order - DataBrowserPropertyID m_propertyID; // each column is identified by its unique property ID (NOT by the column index) + WXDataBrowserPropertyID m_propertyID; // each column is identified by its unique property ID (NOT by the column index) int m_flags; // flags for the column int m_maxWidth; // maximum width for the column @@ -490,25 +511,61 @@ public: bool Create(wxWindow *parent, wxWindowID id, wxPoint const& pos=wxDefaultPosition, wxSize const& size=wxDefaultSize, long style=0, wxValidator const& validator=wxDefaultValidator); - // inherited methods from 'wxDataViewCtrlBase': - virtual bool AppendColumn(wxDataViewColumn* columnPtr); - - virtual bool AssociateModel(wxDataViewModel* model); - virtual wxControl* GetMainWindow(void) // should disappear as it is not of any use for the native implementation { return this; } - virtual wxDataViewItem GetSelection(void); + // inherited methods from 'wxDataViewCtrlBase': + virtual bool AssociateModel(wxDataViewModel* model); + + virtual bool AppendColumn(wxDataViewColumn* columnPtr); + virtual bool ClearColumns(void); + virtual bool DeleteColumn(wxDataViewColumn* columnPtr); + virtual wxDataViewColumn* GetColumn(unsigned int pos) const; + virtual unsigned int GetColumnCount(void) const; + virtual int GetColumnPosition(wxDataViewColumn const* columnPtr) const; + virtual bool PrependColumn(wxDataViewColumn* columnPtr); + + virtual void Collapse(wxDataViewItem const& item); + virtual void EnsureVisible(wxDataViewItem const& item, wxDataViewColumn const* columnPtr=NULL); + virtual void Expand(wxDataViewItem const& item); + + virtual wxDataViewColumn* GetSortingColumn(void) const; + + virtual unsigned int GetCount(void) const; + virtual wxRect GetItemRect(wxDataViewItem const& item, wxDataViewColumn const* columnPtr) const; + virtual wxDataViewItem GetSelection(void) const; + virtual int GetSelections(wxDataViewItemArray& sel) const; + + virtual void HitTest(wxPoint const& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const; + + virtual bool IsSelected(wxDataViewItem const& item) const; + + virtual void SelectAll(void); + virtual void Select(wxDataViewItem const& item); + virtual void SetSelections(wxDataViewItemArray const& sel); + + virtual void Unselect(wxDataViewItem const& item); + virtual void UnselectAll(void); // // implementation // - // adds all children of the passed parent to the control; if 'parentItem' is invalid the root(s) is/are added: + // adds all children of the passed parent to the control; if 'parentItem' is invalid the root(s) is/are added: void AddChildrenLevel(wxDataViewItem const& parentItem); + // returns a pointer to a column; + // in case the pointer cannot be found NULL is returned: + wxDataViewColumn* GetColumnPtr(WXDataBrowserPropertyID propertyID) const; + + // checks if currently a delete process is running: + bool IsDeleting(void) const + { + return this->m_Deleting; + } + // with CG, we need to get the context from an kEventControlDraw event // unfortunately, the DataBrowser callbacks don't provide the context // and we need it, so we need to set/remove it before and after draw @@ -522,6 +579,12 @@ public: return this->m_cgContext; } + /// sets the flag indicating a deletion process: + void SetDeleting(bool deleting) + { + this->m_Deleting = deleting; + } + protected: // inherited methods from wxDataViewCtrlBase: virtual void DoSetExpanderColumn(void); @@ -531,6 +594,9 @@ protected: void OnSize(wxSizeEvent &event); private: + // type definitions: + WX_DECLARE_HASH_MAP(WXDataBrowserPropertyID,wxDataViewColumn*,wxIntegerHash,wxIntegerEqual,ColumnPointerHashMapType); + // initializing of local variables: void Init(void); @@ -538,9 +604,13 @@ private: // variables // - wxDataViewModelNotifier* m_NotifierPtr; // the notifier is NOT owned by this class but by the associated model + bool m_Deleting; // flag indicating if a delete process is running; this flag is necessary because the notifier indicating an item deletion in the model may be called + // after the actual deletion of the item; then, the callback function "wxMacDataViewDataBrowserListViewControl::DataBrowserGetSetItemDataProc" may + // try to update data into variables that are already deleted; this flag will ignore all variable update requests during item deletion void* m_cgContext; // pointer to core graphics context + + ColumnPointerHashMapType m_ColumnPointers; // all column pointers are stored in a hash map with the property ID as a key // wxWidget internal stuff: DECLARE_DYNAMIC_CLASS(wxDataViewCtrl) @@ -549,4 +619,4 @@ private: }; -#endif // __MACDATAVIEWCTRL_H__ +#endif // _WX_MACCARBONDATAVIEWCTRL_H_