diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-07-26 16:19:00 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-07-26 16:19:00 +0000 |
| commit | e442680f48004a1fa58218c58c60428aef11682e (patch) | |
| tree | 32327cac8b3eea22572363d501ee27c240349077 | |
| parent | 22b3ead1c41914b33fb224799c5f1a48e62e0b87 (diff) | |
| download | wireshark-e442680f48004a1fa58218c58c60428aef11682e.tar.gz | |
gtk_widget_modify_font() has been renamed to gtk_widget_override_font() in GTK3
svn path=/trunk/; revision=50915
| -rw-r--r-- | ui/gtk/addr_resolution_dlg.c | 4 | ||||
| -rw-r--r-- | ui/gtk/bytes_view.c | 4 | ||||
| -rw-r--r-- | ui/gtk/capture_dlg.c | 8 |
3 files changed, 16 insertions, 0 deletions
diff --git a/ui/gtk/addr_resolution_dlg.c b/ui/gtk/addr_resolution_dlg.c index 6c3292ce3d..05bea5e0e4 100644 --- a/ui/gtk/addr_resolution_dlg.c +++ b/ui/gtk/addr_resolution_dlg.c @@ -242,7 +242,11 @@ addr_resolution_dlg (GtkAction *action _U_, gpointer data _U_) view = gtk_text_view_new (); gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(view), GTK_WRAP_WORD); buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); +#if GTK_CHECK_VERSION(3, 0, 0) + gtk_widget_override_font(view, user_font_get_regular()); +#else gtk_widget_modify_font(view, user_font_get_regular()); +#endif gtk_widget_show (view); scroll = gtk_scrolled_window_new(NULL, NULL); diff --git a/ui/gtk/bytes_view.c b/ui/gtk/bytes_view.c index 76969b9a2f..dfbbcbc316 100644 --- a/ui/gtk/bytes_view.c +++ b/ui/gtk/bytes_view.c @@ -1385,7 +1385,11 @@ bytes_view_set_font(BytesView *bv, PangoFontDescription *font) if (bv->font) pango_font_description_free(bv->font); +#if GTK_CHECK_VERSION(3, 0, 0) + gtk_widget_override_font(GTK_WIDGET(bv), font); +#else gtk_widget_modify_font(GTK_WIDGET(bv), font); +#endif bv->font = pango_font_description_copy(font); bv->max_width = 0; diff --git a/ui/gtk/capture_dlg.c b/ui/gtk/capture_dlg.c index 43637e9c74..a22be5397b 100644 --- a/ui/gtk/capture_dlg.c +++ b/ui/gtk/capture_dlg.c @@ -2161,7 +2161,11 @@ compile_results_prep(GtkWidget *w _U_, gpointer data _U_) font = pango_font_description_from_string("Monospace"); textview = gtk_text_view_new(); +#if GTK_CHECK_VERSION(3, 0, 0) + gtk_widget_override_font(textview, font); +#else gtk_widget_modify_font(textview, font); +#endif scrolled_win = gtk_scrolled_window_new(NULL, NULL); gtk_widget_set_size_request(GTK_WIDGET(scrolled_win), 350, -1); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_win), @@ -2280,7 +2284,11 @@ compile_results_win(gchar *text, gboolean error) gtk_widget_show(main_box); font = pango_font_description_from_string("Monospace"); textview = gtk_text_view_new(); +#if GTK_CHECK_VERSION(3, 0, 0) + gtk_widget_override_font(textview, font); +#else gtk_widget_modify_font(textview, font); +#endif scrolled_win = gtk_scrolled_window_new(NULL, NULL); gtk_widget_set_size_request(GTK_WIDGET(scrolled_win), 350, -1); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_win), |