summaryrefslogtreecommitdiffstats
path: root/src/window.h
diff options
context:
space:
mode:
authorPatrick McDermott <pj@pehjota.net>2017-10-22 19:09:22 (EDT)
committer Patrick McDermott <pj@pehjota.net>2017-10-22 19:09:22 (EDT)
commit8fc032f2f64f4b7eb022adb0b1255a5a68df109f (patch)
tree31094e678eba9fc4a828ddb8a2948d105ff898bc /src/window.h
parent927c4ea37ca967e61831164bb4b7ea33e28e0d9d (diff)
parenta0b9288a5e6fa943a6f2b7f418a12343649ed454 (diff)
downloadmarquee-8fc032f2f64f4b7eb022adb0b1255a5a68df109f.zip
marquee-8fc032f2f64f4b7eb022adb0b1255a5a68df109f.tar.gz
marquee-8fc032f2f64f4b7eb022adb0b1255a5a68df109f.tar.bz2
Merge branch 'gobjectification'
Diffstat (limited to 'src/window.h')
-rw-r--r--src/window.h40
1 files changed, 26 insertions, 14 deletions
diff --git a/src/window.h b/src/window.h
index 94c526b..3e82263 100644
--- a/src/window.h
+++ b/src/window.h
@@ -19,25 +19,35 @@
* along with Marquee. If not, see <http://www.gnu.org/licenses/>.
*/
-typedef struct MqWindow MqWindow;
-
#ifndef MQ_WINDOW_H
#define MQ_WINDOW_H
+typedef struct _MqWindow MqWindow;
+typedef struct _MqWindowClass MqWindowClass;
+
+#include <glib.h>
#include <gtk/gtk.h>
#include "application.h"
-#include "tab.h"
-
-struct MqWindow {
- MqApplication *application;
- MqConfig *config;
- GtkWidget *window;
- GtkWidget *notebook;
- MqTab *root_tab;
- guint current_tab;
- gboolean fullscreen;
-};
+#include "config.h"
+#include "tab-page.h"
+
+G_BEGIN_DECLS
+
+#define MQ_TYPE_WINDOW (mq_window_get_type())
+#define MQ_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
+ MQ_TYPE_WINDOW, MqWindow))
+#define MQ_IS_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+ MQ_TYPE_WINDOW))
+#define MQ_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
+ MQ_TYPE_WINDOW, MqWindowClass))
+#define MQ_IS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), \
+ MQ_TYPE_WINDOW))
+#define MQ_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), \
+ MQ_TYPE_WINDOW, MqWindowClass))
+
+GType
+mq_window_get_type(void);
MqWindow *
mq_window_new(MqApplication *application, const gchar **uris);
@@ -77,4 +87,6 @@ mq_window_begin_scrolling_tab_labels(MqWindow *window);
void
mq_window_end_scrolling_tab_labels(MqWindow *window);
-#endif
+G_END_DECLS
+
+#endif /* MQ_WINDOW_H */