X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/28d2a709de9d2e85f70d78affadaf1a5930b23d4..bfe35776254b50981742c789c73aff0af03e6de2:/src/gtk/treegtk.cpp diff --git a/src/gtk/treegtk.cpp b/src/gtk/treegtk.cpp index 6d8fa194e1..8c2dd7b4a4 100644 --- a/src/gtk/treegtk.cpp +++ b/src/gtk/treegtk.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "treectrl.h" #endif @@ -25,7 +25,7 @@ #endif #include "wx/gtk/treectrl.h" -#include +#include "wx/textctrl.h" #include "wx/log.h" #include @@ -75,10 +75,8 @@ static void gtk_treeitem_select_callback(GtkWidget *widget, wxTreeItemId *treeit owner->SendSelChanged(GTK_TREE_ITEM(widget)); } -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl) -#endif void wxTreeCtrl::Init() { m_imageListNormal = NULL; @@ -317,7 +315,7 @@ wxTreeItemId wxTreeCtrl::GetSelection() const { return p; } -wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const { +wxTreeItemId wxTreeCtrl::GetItemParent(const wxTreeItemId& item) const { if (item.IsOk()) return (GtkTreeItem *)gtk_object_get_data(GTK_OBJECT((GtkTreeItem *)item), "parent");