From: Paul Cornett Date: Sat, 27 Oct 2007 19:45:20 +0000 (+0000) Subject: don't include platform headers from public wx header X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/34b1fdebbf3d40caaffad62b5bf89604213afb4a don't include platform headers from public wx header git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/mac/carbon/dataview.h b/include/wx/mac/carbon/dataview.h index ac0ca36952..abced130dd 100644 --- a/include/wx/mac/carbon/dataview.h +++ b/include/wx/mac/carbon/dataview.h @@ -7,23 +7,12 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __MACCARBONDATAVIEWCTRL_H__ -#define __MACCARBONDATAVIEWCTRL_H__ +#ifndef _WX_MACCARBONDATAVIEWCTRL_H_ +#define _WX_MACCARBONDATAVIEWCTRL_H_ -#include - -#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* DataBrowserItemDataRef; +typedef void* WXDataBrowserPropertyType; +typedef wxUint32 WXDataBrowserPropertyID; // --------------------------------------------------------- // wxDataViewRenderer @@ -76,7 +65,7 @@ public: return this->m_value; } - virtual DataBrowserPropertyType GetPropertyType(void) const = 0; + virtual WXDataBrowserPropertyType GetPropertyType() 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 @@ -197,10 +186,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 DataBrowserPropertyType GetPropertyType(void) const - { - return kDataBrowserCustomType; - } + virtual WXDataBrowserPropertyType GetPropertyType() const; void SetDC(wxDC* newDCPtr); // this method takes ownership of the pointer @@ -239,10 +225,7 @@ public: // // implementation // - virtual DataBrowserPropertyType GetPropertyType(void) const - { - return kDataBrowserTextType; - } + virtual WXDataBrowserPropertyType GetPropertyType() const; protected: private: @@ -269,10 +252,7 @@ public: // // implementation // - virtual DataBrowserPropertyType GetPropertyType(void) const - { - return kDataBrowserIconType; - } + virtual WXDataBrowserPropertyType GetPropertyType() const; protected: private: @@ -296,10 +276,7 @@ public: // // implementation // - virtual DataBrowserPropertyType GetPropertyType(void) const - { - return kDataBrowserIconAndTextType; - } + virtual WXDataBrowserPropertyType GetPropertyType() const; protected: private: @@ -323,10 +300,7 @@ public: // // implementation // - virtual DataBrowserPropertyType GetPropertyType(void) const - { - return kDataBrowserCheckboxType; - } + virtual WXDataBrowserPropertyType GetPropertyType() const; protected: private: @@ -351,10 +325,7 @@ public: // // implementation // - virtual DataBrowserPropertyType GetPropertyType(void) const - { - return kDataBrowserProgressBarType; - } + virtual WXDataBrowserPropertyType GetPropertyType() const; protected: private: @@ -378,10 +349,7 @@ public: // // implementation // - virtual DataBrowserPropertyType GetPropertyType(void) const - { - return kDataBrowserDateTimeType; - } + virtual WXDataBrowserPropertyType GetPropertyType() const; protected: private: @@ -465,12 +433,12 @@ 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; } @@ -486,7 +454,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 @@ -569,7 +537,7 @@ public: // returns a pointer to a column; // in case the pointer cannot be found NULL is returned: - wxDataViewColumn* GetColumnPtr(DataBrowserPropertyID propertyID) const; + wxDataViewColumn* GetColumnPtr(WXDataBrowserPropertyID propertyID) const; // checks if currently a delete process is running: bool IsDeleting(void) const @@ -606,7 +574,7 @@ protected: private: // type definitions: - WX_DECLARE_HASH_MAP(DataBrowserPropertyID,wxDataViewColumn*,wxIntegerHash,wxIntegerEqual,ColumnPointerHashMapType); + WX_DECLARE_HASH_MAP(WXDataBrowserPropertyID,wxDataViewColumn*,wxIntegerHash,wxIntegerEqual,ColumnPointerHashMapType); // initializing of local variables: void Init(void); @@ -630,4 +598,4 @@ private: }; -#endif // __MACDATAVIEWCTRL_H__ +#endif // _WX_MACCARBONDATAVIEWCTRL_H_ diff --git a/src/mac/carbon/dataview.cpp b/src/mac/carbon/dataview.cpp index dacaf01b96..1547f1e02b 100644 --- a/src/mac/carbon/dataview.cpp +++ b/src/mac/carbon/dataview.cpp @@ -22,6 +22,8 @@ #ifndef WX_PRECOMP #include "wx/timer.h" + #include "wx/settings.h" + #include "wx/dcclient.h" #endif #include "wx/icon.h" @@ -411,6 +413,10 @@ void wxDataViewCustomRenderer::SetDC(wxDC* newDCPtr) this->m_DCPtr = newDCPtr; } /* wxDataViewCustomRenderer::SetDC(wxDC*) */ +WXDataBrowserPropertyType wxDataViewCustomRenderer::GetPropertyType() const +{ + return WXDataBrowserPropertyType(kDataBrowserCustomType); +} IMPLEMENT_ABSTRACT_CLASS(wxDataViewCustomRenderer, wxDataViewRenderer) @@ -436,6 +442,11 @@ bool wxDataViewTextRenderer::Render(void) return false; } /* wxDataViewTextRenderer::Render(void) */ +WXDataBrowserPropertyType wxDataViewTextRenderer::GetPropertyType() const +{ + return WXDataBrowserPropertyType(kDataBrowserTextType); +} + IMPLEMENT_CLASS(wxDataViewTextRenderer,wxDataViewRenderer) // --------------------------------------------------------- @@ -463,6 +474,11 @@ bool wxDataViewBitmapRenderer::Render(void) return false; } /* wxDataViewBitmapRenderer::Render(void) */ +WXDataBrowserPropertyType wxDataViewBitmapRenderer::GetPropertyType() const +{ + return WXDataBrowserPropertyType(kDataBrowserIconType); +} + IMPLEMENT_CLASS(wxDataViewBitmapRenderer,wxDataViewRenderer) // --------------------------------------------------------- @@ -493,6 +509,11 @@ bool wxDataViewIconTextRenderer::Render(void) return false; } /* wxDataViewIconTextRenderer::Render(void) */ +WXDataBrowserPropertyType wxDataViewIconTextRenderer::GetPropertyType() const +{ + return WXDataBrowserPropertyType(kDataBrowserIconAndTextType); +} + IMPLEMENT_ABSTRACT_CLASS(wxDataViewIconTextRenderer,wxDataViewRenderer) @@ -513,6 +534,11 @@ bool wxDataViewToggleRenderer::Render(void) return false; } /* wxDataViewToggleRenderer::Render(void) */ +WXDataBrowserPropertyType wxDataViewToggleRenderer::GetPropertyType() const +{ + return WXDataBrowserPropertyType(kDataBrowserCheckboxType); +} + IMPLEMENT_ABSTRACT_CLASS(wxDataViewToggleRenderer,wxDataViewRenderer) // --------------------------------------------------------- @@ -534,6 +560,11 @@ bool wxDataViewProgressRenderer::Render(void) return false; } /* wxDataViewProgressRenderer::Render(void) */ +WXDataBrowserPropertyType wxDataViewProgressRenderer::GetPropertyType() const +{ + return WXDataBrowserPropertyType(kDataBrowserProgressBarType); +} + IMPLEMENT_ABSTRACT_CLASS(wxDataViewProgressRenderer,wxDataViewRenderer) // --------------------------------------------------------- @@ -553,6 +584,11 @@ bool wxDataViewDateRenderer::Render(void) return false; } /* wxDataViewDateRenderer::Render(void) */ +WXDataBrowserPropertyType wxDataViewDateRenderer::GetPropertyType() const +{ + return WXDataBrowserPropertyType(kDataBrowserDateTimeType); +} + IMPLEMENT_ABSTRACT_CLASS(wxDataViewDateRenderer,wxDataViewRenderer) // --------------------------------------------------------- @@ -861,7 +897,7 @@ bool wxDataViewCtrl::AppendColumn(wxDataViewColumn* dataViewColumnPtr) // initialize column description: dataViewColumnPtr->SetPropertyID(NewPropertyID); columnDescription.propertyDesc.propertyID = NewPropertyID; - columnDescription.propertyDesc.propertyType = dataViewColumnPtr->GetRenderer()->GetPropertyType(); + columnDescription.propertyDesc.propertyType = DataBrowserPropertyType(dataViewColumnPtr->GetRenderer()->GetPropertyType()); columnDescription.propertyDesc.propertyFlags = kDataBrowserListViewSelectionColumn; // make the column selectable if (dataViewColumnPtr->IsSortable()) columnDescription.propertyDesc.propertyFlags |= kDataBrowserListViewSortableColumn; @@ -1227,7 +1263,7 @@ void wxDataViewCtrl::AddChildrenLevel(wxDataViewItem const& parentItem) #endif } /* wxDataViewCtrl::AddChildrenLevel(wxDataViewItem const&) */ -wxDataViewColumn* wxDataViewCtrl::GetColumnPtr(DataBrowserPropertyID propertyID) const +wxDataViewColumn* wxDataViewCtrl::GetColumnPtr(WXDataBrowserPropertyID propertyID) const { // variable definition: ColumnPointerHashMapType::const_iterator Result(this->m_ColumnPointers.find(propertyID));