Compile fixes for tree ctrl

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp
index 02d693c32472364ad7692cd9403be88ead6903d2..d12636c5b726429022b4047781ed006ef9a90cf6 100644 (file)
--- a/src/generic/treectrl.cpp
+++ b/src/generic/treectrl.cpp
@@ -375,22 +375,22 @@ wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
 void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
 {
   wxClientDC dc(this);
-  return item.m_pItem->SetText(text, dc);
+  item.m_pItem->SetText(text, dc);
 }
 
 void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image)
 {
-  return item.m_pItem->SetImage(image);
+  item.m_pItem->SetImage(image);
 }
 
 void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
 {
-  return item.m_pItem->SetSelectedImage(image);
+  item.m_pItem->SetSelectedImage(image);
 }
 
 void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
 {
-  return item.m_pItem->SetData(data);
+  item.m_pItem->SetData(data);
 }
 
 void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
@@ -467,7 +467,7 @@ wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
   wxASSERT( index != NOT_FOUND ); // I'm not a child of my parent?
 
   size_t n = (size_t)(index + 1);
-  return n == siblings.Count() ? NULL : siblings[n];
+  return n == siblings.Count() ? (wxGenericTreeItem*)NULL : siblings[n];
 }
 
 wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
@@ -486,7 +486,7 @@ wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
   int index = siblings.Index(i);
   wxASSERT( index != NOT_FOUND ); // I'm not a child of my parent?
 
-  return index == 0 ? NULL : siblings[(size_t)(index - 1)];
+  return index == 0 ? (wxGenericTreeItem*)NULL : siblings[(size_t)(index - 1)];
 }
 
 wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const

diff --git a/src/gtk.inc b/src/gtk.inc
index 194ced95cdf80c6afc39727bfc6730a47b0055f2..43a72e8839e2c2b0aa350372c578ad042c4924e4 100644 (file)
--- a/src/gtk.inc
+++ b/src/gtk.inc
@@ -129,7 +129,8 @@ LIB_CPP_SRC=\
  generic/splitter.cpp \
  generic/statusbr.cpp \
  generic/tabg.cpp \
- generic/textdlgg.cpp
+ generic/textdlgg.cpp \
+ generic/treectrl.cpp
   
 LIB_C_SRC=\
  common/extended.c \