Hook TildaTerminal and TildaWindow together

[tilda-gobject.git] / tilda-terminal.h

diff --git a/tilda-terminal.h b/tilda-terminal.h
index 6661f26..80b1bef 100644 (file)
--- a/tilda-terminal.h
+++ b/tilda-terminal.h
@@ -1,10 +1,13 @@
 #ifndef TILDA_TERMINAL_H
 #define TILDA_TERMINAL_H
 
-#include <glib-object.h>
+#include <glib.h>
+#include <gtk/gtk.h>
+#include <vte/vte.h>
+
 
 #define TILDA_TYPE_TERMINAL                            (tilda_terminal_get_type())
-#define TILDA_TERMINAL(obj)                            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TILDA_TYPE_TERMINAL))
+#define TILDA_TERMINAL(obj)                            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TILDA_TYPE_TERMINAL, TildaTerminal))
 #define TILDA_TERMINAL_CLASS(klass)            (G_TYPE_CHECK_CLASS_CAST ((klass), TILDA_TYPE_TERMINAL, TildaTerminalClass))
 #define TILDA_IS_TERMINAL(obj)                 (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TILDA_TYPE_TERMINAL))
 #define TILDA_IS_TERMINAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TILDA_TYPE_TERMINAL))
@@ -20,7 +23,9 @@ struct _TildaTerminal {
        /* Instance Members */
        // FIXME: ADD THESE BACK
        // TildaWindow *tw;
-       // VteTerminal *vte_term;
+       GtkWidget *vte_term;
+       GtkWidget *scrollbar;
+       GtkWidget *hbox;
        gint number;
 
        gchar *background_image;
@@ -46,9 +51,8 @@ struct _TildaTerminal {
        // TODO: gint colorscheme; the code can work around the need for
        // TODO: this value. Just check if the back and fore colors match
        // TODO: any pre-defined colorschemes exactly in the GUI.
-       // FIXME: ADD THESE BACK
-       //GdkColor background_color;
-       //GdkColor foreground_color;
+       GdkColor background_color;
+       GdkColor foreground_color;
        // TODO: all other colors supported by VTE
 
        gboolean scroll_background;