X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..848332140be2d53aea32d0702f4c0e06c149d24b:/src/gtk1/treegtk.cpp?ds=sidebyside diff --git a/src/gtk1/treegtk.cpp b/src/gtk1/treegtk.cpp index 8c2dd7b4a4..58722ba8ac 100644 --- a/src/gtk1/treegtk.cpp +++ b/src/gtk1/treegtk.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "treectrl.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -24,7 +20,7 @@ #include "wx/wx.h" #endif -#include "wx/gtk/treectrl.h" +#include "wx/gtk1/treectrl.h" #include "wx/textctrl.h" #include "wx/log.h" @@ -496,7 +492,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()) @@ -721,7 +717,7 @@ long wxTreeCtrl::GetChild(long item) const { p = findGtkTreeItem(item); GList *list = gtk_container_children(GTK_CONTAINER(p)); - next = GTK_TREE_ITEM(list->data);; + next = GTK_TREE_ITEM(list->data); if (next != NULL) return (long)gtk_object_get_data(GTK_OBJECT(next), "id"); @@ -733,7 +729,7 @@ long wxTreeCtrl::GetFirstVisibleItem(void) const { GtkTreeItem *next = NULL; GList *list = gtk_container_children(GTK_CONTAINER(m_anchor)); - next = GTK_TREE_ITEM(list->data);; + next = GTK_TREE_ITEM(list->data); // gtk_container_foreach(GTK_CONTAINER(m_anchor), gtk_treectrl_next_visible_callback, &next); if (next != NULL) @@ -748,7 +744,7 @@ long wxTreeCtrl::GetNextVisibleItem(long item) const { p = findGtkTreeItem(item); GList *list = gtk_container_children(GTK_CONTAINER(p)); - next = GTK_TREE_ITEM(list->data);; + next = GTK_TREE_ITEM(list->data); // gtk_container_foreach(GTK_CONTAINER(p), gtk_treectrl_next_visible_callback, &next); if (next != NULL)