X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4264606eedb18f626e864020082d8dde8d055eea..872051d89bd098d1e6052fabc07174e67296a35f:/include/wx/mac/carbon/dataview.h diff --git a/include/wx/mac/carbon/dataview.h b/include/wx/mac/carbon/dataview.h index 67b17836cd..7a8fbeffaa 100644 --- a/include/wx/mac/carbon/dataview.h +++ b/include/wx/mac/carbon/dataview.h @@ -10,15 +10,19 @@ #ifndef _WX_MACCARBONDATAVIEWCTRL_H_ #define _WX_MACCARBONDATAVIEWCTRL_H_ -typedef void* DataBrowserItemDataRef; +// -------------------------------------------------------- +// Type definitions to mask native types +// -------------------------------------------------------- + +typedef void* WXDataBrowserItemDataRef; typedef unsigned long WXDataBrowserPropertyType; -typedef wxUint32 WXDataBrowserPropertyID; +typedef wxUint32 WXDataBrowserPropertyID; // --------------------------------------------------------- // wxDataViewRenderer // --------------------------------------------------------- -class WXDLLIMPEXP_ADV wxDataViewRenderer: public wxDataViewRendererBase +class WXDLLIMPEXP_ADV wxDataViewRenderer : public wxDataViewRendererBase { public: // @@ -56,7 +60,7 @@ public: // // implementation // - DataBrowserItemDataRef GetDataReference(void) const + WXDataBrowserItemDataRef GetDataReference(void) const { return this->m_dataReference; } @@ -65,12 +69,12 @@ public: return this->m_value; } - virtual WXDataBrowserPropertyType GetPropertyType() 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; } @@ -79,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 @@ -139,42 +143,6 @@ public: return false; } -// -// in-place editing -// - virtual void CancelEditing() - { - } - - virtual wxControl* CreateEditorCtrl(wxWindow * WXUNUSED(parent), wxRect WXUNUSED(labelRect), const wxVariant& WXUNUSED(value)) - { - return NULL; - } - - virtual bool FinishEditing() - { - return false; - } - - wxControl* GetEditorCtrl(void) const - { - return this->m_editorCtrlPtr; - } - virtual bool GetValueFromEditorCtrl(wxControl* WXUNUSED(editor), wxVariant& WXUNUSED(value)) - { - return false; - } - - virtual bool HasEditorCtrl(void) - { - return false; - } - - virtual bool StartEditing(wxDataViewItem const& WXUNUSED(item), wxRect WXUNUSED(labelRect)) - { - return false; - } - // // device context handling // @@ -186,7 +154,7 @@ public: virtual bool Render(void); // declared in wxDataViewRenderer but will not be used here, therefore calling this function will // return 'true' without having done anything - virtual WXDataBrowserPropertyType GetPropertyType() const; + virtual WXDataBrowserPropertyType GetPropertyType(void) const; void SetDC(wxDC* newDCPtr); // this method takes ownership of the pointer @@ -225,7 +193,7 @@ public: // // implementation // - virtual WXDataBrowserPropertyType GetPropertyType() const; + virtual WXDataBrowserPropertyType GetPropertyType(void) const; protected: private: @@ -268,7 +236,7 @@ public: // // implementation // - virtual WXDataBrowserPropertyType GetPropertyType() const; + virtual WXDataBrowserPropertyType GetPropertyType(void) const; protected: private: @@ -292,7 +260,7 @@ public: // // implementation // - virtual WXDataBrowserPropertyType GetPropertyType() const; + virtual WXDataBrowserPropertyType GetPropertyType(void) const; protected: private: @@ -316,7 +284,7 @@ public: // // implementation // - virtual WXDataBrowserPropertyType GetPropertyType() const; + virtual WXDataBrowserPropertyType GetPropertyType(void) const; protected: private: @@ -341,7 +309,7 @@ public: // // implementation // - virtual WXDataBrowserPropertyType GetPropertyType() const; + virtual WXDataBrowserPropertyType GetPropertyType(void) const; protected: private: @@ -365,7 +333,7 @@ public: // // implementation // - virtual WXDataBrowserPropertyType GetPropertyType() const; + virtual WXDataBrowserPropertyType GetPropertyType(void) const; protected: private: @@ -419,6 +387,10 @@ public: { return false; // not implemented } + virtual bool IsReorderable(void) const + { + return ((this->m_flags & wxDATAVIEW_COL_REORDERABLE) != 0); + } virtual bool IsResizeable(void) const { return ((this->m_flags & wxDATAVIEW_COL_RESIZABLE) != 0); @@ -438,13 +410,14 @@ public: virtual void SetHidden(bool WXUNUSED(hidden)) { } - virtual void SetMaxWidth (int maxWidth); - virtual void SetMinWidth (int minWidth); - virtual void SetResizeable(bool resizeable); - virtual void SetSortable (bool sortable); - virtual void SetSortOrder (bool ascending); - virtual void SetTitle (wxString const& title); - virtual void SetWidth (int width); + virtual void SetMaxWidth (int maxWidth); + virtual void SetMinWidth (int minWidth); + virtual void SetReorderable(bool reorderable); + virtual void SetResizeable (bool resizeable); + virtual void SetSortable (bool sortable); + virtual void SetSortOrder (bool ascending); + virtual void SetTitle (wxString const& title); + virtual void SetWidth (int width); // // implementation @@ -492,7 +465,7 @@ class WXDLLIMPEXP_ADV wxDataViewCtrl: public wxDataViewCtrlBase { public: // Constructors / destructor: - wxDataViewCtrl() + wxDataViewCtrl(void) { this->Init(); } @@ -521,6 +494,7 @@ public: 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); @@ -551,9 +525,22 @@ public: // 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); + // finishes editing of custom items; if no custom item is currently edited the method does nothing + void FinishCustomItemEditing(void); + // returns a pointer to a column; // in case the pointer cannot be found NULL is returned: wxDataViewColumn* GetColumnPtr(WXDataBrowserPropertyID propertyID) const; + // returns the current being rendered item of the customized renderer (this item is only valid during editing) + wxDataViewItem const& GetCustomRendererItem(void) const + { + return this->m_CustomRendererItem; + } + // returns a pointer to a customized renderer (this pointer is only valid during editing) + wxDataViewCustomRenderer* GetCustomRendererPtr(void) const + { + return this->m_CustomRendererPtr; + } // checks if currently a delete process is running: bool IsDeleting(void) const @@ -574,7 +561,17 @@ public: return this->m_cgContext; } - /// sets the flag indicating a deletion process: + // sets the currently being edited item of the custom renderer + void SetCustomRendererItem(wxDataViewItem const& NewItem) + { + this->m_CustomRendererItem = NewItem; + } + // sets the custom renderer + void SetCustomRendererPtr(wxDataViewCustomRenderer* NewCustomRendererPtr) + { + this->m_CustomRendererPtr = NewCustomRendererPtr; + } + // sets the flag indicating a deletion process: void SetDeleting(bool deleting) { this->m_Deleting = deleting; @@ -604,7 +601,11 @@ private: // 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 + + wxDataViewCustomRenderer* m_CustomRendererPtr; // pointer to a valid custom renderer while editing; this class does NOT own the pointer + wxDataViewItem m_CustomRendererItem; // currently edited item by the customerenderer; it is invalid while not editing + ColumnPointerHashMapType m_ColumnPointers; // all column pointers are stored in a hash map with the property ID as a key // wxWidget internal stuff: