WIP: refactor ModestWindow and create ModestShell

diff --git a/src/widgets/modest-shell.h b/src/widgets/modest-shell.h
new file mode 100644 (file)
index 0000000..514b6e5
--- /dev/null
+++ b/src/widgets/modest-shell.h
@@ -0,0 +1,82 @@
+/* Copyright (c) 2006, Nokia Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of the Nokia Corporation nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __MODEST_SHELL_H__
+#define __MODEST_SHELL_H__
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /*HAVE_CONFIG_H*/
+
+#include <glib-object.h>
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+ 
+typedef GtkWindow      ModestShellParent;
+typedef GtkWindowClass ModestShellParentClass;
+
+/* convenience macros */
+#define MODEST_TYPE_SHELL             (modest_shell_get_type())
+#define MODEST_SHELL(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj),MODEST_TYPE_SHELL,ModestShell))
+#define MODEST_SHELL_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass),MODEST_TYPE_SHELL,GObject))
+#define MODEST_IS_SHELL(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj),MODEST_TYPE_SHELL))
+#define MODEST_IS_SHELL_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass),MODEST_TYPE_SHELL))
+#define MODEST_SHELL_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj),MODEST_TYPE_SHELL,ModestShellClass))
+
+typedef struct _ModestShell      ModestShell;
+typedef struct _ModestShellClass ModestShellClass;
+
+struct _ModestShell {
+        ModestShellParent parent;
+};
+
+struct _ModestShellClass {
+       ModestShellParentClass parent_class;
+
+       /* virtual methods */
+       void (*add_window_func) (ModestShell *self, ModestShellWindow *window);
+};
+
+/**
+ * modest_shell_get_type:
+ *
+ * get the #GType for #ModestShell
+ * 
+ * Returns: the type
+ */    
+GType        modest_shell_get_type    (void) G_GNUC_CONST;
+
+
+void modest_shell_add_window (ModestShell *self, ModestShellWindow *window);
+
+
+G_END_DECLS
+
+#endif /* __MODEST_WINDOW_H__ */

diff --git a/src/widgets/modest-window.h b/src/widgets/modest-window.h
index 3002d8a..6ea8d7e 100644 (file)
--- a/src/widgets/modest-window.h
+++ b/src/widgets/modest-window.h
@@ -46,8 +46,8 @@ G_BEGIN_DECLS
  * this way is probably the easiest to maintain
  */
 #ifdef MODEST_TOOLKIT_GTK
-typedef GtkWindow      ModestWindowParent;
-typedef GtkWindowClass ModestWindowParentClass;
+typedef GtkVBox      ModestWindowParent;
+typedef GtkVBoxClass ModestWindowParentClass;
 #else
 #ifdef MODEST_TOOLKIT_HILDON2
 #include <hildon/hildon-stackable-window.h>