[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

diff --git a/src/gtk/treegtk.cpp b/src/gtk/treegtk.cpp
index e00310eacf1a1b74b0e05f5930091dc6bb1fdf99..0e2ad4c3c8de932a7c43e7e1c69ca38370c67624 100644 (file)
--- a/src/gtk/treegtk.cpp
+++ b/src/gtk/treegtk.cpp
@@ -6,7 +6,7 @@
 // Created:     07/05/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Denis Pershin
 // Created:     07/05/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Denis Pershin

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)


@@ -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())