GTK+1 fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index ac62f332b90580efdf3bcef1261d3a28705cdb5b..2e8888389569848508b8c1f25dae6d3d203bb3d3 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -45,7 +45,7 @@
     #include "wx/mac/private.h"
 #endif
 
     #include "wx/mac/private.h"
 #endif
 

-#ifdef __WXGTK__
+#ifdef __WXGTK20__

     #include "wx/gtk/private.h"
     #include "wx/gtk/win_gtk.h"
 #endif
     #include "wx/gtk/private.h"
     #include "wx/gtk/win_gtk.h"
 #endif


@@ -2241,7 +2241,7 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
         x=0;
         GetVirtualSize(&w, &h);
         wxRect rect( x, item->GetY()+offset, w, total_h-offset);
         x=0;
         GetVirtualSize(&w, &h);
         wxRect rect( x, item->GetY()+offset, w, total_h-offset);

-#ifndef __WXGTK__
+#ifndef __WXGTK20__

         dc.DrawRectangle(rect);
 #else
         if (!item->IsSelected())
         dc.DrawRectangle(rect);
 #else
         if (!item->IsSelected())


@@ -2281,7 +2281,7 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
             // background colour.
             wxRect rect( item->GetX() + image_w - 2, item->GetY()+offset,
                          item->GetWidth() - image_w + 2, total_h-offset );
             // background colour.
             wxRect rect( item->GetX() + image_w - 2, item->GetY()+offset,
                          item->GetWidth() - image_w + 2, total_h-offset );

-#ifndef __WXGTK__
+#ifndef __WXGTK20__

             dc.DrawRectangle( rect );
 #else
             CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );
             dc.DrawRectangle( rect );
 #else
             CalcScrolledPosition( rect.x, rect.y, &rect.x, &rect.y );


@@ -2315,7 +2315,7 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
         {
             wxRect rect( item->GetX()-2, item->GetY()+offset,
                          item->GetWidth()+2, total_h-offset );
         {
             wxRect rect( item->GetX()-2, item->GetY()+offset,
                          item->GetWidth()+2, total_h-offset );

-#ifndef __WXGTK__
+#ifndef __WXGTK20__

             dc.DrawRectangle( rect );
 #else
             if ( attr && attr->HasBackgroundColour() )
             dc.DrawRectangle( rect );
 #else
             if ( attr && attr->HasBackgroundColour() )