Merge branch 'gtk3' of ssh://git.stderr.nl/projects/chimara/chimara into gtk3

[projects/chimara/chimara.git] / libchimara / window.h

diff --git a/libchimara/window.h b/libchimara/window.h
index 72ee91b529c3e51ebbab3b756373c1c1fbaa678e..aa3250274a5e5e3609e12252457b587f7a61a0cf 100644 (file)
--- a/libchimara/window.h
+++ b/libchimara/window.h
@@ -42,6 +42,10 @@ struct glk_window_struct
        /* "frame" is the widget that is the child of the ChimaraGlk container, such 
        as a scroll window. It may be the same as "widget". */
        GtkWidget *frame;
+       /* In text buffer windows, the scrolled window and the pager are extra
+       widgets that are neither "widget" nor "frame" */
+       GtkWidget *scrolledwindow;
+       GtkWidget *pager;
        /* Width and height of the window's size units, in pixels */
        int unit_width;
        int unit_height;
@@ -82,7 +86,6 @@ struct glk_window_struct
        gulong shutdown_keypress_handler;
        gulong button_press_event_handler;
        gulong size_allocate_handler;
-       gulong pager_expose_handler;
        gulong pager_keypress_handler;
        gulong pager_adjustment_handler;
        /* Window buffer */
@@ -98,7 +101,6 @@ struct glk_window_struct
        cairo_surface_t *backing_store;
        /* Pager (textbuffer only) */
        gboolean currently_paging;
-       PangoLayout *pager_layout;
 };
 
 #endif