changeset 35772:3fec1d4b2736

Relocate uiMainEvent() prototype.
author ib
date Fri, 25 Jan 2013 10:28:38 +0000
parents 07057fd75c51
children c688b0dcbe66
files gui/dialog/fileselect.c gui/dialog/menu.c gui/dialog/url.c gui/interface.c gui/ui/actions.h gui/ui/menu.c gui/ui/ui.h
diffstat 7 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gui/dialog/fileselect.c	Fri Jan 25 10:18:13 2013 +0000
+++ b/gui/dialog/fileselect.c	Fri Jan 25 10:28:38 2013 +0000
@@ -24,6 +24,7 @@
 #include <unistd.h>
 
 #include "config.h"
+#include "gui/ui/actions.h"
 #include "gui/ui/ui.h"
 
 #include "pixmaps/up.xpm"
--- a/gui/dialog/menu.c	Fri Jan 25 10:18:13 2013 +0000
+++ b/gui/dialog/menu.c	Fri Jan 25 10:28:38 2013 +0000
@@ -28,7 +28,7 @@
 
 #include "menu.h"
 #include "dialog.h"
-#include "gui/ui/ui.h"
+#include "gui/ui/actions.h"
 #include "gui/app/app.h"
 #include "gui/app/gui.h"
 #include "gui/interface.h"
--- a/gui/dialog/url.c	Fri Jan 25 10:18:13 2013 +0000
+++ b/gui/dialog/url.c	Fri Jan 25 10:28:38 2013 +0000
@@ -30,7 +30,7 @@
 #include "tools.h"
 #include "gui/interface.h"
 #include "gui/app/app.h"
-#include "gui/ui/ui.h"
+#include "gui/ui/actions.h"
 #include "dialog.h"
 #include "gui/util/list.h"
 #include "gui/util/string.h"
--- a/gui/interface.c	Fri Jan 25 10:18:13 2013 +0000
+++ b/gui/interface.c	Fri Jan 25 10:28:38 2013 +0000
@@ -26,6 +26,7 @@
 #include "app/gui.h"
 #include "dialog/dialog.h"
 #include "skin/skin.h"
+#include "ui/actions.h"
 #include "ui/ui.h"
 #include "util/list.h"
 #include "util/mem.h"
--- a/gui/ui/actions.h	Fri Jan 25 10:18:13 2013 +0000
+++ b/gui/ui/actions.h	Fri Jan 25 10:28:38 2013 +0000
@@ -22,6 +22,7 @@
 void uiAbsSeek(float sec);
 void uiChangeSkin(char *name);
 void uiCurr(void);
+void uiMainEvent(int msg, float param);
 void uiFullScreen(void);
 void uiNext(void);
 void uiPause(void);
--- a/gui/ui/menu.c	Fri Jan 25 10:18:13 2013 +0000
+++ b/gui/ui/menu.c	Fri Jan 25 10:28:38 2013 +0000
@@ -27,6 +27,7 @@
 #include "mp_msg.h"
 #include "gui/app/app.h"
 #include "gui/app/gui.h"
+#include "actions.h"
 #include "ui.h"
 
 #include "gui/dialog/dialog.h"
--- a/gui/ui/ui.h	Fri Jan 25 10:18:13 2013 +0000
+++ b/gui/ui/ui.h	Fri Jan 25 10:28:38 2013 +0000
@@ -30,7 +30,6 @@
 extern int             sx, sy;
 
 void uiMainDraw( void );
-void uiMainEvent( int msg, float param );
 void uiMainMouse( int Button, int X, int Y, int RX, int RY );
 void uiMainKey( int KeyCode, int Type, int Key );
 void uiMainDND(int num, char** files);