Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary wxOSX_USE_COCOA checks in wx/osx/dvrenderers.h

Browse Source 
These checks are not needed any more now that Carbon is not supported any
loner.
This commit is contained in:
Vadim Zeitlin
2016-03-19 00:14:35 +01:00
parent c4e892629f
commit 6316045e19
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/osx/dvrenderers.h
View File

@@ -57,11 +57,9 @@ public:
virtual bool MacRender(); virtual bool MacRender();
#if wxOSX_USE_COCOA
virtual void OSXOnCellChanged(NSObject *value, virtual void OSXOnCellChanged(NSObject *value,
const wxDataViewItem& item, const wxDataViewItem& item,
unsigned col); unsigned col);
#endif // Cocoa
private: private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer);
@@ -86,8 +84,6 @@ private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer);
}; };
#if wxOSX_USE_COCOA
// ------------------------------------- // -------------------------------------
// wxDataViewChoiceRenderer // wxDataViewChoiceRenderer
// ------------------------------------- // -------------------------------------
@@ -104,11 +100,9 @@ public:
wxString GetChoice(size_t index) const { return m_choices[index]; } wxString GetChoice(size_t index) const { return m_choices[index]; }
const wxArrayString& GetChoices() const { return m_choices; } const wxArrayString& GetChoices() const { return m_choices; }
#if wxOSX_USE_COCOA
virtual void OSXOnCellChanged(NSObject *value, virtual void OSXOnCellChanged(NSObject *value,
const wxDataViewItem& item, const wxDataViewItem& item,
unsigned col); unsigned col);
#endif // Cocoa
private: private:
wxArrayString m_choices; wxArrayString m_choices;
@@ -135,8 +129,6 @@ public:
unsigned col) wxOVERRIDE; unsigned col) wxOVERRIDE;
}; };
#endif // wxOSX_USE_COCOA
// --------------------------------------------------------- // ---------------------------------------------------------
// wxDataViewIconTextRenderer // wxDataViewIconTextRenderer
// --------------------------------------------------------- // ---------------------------------------------------------
@@ -151,11 +143,9 @@ public:
virtual bool MacRender(); virtual bool MacRender();
#if wxOSX_USE_COCOA
virtual void OSXOnCellChanged(NSObject *value, virtual void OSXOnCellChanged(NSObject *value,
const wxDataViewItem& item, const wxDataViewItem& item,
unsigned col); unsigned col);
#endif // Cocoa
private: private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer);
@@ -176,11 +166,9 @@ public:
virtual bool MacRender(); virtual bool MacRender();
#if wxOSX_USE_COCOA
virtual void OSXOnCellChanged(NSObject *value, virtual void OSXOnCellChanged(NSObject *value,
const wxDataViewItem& item, const wxDataViewItem& item,
unsigned col); unsigned col);
#endif // Cocoa
private: private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer);
@@ -202,11 +190,9 @@ public:
virtual bool MacRender(); virtual bool MacRender();
#if wxOSX_USE_COCOA
virtual void OSXOnCellChanged(NSObject *value, virtual void OSXOnCellChanged(NSObject *value,
const wxDataViewItem& item, const wxDataViewItem& item,
unsigned col); unsigned col);
#endif // Cocoa
private: private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer);
@@ -227,11 +213,9 @@ public:
virtual bool MacRender(); virtual bool MacRender();
#if wxOSX_USE_COCOA
virtual void OSXOnCellChanged(NSObject *value, virtual void OSXOnCellChanged(NSObject *value,
const wxDataViewItem& item, const wxDataViewItem& item,
unsigned col); unsigned col);
#endif // Cocoa
private: private:
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer); wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer);