Not all implementations of wxMDIChildFrame derive from wxFrame

[wxWidgets.git] / src / gtk1 / treegtk.cpp

diff --git a/src/gtk1/treegtk.cpp b/src/gtk1/treegtk.cpp
index 0b0799b56ba738279776eb5e060cb247ef8637b3..0e2ad4c3c8de932a7c43e7e1c69ca38370c67624 100644 (file)
--- a/src/gtk1/treegtk.cpp
+++ b/src/gtk1/treegtk.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "treectrl.h"
 #endif
 
 #pragma implementation "treectrl.h"
 #endif
 


@@ -315,7 +315,7 @@ wxTreeItemId wxTreeCtrl::GetSelection() const {
   return p;
 }
 
   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");
 
   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)
   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())
       if (bmp->Ok()) {
         GdkBitmap *mask = NULL;
         if (bmp->GetMask())