X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..6def7a17b01a15e68696a1863d114ecc5554e3d4:/src/gtk1/treegtk.cpp diff --git a/src/gtk1/treegtk.cpp b/src/gtk1/treegtk.cpp index 0b0799b56b..0e2ad4c3c8 100644 --- a/src/gtk1/treegtk.cpp +++ b/src/gtk1/treegtk.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "treectrl.h" #endif @@ -315,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"); @@ -496,7 +496,7 @@ printf("begin insert\n"); const wxBitmap *bmp; const wxImageList *list; if ((list = GetImageList(wxIMAGE_LIST_NORMAL)) != NULL) - if ((bmp = list->GetBitmap(image)) != NULL) + if ((bmp = list->GetBitmapPtr(image)) != NULL) if (bmp->Ok()) { GdkBitmap *mask = NULL; if (bmp->GetMask())