clock: move into its own widget

1 files changed, 12 insertions, 6 deletions

diff --git a/shell/clock.h b/shell/clock.h
index 4493b88..3de21ea 100644
--- a/shell/clock.h
+++ b/shell/clock.h
@@ -1,7 +1,7 @@
 /*
- * Copyright (C) 2013 Collabora Ltd.
+ * Copyright (C) 2014 Collabora Ltd.
  *
- * Author: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
+ * Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
  */
 
 #ifndef __WESTON_GTK_CLOCK_H__
@@ -9,6 +9,8 @@
 
 #include <gtk/gtk.h>
 
+#include "panel.h"
+
 #define WESTON_GTK_CLOCK_TYPE                 (weston_gtk_clock_get_type ())
 #define WESTON_GTK_CLOCK(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), WESTON_GTK_CLOCK_TYPE, WestonGtkClock))
 #define WESTON_GTK_CLOCK_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), WESTON_GTK_CLOCK_TYPE, WestonGtkClockClass))
@@ -22,17 +24,21 @@ typedef struct WestonGtkClockPrivate WestonGtkClockPrivate;
 
 struct WestonGtkClock
 {
-  GtkLabel parent;
+  GtkWindow parent;
 
   WestonGtkClockPrivate *priv;
 };
 
 struct WestonGtkClockClass
 {
-  GtkLabelClass parent_class;
+  GtkWindowClass parent_class;
 };
 
-GType      weston_gtk_clock_get_type       (void) G_GNUC_CONST;
-GtkWidget *weston_gtk_clock_new            (void);
+#define WESTON_GTK_CLOCK_WIDTH (WESTON_GTK_PANEL_WIDTH * 2.6)
+#define WESTON_GTK_CLOCK_HEIGHT (WESTON_GTK_PANEL_WIDTH * 2)
+
+GType weston_gtk_clock_get_type (void) G_GNUC_CONST;
+
+GtkWidget * weston_gtk_clock_new (void);
 
 #endif /* __WESTON_GTK_CLOCK_H__ */