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

Revert r62598 which removed "unnecessary wxOSX_USE_COCOA checks."

Browse Source 
These checks were not unnecessary at all, this file is used for both Cocoa and
Carbon, fix this momentary lapse of reason.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-11-11 01:32:58 +00:00
parent f49f59d0c9
commit aaedb44c5e
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,9 +56,11 @@ 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:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer) DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)
@@ -81,6 +83,8 @@ private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer) DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer)
}; };
#if wxOSX_USE_COCOA
// ------------------------------------- // -------------------------------------
// wxDataViewChoiceRenderer // wxDataViewChoiceRenderer
// ------------------------------------- // -------------------------------------
@@ -103,6 +107,8 @@ private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewChoiceRenderer) DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewChoiceRenderer)
}; };
#endif // wxOSX_USE_COCOA
// --------------------------------------------------------- // ---------------------------------------------------------
// wxDataViewIconTextRenderer // wxDataViewIconTextRenderer
// --------------------------------------------------------- // ---------------------------------------------------------
@@ -115,9 +121,11 @@ 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:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer) DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer)
@@ -136,9 +144,11 @@ 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:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer) DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer)
@@ -158,9 +168,11 @@ 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:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer) DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer)
@@ -179,9 +191,11 @@ 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:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer) DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer)