#
# Makefile.am
-# Time-stamp: <2006-11-28 17:32:52 (djcb)>
+# Time-stamp: <2007-01-09 17:54:07 (djcb)>
INCLUDES=\
$(MODEST_GSTUFF_CFLAGS) \
-I ${top_srcdir}/src/$(MODEST_PLATFORM) \
-I ${top_srcdir}/src \
-DPREFIX=\"@prefix@\" \
+ -DMODEST_PLATFORM_ID=$(MODEST_PLATFORM_ID) \
-DPIXMAP_PREFIX=\"${datadir}/pixmaps/modest/\" \
-Wall
modest-toolbar.c \
modest-toolbar.h \
modest-combo-box.c \
- modest-combo-box.h
+ modest-combo-box.h \
+ modest-window.h \
+ modest-main-window.h \
+ modest-edit-msg-window.h
LDADD = \
$(MODEST_GSTUFF_LIBS) \
-/* Copyright (c) 2006, Nokia Corporation
+/* Copyright (c) 2006,2007 Nokia Corporation
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include <gtk/gtk.h>
#include <tny-msg.h>
-#include "modest-conf.h"
-#include "modest-widget-factory.h"
+#include <widgets/modest-window.h>
+#include <modest-widget-factory.h>
G_BEGIN_DECLS
/* convenience macros */
#define MODEST_TYPE_EDIT_MSG_WINDOW (modest_edit_msg_window_get_type())
#define MODEST_EDIT_MSG_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),MODEST_TYPE_EDIT_MSG_WINDOW,ModestEditMsgWindow))
-#define MODEST_EDIT_MSG_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),MODEST_TYPE_EDIT_MSG_WINDOW,GtkWindow))
+#define MODEST_EDIT_MSG_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),MODEST_TYPE_EDIT_MSG_WINDOW,ModestWindow))
#define MODEST_IS_EDIT_MSG_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),MODEST_TYPE_EDIT_MSG_WINDOW))
#define MODEST_IS_EDIT_MSG_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),MODEST_TYPE_EDIT_MSG_WINDOW))
#define MODEST_EDIT_MSG_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),MODEST_TYPE_EDIT_MSG_WINDOW,ModestEditMsgWindowClass))
typedef struct _ModestEditMsgWindowClass ModestEditMsgWindowClass;
struct _ModestEditMsgWindow {
- GtkWindow parent;
+ ModestWindow parent;
/* insert public members, if any */
};
struct _ModestEditMsgWindowClass {
- GtkWindowClass parent_class;
+ ModestWindowClass parent_class;
/* insert signal callback declarations, eg. */
/* void (* my_event) (ModestEditMsgWindow* obj); */
};
-/* modest-main-window.h */
-/* insert (c)/licensing information) */
+/* Copyright (c) 2006,2007 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_MAIN_WINDOW_H__
#define __MODEST_MAIN_WINDOW_H__
-#include <gtk/gtkwindow.h>
-#include <modest-widget-factory.h>
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif /*HAVE_CONFIG_H*/
+#include <modest-widget-factory.h>
+#include <widgets/modest-window.h>
+
G_BEGIN_DECLS
/* convenience macros */
#define MODEST_TYPE_MAIN_WINDOW (modest_main_window_get_type())
#define MODEST_MAIN_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),MODEST_TYPE_MAIN_WINDOW,ModestMainWindow))
-#define MODEST_MAIN_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),MODEST_TYPE_MAIN_WINDOW,GtkWindow))
+#define MODEST_MAIN_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),MODEST_TYPE_MAIN_WINDOW,ModestWindow))
+
#define MODEST_IS_MAIN_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),MODEST_TYPE_MAIN_WINDOW))
#define MODEST_IS_MAIN_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),MODEST_TYPE_MAIN_WINDOW))
#define MODEST_MAIN_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),MODEST_TYPE_MAIN_WINDOW,ModestMainWindowClass))
typedef struct _ModestMainWindowClass ModestMainWindowClass;
struct _ModestMainWindow {
- GtkWindow parent;
+ ModestWindow parent;
/* insert public members, if any */
};
struct _ModestMainWindowClass {
- GtkWindowClass parent_class;
+ ModestWindowClass parent_class;
/* insert signal callback declarations, eg. */
/* void (* my_event) (ModestMainWindow* obj); */
};
--- /dev/null
+/* 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_WINDOW_H__
+#define __MODEST_WINDOW_H__
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /*HAVE_CONFIG_H*/
+
+/* admittedly, the ifdefs for gtk and maemo are rather ugly; still this way
+ * is probably the easiest to maintain*/
+#if MODEST_PLATFORM_ID==1 /* gtk */
+#include <gtk/gtkwindow.h>
+typedef GtkWindow ModestWindow;
+typedef GtkWindowClass ModestWindowClass;
+#elif MODEST_PLATFORM_ID==2 /* hildon */
+#include <hildon-widgets/hildon-window.h>
+typedef HildonWindow ModestWindow;
+typedef HildonWindowClass ModestWindowClass;
+#endif /*MODEST_PLATFORM_ID*/
+/************************************************/
+
+#endif /* MODEST_WINDOW_H__ */
projects / modest / commitdiff