1 files changed, 12 insertions, 60 deletions

diff --git a/Gui/mplayer/widgets.h b/Gui/mplayer/widgets.h
index 0d55f1168c..ea632a8123 100644
--- a/Gui/mplayer/widgets.h
+++ b/Gui/mplayer/widgets.h
@@ -2,12 +2,16 @@
 #ifndef __MY_WIDGET
 #define __MY_WIDGET
 
+#include <stdio.h>
+#include <stdlib.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include "../../config.h"
 #include "../../linux/shmem.h"
 #include "play.h"
+#include "mplayer.h"
+#include "../interface.h"
 
 #define GTK_MB_SIMPLE 0
 #define GTK_MB_MODAL 1
@@ -15,59 +19,6 @@
 #define GTK_MB_ERROR 4
 #define GTK_MB_WARNING 8
 
-typedef struct
-{
- char dir[ 2048 ];
- char filename[ 2048 ];
- char subtitlename[ 4096 ];
- char otherfilename[ 4096 ];
-} gtkFileSelectorStruct;
-
-typedef struct
-{
- int  sx;
- int  sy;
- int  tsx;
- int  tsy;
- int  type;
- char str[512];
-} gtkMessageBoxStruct;
-
-typedef struct
-{
- char name[128];
-} gtkSkinStruct;
-
-typedef struct
-{
- int window;
-} gtkVisibleStruct;
-
-typedef struct
-{
- int i;
-} gtkOptionsStruct;
-
-typedef struct
-{
- int                   message;
- gtkFileSelectorStruct fs;
- gtkMessageBoxStruct   mb;
- gtkSkinStruct         sb;
- gtkVisibleStruct      vs;
- gtkOptionsStruct      op;
-
-#ifdef USE_DVDREAD 
- mplDVDStruct          DVD;
-#endif
- 
- int		       popupmenu;
- int		       popupmenuparam;
- int		       visiblepopupmenu;
-} gtkCommStruct;
-
-extern gtkCommStruct * gtkShMem;
-
 extern GtkWidget     * SkinBrowser;
 extern GtkWidget     * PlayList;
 extern GtkWidget     * FileSelect;
@@ -83,12 +34,8 @@ extern GtkWidget     * ErrorPixmap;
 extern GtkWidget     * SkinList;
 extern GtkWidget     * gtkMessageBoxText;
 
-extern int             gtkVisibleSkinBrowser;
-extern int             gtkVisiblePlayList;
-extern int             gtkVisibleFileSelect;
-extern int             gtkVisibleMessageBox;
-extern int             gtkVisibleAboutBox;
-extern int             gtkVisibleOptions;
+extern int             gtkPopupMenu;
+extern int             gtkPopupMenuParam;
 
 extern char          * sbMPlayerDirInHome;
 extern char          * sbMPlayerPrefixDir;
@@ -97,10 +44,15 @@ extern void widgetsCreate( void );
 
 extern void gtkInit( int argc,char* argv[], char *envp[] );
 extern void gtkDone( void );
-extern void gtkMessageBox( int type,gchar * str );
+
 extern int  gtkFillSkinList( gchar * dir );
 extern void gtkClearList( GtkWidget * list );
 extern void gtkSetDefaultToCList( GtkWidget * list,char * item );
 extern int  gtkFindCList( GtkWidget * list,char * item );
 
+extern void gtkEventHandling( void );
+
+extern void gtkShow( int type,char * param );
+extern void gtkMessageBox( int type,gchar * str );
+
 #endif