move framebuffer port to framebuffer toolkit

svn path=/trunk/netsurf/; revision=6760

1 files changed, 9 insertions, 18 deletions

diff --git a/framebuffer/fb_gui.h b/framebuffer/fb_gui.h
index 138846084..e064ede56 100644
--- a/framebuffer/fb_gui.h
+++ b/framebuffer/fb_gui.h
@@ -40,26 +40,17 @@ typedef struct framebuffer_s {
 } framebuffer_t;
 
 struct gui_window {
-	struct gui_window *next, *prev; /**< List of windows */
-	struct browser_window *bw; /**< The browser window connected to this gui window */
-
-	int x;
-	int y;
-	int width; /**< Window width */
-	int height; /**< window height */
-	int scrollx, scrolly; /**< scroll offsets. */
-
-	/* Pending window redraw state. */
-	bool redraw_required; /**< flag indicating the foreground loop
-			       * needs to redraw the window.
-			       */
-	bbox_t redraw_box; /**< Area requiring redraw. */
-	bool pan_required; /**< flag indicating the foreground loop
-			       * needs to pan the window.
-			       */
-	int panx, pany; /**< Panning required. */
+        struct browser_window *bw;
+        struct fbtk_widget_s *window;
+        struct fbtk_widget_s *url;
+        struct fbtk_widget_s *status;
+        struct fbtk_widget_s *throbber;
+        struct fbtk_widget_s *hscroll;
+        struct fbtk_widget_s *browser;
+        int throbber_index;
 };
 
+
 extern framebuffer_t *framebuffer;
 extern struct gui_window *window_list;