diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2011-08-15 20:56:00 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2011-08-15 20:56:00 +0000 |
| commit | 5ab5d4e3b366608f9c2548c4e4eb064c81d5c6fb (patch) | |
| tree | 285631e86406bd8dfa897c022abd0daff3f01a8f | |
| parent | 0e4d01e183ab7f3e4ad337b71d9265bdcb2bbd49 (diff) | |
| download | wireshark-5ab5d4e3b366608f9c2548c4e4eb064c81d5c6fb.tar.gz wireshark-5ab5d4e3b366608f9c2548c4e4eb064c81d5c6fb.tar.bz2 wireshark-5ab5d4e3b366608f9c2548c4e4eb064c81d5c6fb.zip | |
gdk_pixbuf_render_pixmap_and_mask_for_colormap() used in xpm_to_widget_from_parent is gone in GTK 3.0.
Rather tan trying to replace it go for the simpler xpm_to_widget() The
result looks the same to me.
svn path=/trunk/; revision=38549
| -rw-r--r-- | gtk/about_dlg.c | 4 | ||||
| -rw-r--r-- | gtk/gui_utils.c | 5 | ||||
| -rw-r--r-- | gtk/gui_utils.h | 2 | ||||
| -rw-r--r-- | gtk/main_welcome.c | 3 |
4 files changed, 9 insertions, 5 deletions
diff --git a/gtk/about_dlg.c b/gtk/about_dlg.c index 012f3dad0a..c95942f6e0 100644 --- a/gtk/about_dlg.c +++ b/gtk/about_dlg.c @@ -79,7 +79,9 @@ about_wireshark(GtkWidget *parent, GtkWidget *main_vb) gchar *message; const char *title = "Network Protocol Analyzer"; - icon = xpm_to_widget_from_parent(parent, wssplash_xpm); + /*icon = xpm_to_widget_from_parent(parent, wssplash_xpm);*/ + icon = xpm_to_widget(wssplash_xpm); + gtk_container_add(GTK_CONTAINER(main_vb), icon); msg_label = gtk_label_new(title); diff --git a/gtk/gui_utils.c b/gtk/gui_utils.c index 6531f0cdc6..6fcdcbe588 100644 --- a/gtk/gui_utils.c +++ b/gtk/gui_utils.c @@ -541,7 +541,8 @@ window_destroy(GtkWidget *win) gtk_widget_destroy(win); } - +#if 0 +/* Do we need this one ? */ /* convert an xpm to a GtkWidget, using the window settings from it's parent */ /* (be sure that the parent window is already being displayed) */ GtkWidget *xpm_to_widget_from_parent(GtkWidget *parent, const char ** xpm) { @@ -555,7 +556,7 @@ GtkWidget *xpm_to_widget_from_parent(GtkWidget *parent, const char ** xpm) { return gtk_image_new_from_pixmap (pixmap, bitmap); } - +#endif /* convert an xpm to a GtkWidget */ GtkWidget *xpm_to_widget(const char ** xpm) { diff --git a/gtk/gui_utils.h b/gtk/gui_utils.h index ffe6cf4197..9720a2a0d6 100644 --- a/gtk/gui_utils.h +++ b/gtk/gui_utils.h @@ -295,7 +295,7 @@ extern GtkWidget *xpm_to_widget(const char ** xpm); * @param xpm the character array containing the picture * @return a newly created GtkWidget showing the picture */ -extern GtkWidget *xpm_to_widget_from_parent(GtkWidget *parent, const char ** xpm); +/*extern GtkWidget *xpm_to_widget_from_parent(GtkWidget *parent, const char ** xpm);*/ /** Convert an pixbuf data to a GtkWidget * diff --git a/gtk/main_welcome.c b/gtk/main_welcome.c index 68dfc9eb19..db77ff3320 100644 --- a/gtk/main_welcome.c +++ b/gtk/main_welcome.c @@ -332,7 +332,8 @@ welcome_header_new(void) item_hb = gtk_hbox_new(FALSE, 0); gtk_box_pack_start(GTK_BOX(item_vb), item_hb, FALSE, FALSE, 10); - icon = xpm_to_widget_from_parent(top_level, wssplash_xpm); + /*icon = xpm_to_widget_from_parent(top_level, wssplash_xpm);*/ + icon = xpm_to_widget(wssplash_xpm); gtk_box_pack_start(GTK_BOX(item_hb), icon, FALSE, FALSE, 10); header_lb = gtk_label_new(NULL); |