X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dca92ddfbff8fc0a858ada23c4ece06cdbe229c8..c493691d6249650c0366fd9aaaca8572e3ff3edd:/src/gtk1/toplevel.cpp diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp index 6dc85efbf4..a761214759 100644 --- a/src/gtk1/toplevel.cpp +++ b/src/gtk1/toplevel.cpp @@ -107,7 +107,7 @@ static void wxgtk_window_set_urgency_hint (GtkWindow *win, static gint gtk_frame_urgency_timer_callback( GtkWidget *win ) { -#if __WXGTK20__ && GTK_CHECK_VERSION(2,7,0) +#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2,7,0) if(!gtk_check_version(2,7,0)) gtk_window_set_urgency_hint(GTK_WINDOW( win ), FALSE); else @@ -160,7 +160,7 @@ static gint gtk_frame_focus_in_callback( GtkWidget *widget, gtk_timeout_remove( GPOINTER_TO_INT(gtk_object_get_data( GTK_OBJECT(widget), "m_urgency_hint") ) ); // no break, fallthrough to remove hint too case -1: -#if __WXGTK20__ && GTK_CHECK_VERSION(2,7,0) +#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2,7,0) if(!gtk_check_version(2,7,0)) gtk_window_set_urgency_hint(GTK_WINDOW( widget ), FALSE); else @@ -651,10 +651,6 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, gtk_signal_connect( GTK_OBJECT(m_widget), "realize", GTK_SIGNAL_FUNC(gtk_frame_realized_callback), (gpointer) this ); - // the only way to get the window size is to connect to this event - gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event", - GTK_SIGNAL_FUNC(gtk_frame_configure_callback), (gpointer)this ); - // map and unmap for iconized state gtk_signal_connect( GTK_OBJECT(m_widget), "map_event", GTK_SIGNAL_FUNC(gtk_frame_map_callback), (gpointer)this ); @@ -1382,7 +1378,7 @@ void wxTopLevelWindowGTK::RequestUserAttention(int flags) } } -#if __WXGTK20__ && GTK_CHECK_VERSION(2,7,0) +#if defined(__WXGTK20__) && 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