1 files changed, 8 insertions, 31 deletions

diff --git a/src/extantz/extantz.h b/src/extantz/extantz.h
index a4001c7..046f099 100644
--- a/src/extantz/extantz.h
+++ b/src/extantz/extantz.h
@@ -10,6 +10,7 @@
 #include <Evas_GL.h>
 #include <EPhysics.h>
 #include "extantzCamera.h"
+#include "winFang.h"
 
 
 #ifdef GL_GLES
@@ -123,27 +124,7 @@ typedef struct
     short       x, y, z;
 } ezLandmark;
 
-typedef struct _fangWin
-{
-  Evas_Object   *win;
-  Eina_Clist    widgets;
-  void          *data;
-  Evas_Smart_Cb on_del;
-} fangWin;
 
-typedef struct _Widget
-{
-  char          magic[8];
-  Evas_Object   *obj;
-  Eina_Clist    node;
-  char          *label, *look, *action, *help;
-  // foreground / background colour
-  // thing
-  // types {}
-  // skangCoord x, y, w, h
-  void          *data;
-  Evas_Smart_Cb on_del;
-} Widget;
 
 typedef struct _Scene_Data
 {
@@ -244,7 +225,7 @@ typedef struct _globals
 
   Eina_Clist    windows;
 
-  fangWin       *files;
+  winFang       *files;
 } globals;
 
 extern globals ourGlobals;
@@ -265,22 +246,18 @@ EAPI void drawIrr_end(globals *ourGlobals);
 EAPI void finishIrr(globals *ourGlobals);
 #endif
 
+void overlay_add(globals *ourGlobals);
+
 EAPI void Evas_3D_Demo_add(globals *ourGlobals);
 Eina_Bool _animate_scene(globals *ourGlobals);
 void Evas_3D_Demo_fini(globals *ourGlobals);
 
 void cameraAdd(globals *ourGlobals, Evas_Object *win);
 
-fangWin *fang_win_add(globals *ourGlobals);
-void fang_win_complete(globals *ourGlobals, fangWin *win, int x, int y, int w, int h);
-void fang_win_del(globals *ourGlobals, fangWin *win);
-void overlay_add(globals *ourGlobals);
-Widget *widgetAdd(fangWin *win, const Eo_Class *klass, Evas_Object *parent, char *title);
-
-fangWin *chat_add(globals *ourGlobals);
-fangWin *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool save);
-void     filesShow(fangWin *me, Evas_Smart_Cb func, void *data);
-fangWin *woMan_add(globals *ourGlobals);
+winFang *chat_add(globals *ourGlobals);
+winFang *filesAdd(globals *ourGlobals, char *path, Eina_Bool multi, Eina_Bool save);
+void     filesShow(winFang *me, Evas_Smart_Cb func, void *data);
+winFang *woMan_add(globals *ourGlobals);
 
 
 #ifdef __cplusplus