Commit 432c4ec1 authored by Laurent Aimar's avatar Laurent Aimar

* gtk: fixed 'cannot find file.xpm'.

 * wxwindows: compilation fix for older wxwindows header.
parent 17bc2d6e
......@@ -2,7 +2,7 @@
* mms.h: MMS access plug-in
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: mms.h,v 1.6 2002/12/06 13:05:22 sam Exp $
* $Id: mms.h,v 1.7 2003/01/28 14:00:49 fenrir Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -36,7 +36,7 @@ typedef struct url_s
char *psz_private;
} url_t;
#define FREE( p ) if( p ) free( p )
#define FREE( p ) if( p ) { free( p ); (p ) = NULL; }
#define MMS_PROTO_AUTO 0
......
......@@ -511,7 +511,6 @@
<last_modification_time>Mon, 08 Jul 2002 16:14:58 GMT</last_modification_time>
</signal>
<label>File</label>
<icon>file.xpm</icon>
</widget>
<widget>
......
......@@ -73,7 +73,6 @@ create_intf_window (void)
GtkWidget *menubar_about;
GtkWidget *toolbar_handlebox;
GtkWidget *toolbar;
GtkWidget *tmp_toolbar_icon;
GtkWidget *toolbar_open;
GtkWidget *toolbar_disc;
GtkWidget *toolbar_network;
......@@ -600,13 +599,12 @@ create_intf_window (void)
gtk_toolbar_set_space_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_SPACE_LINE);
gtk_toolbar_set_button_relief (GTK_TOOLBAR (toolbar), GTK_RELIEF_NONE);
tmp_toolbar_icon = create_pixmap (intf_window, "file.xpm");
toolbar_open = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar),
GTK_TOOLBAR_CHILD_BUTTON,
NULL,
_("File"),
_("Open a file"), NULL,
tmp_toolbar_icon, NULL, NULL);
NULL, NULL, NULL);
gtk_widget_ref (toolbar_open);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "toolbar_open", toolbar_open,
(GtkDestroyNotify) gtk_widget_unref);
......
......@@ -2,7 +2,7 @@
* open.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: open.cpp,v 1.2 2003/01/26 10:36:10 gbazin Exp $
* $Id: open.cpp,v 1.3 2003/01/28 14:00:49 fenrir Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -50,6 +50,10 @@
#include "wxwindows.h"
#ifndef wxRB_SINGLE
#define wxRB_SINGLE 0
#endif
/*****************************************************************************
* Event Table.
*****************************************************************************/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment