summaryrefslogtreecommitdiff
path: root/ui/gtk/gui_utils.h
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2016-02-21 17:10:03 +0000
committerAnders Broman <a.broman58@gmail.com>2016-02-25 04:50:59 +0000
commit394eaa1c20a43d75e59e14bc1d3e968451f880e4 (patch)
tree3876a18b6e48febeb9d60170e28a13bedf22e2c7 /ui/gtk/gui_utils.h
parent03dfd9cead43930e481fad614ac83e760cee98ea (diff)
downloadwireshark-394eaa1c20a43d75e59e14bc1d3e968451f880e4.tar.gz
Add GResource message to configure script
Use more descriptive naming while at it. Change-Id: Ic89562cb9fa2cd5e315992f12ad9e46f2361da0b Reviewed-on: https://code.wireshark.org/review/14057 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/gtk/gui_utils.h')
-rw-r--r--ui/gtk/gui_utils.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/gtk/gui_utils.h b/ui/gtk/gui_utils.h
index 0409667411..198fb2b389 100644
--- a/ui/gtk/gui_utils.h
+++ b/ui/gtk/gui_utils.h
@@ -277,7 +277,7 @@ extern GtkWidget *xpm_to_widget(const char ** xpm);
extern GtkWidget *xpm_to_widget_from_parent(GtkWidget *parent, const char ** xpm);
#endif
-#ifdef HAVE_GRESOURCE
+#ifdef HAVE_GDK_GRESOURCE
/** Convert pixbuf data to a GtkWidget
*
* @param pb_path GResource pixbuf path.
@@ -295,7 +295,7 @@ extern GtkWidget *pixbuf_to_widget(const guint8 * pb_data);
#define PIXBUF_TO_WIDGET(pb, path) \
pixbuf_to_widget(pb)
-#endif /* HAVE_GRESOURCE */
+#endif /* HAVE_GDK_GRESOURCE */
/** Copy a GString to the clipboard.
*
@@ -529,7 +529,7 @@ void ws_combo_box_set_active(GtkComboBox *combo_box, gint idx);
void
ws_combo_box_set_active_iter(GtkComboBox *combo_box, GtkTreeIter *iter);
-#ifdef HAVE_GRESOURCE
+#ifdef HAVE_GDK_GRESOURCE
/**
* ws_gdk_pixbuf_new_from_resource:
* @param path A GResource path
@@ -537,7 +537,7 @@ ws_combo_box_set_active_iter(GtkComboBox *combo_box, GtkTreeIter *iter);
*/
GdkPixbuf *
ws_gdk_pixbuf_new_from_resource(const char *path);
-#endif /* HAVE_GRESOURCE */
+#endif /* HAVE_GDK_GRESOURCE */
#if GTK_CHECK_VERSION(2,22,0)
#if !GTK_CHECK_VERSION(3,0,0)