Fix for GTK+1

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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 4f76d244cbc4511ed01cff2c1e3564db6b24a451..4cce420c0f3c9bd8cf411b3ca11965f14f4de5da 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -52,7 +52,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


@@ -1448,7 +1448,7 @@ void wxListLineData::Draw( wxDC *dc )
     wxListItemAttr *attr = GetAttr();
 
     if ( SetAttributes(dc, attr, highlighted) )
     wxListItemAttr *attr = GetAttr();
 
     if ( SetAttributes(dc, attr, highlighted) )

-#ifndef __WXGTK__
+#ifndef __WXGTK20__

     {
         dc->DrawRectangle( m_gi->m_rectHighlight );
     }
     {
         dc->DrawRectangle( m_gi->m_rectHighlight );
     }


@@ -1513,7 +1513,7 @@ void wxListLineData::DrawInReportMode( wxDC *dc,
     //       GetAttr() and move these lines into the loop below
     wxListItemAttr *attr = GetAttr();
     if ( SetAttributes(dc, attr, highlighted) )
     //       GetAttr() and move these lines into the loop below
     wxListItemAttr *attr = GetAttr();
     if ( SetAttributes(dc, attr, highlighted) )

-#ifndef __WXGTK__
+#ifndef __WXGTK20__

     {
         dc->DrawRectangle( rectHL );
     }
     {
         dc->DrawRectangle( rectHL );
     }


@@ -2796,7 +2796,7 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         if ( m_hasFocus )
         {
             wxRect rect( GetLineHighlightRect( m_current ) );
         if ( m_hasFocus )
         {
             wxRect rect( GetLineHighlightRect( m_current ) );

-#ifndef __WXGTK__
+#ifndef __WXGTK20__

             dc.SetPen( *wxBLACK_PEN );
             dc.SetBrush( *wxTRANSPARENT_BRUSH );
             dc.DrawRectangle( rect );
             dc.SetPen( *wxBLACK_PEN );
             dc.SetBrush( *wxTRANSPARENT_BRUSH );
             dc.DrawRectangle( rect );