fix memory leak; allocate the DC before SetFont() is called on the status bar

[wxWidgets.git] / include / wx / dataview.h

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 14fd53de9dc8454f3c8d1cd94610ff65703aae3f..ce538affaea5209fe6c5b8d5c621b6ce784147e2 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -27,7 +27,7 @@
 
 class WXDLLIMPEXP_FWD_CORE wxImageList;
 
-#if !(defined(__WXGTK20__) || defined(__WXMAC__)) || defined(__WXUNIVERSAL__)
+#if !(defined(__WXGTK20__) || defined(__WXOSX_CARBON__)) || defined(__WXUNIVERSAL__)
 // #if !(defined(__WXMAC__)) || defined(__WXUNIVERSAL__)
     #define wxHAS_GENERIC_DATAVIEWCTRL
 #endif
@@ -811,11 +811,13 @@ protected:
     wxDataViewColumn   *m_column;
     wxPoint             m_pos;
 
+#if wxUSE_DRAG_AND_DROP
     wxDataObject       *m_dataObject;
 
     wxDataFormat        m_dataFormat;
     void*               m_dataBuffer;
     size_t              m_dataSize;
+#endif // wxUSE_DRAG_AND_DROP
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewEvent)