* ncurses compilation fix by Michael Mondragon <mammon@lokmail.net>.

[vlc] / plugins / gtk / gtk_menu.c

diff --git a/plugins/gtk/gtk_menu.c b/plugins/gtk/gtk_menu.c
index 50b7eade9f88d3b677d026a03b382472b4f1297f..8ff0d3b6c04194ec814e8cd202d8e821ca480cb4 100644 (file)
--- a/plugins/gtk/gtk_menu.c
+++ b/plugins/gtk/gtk_menu.c
@@ -2,7 +2,7 @@
  * gtk_menu.c : functions to handle menu items.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_menu.c,v 1.10 2001/06/14 01:49:44 sam Exp $
+ * $Id: gtk_menu.c,v 1.13 2001/07/25 03:12:33 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -29,7 +29,15 @@
 #include <sys/types.h>                                              /* off_t */
 #include <stdlib.h>
 
-#include <gtk/gtk.h>
+#define gtk 12
+#define gnome 42
+#if ( MODULE_NAME == gtk )
+#   include <gtk/gtk.h>
+#elif ( MODULE_NAME == gnome )
+#   include <gnome.h>
+#endif
+#undef gtk
+#undef gnome
 
 #include <string.h>
 
@@ -59,12 +67,6 @@
 
 #include "modules_export.h"
 
-#ifdef WIN32
-#ifndef snprintf
-#define snprintf _snprintf
-#endif
-#endif
-
 /*
  * Local Prototypes
  */
@@ -838,6 +840,7 @@ gint GtkSetupMenus( intf_thread_t * p_intf )
 
         p_menubar_menu = GTK_WIDGET( gtk_object_get_data( GTK_OBJECT( 
                              p_intf->p_sys->p_window ), "menubar_chapter" ) );
+
         GtkRadioMenu( p_intf, p_menubar_menu, NULL, "Chapter",
                         p_intf->p_input->stream.p_selected_area->i_part_nb,
                         p_intf->p_input->stream.p_selected_area->i_part,