osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Anders Broman 2011-08-15 20:56:00 +00:00
parent 0e4d01e183
commit 5ab5d4e3b3
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/about_dlg.c
View File

@ -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);

5
gtk/gui_utils.c
View File

@ -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) {

2
gtk/gui_utils.h
View File

@ -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
*

3
gtk/main_welcome.c
View File

@ -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);