build fix for wxMac

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

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index 2af087cb6b58f837917f7e910afa89349af0113e..bd1f98f4b271832b8353d6a2b0e33ad475d66c3a 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -53,7 +53,8 @@
 // GTK+ signal handler
 // ----------------------------------------------------------------------------
 
 // GTK+ signal handler
 // ----------------------------------------------------------------------------
 

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

 extern "C" {
 static
 gboolean statusbar_query_tooltip(GtkWidget  *widget,
 extern "C" {
 static
 gboolean statusbar_query_tooltip(GtkWidget  *widget,


@@ -76,6 +77,7 @@ gboolean statusbar_query_tooltip(GtkWidget  *widget,
 }
 }
 #endif
 }
 }
 #endif

+#endif

 
 // ----------------------------------------------------------------------------
 // wxStatusBarGeneric
 
 // ----------------------------------------------------------------------------
 // wxStatusBarGeneric


@@ -124,13 +126,15 @@ bool wxStatusBarGeneric::Create(wxWindow *parent,
 
     SetFieldsCount(1);
     
 
     SetFieldsCount(1);
     

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

     if (HasFlag(wxST_SHOW_TIPS) && !gtk_check_version(2,12,0))
     {
         g_object_set(m_widget, "has-tooltip", TRUE, NULL); 
         g_signal_connect(m_widget, "query-tooltip",  
                          G_CALLBACK(statusbar_query_tooltip), this); 
     }
     if (HasFlag(wxST_SHOW_TIPS) && !gtk_check_version(2,12,0))
     {
         g_object_set(m_widget, "has-tooltip", TRUE, NULL); 
         g_signal_connect(m_widget, "query-tooltip",  
                          G_CALLBACK(statusbar_query_tooltip), this); 
     }

+#endif

 #endif
 
     return true;
 #endif
 
     return true;