Mercurial > mplayer.hg
changeset 36029:49be954ad61a
Move variable declarations and definitions where they belong.
| author | ib |
|---|---|
| date | Sun, 31 Mar 2013 22:36:42 +0000 |
| parents | 8c62c9931075 |
| children | 7efddc4d726f |
| files | gui/dialog/dialog.c gui/dialog/dialog.h gui/dialog/menu.c gui/dialog/menu.h |
| diffstat | 4 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/dialog/dialog.c Sun Mar 31 22:28:22 2013 +0000 +++ b/gui/dialog/dialog.c Sun Mar 31 22:36:42 2013 +0000 @@ -54,8 +54,6 @@ GtkWidget *WarningPixmap; GtkWidget *ErrorPixmap; -int gtkPopupMenu; -int gtkPopupMenuParam; static int gtkInitialized; #include "skinbrowser.h"
--- a/gui/dialog/dialog.h Sun Mar 31 22:28:22 2013 +0000 +++ b/gui/dialog/dialog.h Sun Mar 31 22:36:42 2013 +0000 @@ -34,9 +34,6 @@ extern GtkWidget *SkinList; extern GtkWidget *gtkMessageBoxText; -extern int gtkPopupMenu; -extern int gtkPopupMenuParam; - extern char *sbMPlayerDirInHome; extern char *sbMPlayerPrefixDir;
--- a/gui/dialog/menu.c Sun Mar 31 22:28:22 2013 +0000 +++ b/gui/dialog/menu.c Sun Mar 31 22:36:42 2013 +0000 @@ -86,6 +86,9 @@ #endif #include "pixmaps/empty1px.xpm" +int gtkPopupMenu; +int gtkPopupMenuParam; + static void ActivateMenuItem( int Item ) { // fprintf( stderr,"[menu] item: %d.%d\n",Item&0xffff,Item>>16 );
--- a/gui/dialog/menu.h Sun Mar 31 22:28:22 2013 +0000 +++ b/gui/dialog/menu.h Sun Mar 31 22:36:42 2013 +0000 @@ -21,6 +21,9 @@ #include <gtk/gtk.h> +extern int gtkPopupMenu; +extern int gtkPopupMenuParam; + GtkWidget * AddMenuItem( GtkWidget *window1, const char * immagine_xpm, GtkWidget * SubMenu, const char * label, int Number ); GtkWidget * AddSubMenu( GtkWidget *window1, const char * immagine_xpm, GtkWidget * Menu, const char * label ); GtkWidget * AddSeparator( GtkWidget * Menu );