wxGTK2: No need to check for __WXGTK20__ here

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

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index db1c6404ddceb978b7ee1da77f71c786177593fd..87742cb61a672a381a99fd655ae2a9aa6eed410c 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -96,7 +96,7 @@ static void wxgtk_window_set_urgency_hint (GtkWindow *win,
 
 static gboolean gtk_frame_urgency_timer_callback( wxTopLevelWindowGTK *win )
 {
 
 static gboolean gtk_frame_urgency_timer_callback( wxTopLevelWindowGTK *win )
 {

-#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2,7,0)
+#if GTK_CHECK_VERSION(2,7,0)

     if(!gtk_check_version(2,7,0))
         gtk_window_set_urgency_hint(GTK_WINDOW( win->m_widget ), FALSE);
     else
     if(!gtk_check_version(2,7,0))
         gtk_window_set_urgency_hint(GTK_WINDOW( win->m_widget ), FALSE);
     else


@@ -146,7 +146,7 @@ static gboolean gtk_frame_focus_in_callback( GtkWidget *widget,
             g_source_remove( win->m_urgency_hint );
             // no break, fallthrough to remove hint too
         case -1:
             g_source_remove( win->m_urgency_hint );
             // no break, fallthrough to remove hint too
         case -1:

-#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2,7,0)
+#if GTK_CHECK_VERSION(2,7,0)

             if(!gtk_check_version(2,7,0))
                 gtk_window_set_urgency_hint(GTK_WINDOW( widget ), FALSE);
             else
             if(!gtk_check_version(2,7,0))
                 gtk_window_set_urgency_hint(GTK_WINDOW( widget ), FALSE);
             else


@@ -1264,7 +1264,7 @@ void wxTopLevelWindowGTK::RequestUserAttention(int flags)
         }
     }
 
         }
     }
 

-#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2,7,0)
+#if GTK_CHECK_VERSION(2,7,0)

     if(!gtk_check_version(2,7,0))
         gtk_window_set_urgency_hint(GTK_WINDOW( m_widget ), new_hint_value);
     else
     if(!gtk_check_version(2,7,0))
         gtk_window_set_urgency_hint(GTK_WINDOW( m_widget ), new_hint_value);
     else