From 96e1a73bf56f41cfe52d4bf6419fccecc067ad79 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Tue, 9 Jan 2007 15:56:27 +0000 Subject: [PATCH] * all: - use GtkWindow for gtk, HildonWindow for maemo - add header files to Makefile.am, so make dist will work pmo-trunk-r592 --- src/widgets/Makefile.am | 8 ++++-- src/widgets/modest-edit-msg-window.h | 12 ++++---- src/widgets/modest-main-window.h | 44 +++++++++++++++++++++++------ src/widgets/modest-window.h | 51 ++++++++++++++++++++++++++++++++++ 4 files changed, 99 insertions(+), 16 deletions(-) create mode 100644 src/widgets/modest-window.h diff --git a/src/widgets/Makefile.am b/src/widgets/Makefile.am index 8746c7d..c53f67c 100644 --- a/src/widgets/Makefile.am +++ b/src/widgets/Makefile.am @@ -1,6 +1,6 @@ # # Makefile.am -# Time-stamp: <2006-11-28 17:32:52 (djcb)> +# Time-stamp: <2007-01-09 17:54:07 (djcb)> INCLUDES=\ $(MODEST_GSTUFF_CFLAGS) \ @@ -9,6 +9,7 @@ INCLUDES=\ -I ${top_srcdir}/src/$(MODEST_PLATFORM) \ -I ${top_srcdir}/src \ -DPREFIX=\"@prefix@\" \ + -DMODEST_PLATFORM_ID=$(MODEST_PLATFORM_ID) \ -DPIXMAP_PREFIX=\"${datadir}/pixmaps/modest/\" \ -Wall @@ -28,7 +29,10 @@ libmodest_widgets_la_SOURCES= \ 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) \ diff --git a/src/widgets/modest-edit-msg-window.h b/src/widgets/modest-edit-msg-window.h index 63cf77e..93d9094 100644 --- a/src/widgets/modest-edit-msg-window.h +++ b/src/widgets/modest-edit-msg-window.h @@ -1,4 +1,4 @@ -/* 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 @@ -32,15 +32,15 @@ #include #include -#include "modest-conf.h" -#include "modest-widget-factory.h" +#include +#include 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)) @@ -49,12 +49,12 @@ typedef struct _ModestEditMsgWindow ModestEditMsgWindow; 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); */ }; diff --git a/src/widgets/modest-main-window.h b/src/widgets/modest-main-window.h index 120da4a..7cbe801 100644 --- a/src/widgets/modest-main-window.h +++ b/src/widgets/modest-main-window.h @@ -1,22 +1,50 @@ -/* 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 -#include - #ifdef HAVE_CONFIG_H #include #endif /*HAVE_CONFIG_H*/ +#include +#include + 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)) @@ -25,12 +53,12 @@ typedef struct _ModestMainWindow ModestMainWindow; 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); */ }; diff --git a/src/widgets/modest-window.h b/src/widgets/modest-window.h new file mode 100644 index 0000000..0a2704c --- /dev/null +++ b/src/widgets/modest-window.h @@ -0,0 +1,51 @@ +/* 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 +#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 +typedef GtkWindow ModestWindow; +typedef GtkWindowClass ModestWindowClass; +#elif MODEST_PLATFORM_ID==2 /* hildon */ +#include +typedef HildonWindow ModestWindow; +typedef HildonWindowClass ModestWindowClass; +#endif /*MODEST_PLATFORM_ID*/ +/************************************************/ + +#endif /* MODEST_WINDOW_H__ */ -- 1.7.9.5