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

 * wxwindows: compilation fix for older wxwindows header.

diff --git a/modules/access/mms/mms.h b/modules/access/mms/mms.h
index e55ebe72b8c0e516701d0b84c436a76f426771c0..fb431be9805f7e1b1c087eef1fb8daa6bc72c2bd 100644 (file)
--- a/modules/access/mms/mms.h
+++ b/modules/access/mms/mms.h
@@ -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

diff --git a/modules/gui/gtk/gtk.glade b/modules/gui/gtk/gtk.glade
index b77b0b8ed9f750ca912104740a13e25c76986c6b..f2db10b2123d9c37f641769748675116f74eac20 100644 (file)
--- a/modules/gui/gtk/gtk.glade
+++ b/modules/gui/gtk/gtk.glade
@@ -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>

diff --git a/modules/gui/gtk/gtk_interface.c b/modules/gui/gtk/gtk_interface.c
index 1141b132e106b2eaa1145180a416be0564338584..b65a6face1257e012db224f6e32f727991e17661 100644 (file)
--- a/modules/gui/gtk/gtk_interface.c
+++ b/modules/gui/gtk/gtk_interface.c
@@ -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);

diff --git a/modules/gui/wxwindows/open.cpp b/modules/gui/wxwindows/open.cpp
index 9d799c2b9753a4a30c39e68a7cb5d601b5d23562..fa8a9fe8bde3a680b91573fd81ca79323aa9fd17 100644 (file)
--- a/modules/gui/wxwindows/open.cpp
+++ b/modules/gui/wxwindows/open.cpp
@@ -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.
  *****************************************************************************/