svnno****@sourc*****
svnno****@sourc*****
Mon Oct 15 14:30:56 JST 2007
Revision: 3279
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3279
Author: ikezoe
Date: 2007-10-15 14:30:55 +0900 (Mon, 15 Oct 2007)
Log Message:
-----------
2007-10-15 Hiroyuki Ikezoe <poinc****@ikezo*****>
* src/Makefile.am: Use --header and --body option simultaneously.
* configure.ac, module/embed/Makefile.am,
module/embed/ie/kz-ie.[cpp|h]: Use GtkIEEmbed.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/configure.ac
kazehakase/trunk/module/embed/Makefile.am
kazehakase/trunk/module/embed/ie/kz-ie.cpp
kazehakase/trunk/module/embed/ie/kz-ie.h
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-10-15 01:47:41 UTC (rev 3278)
+++ kazehakase/trunk/ChangeLog 2007-10-15 05:30:55 UTC (rev 3279)
@@ -1,6 +1,8 @@
2007-10-15 Hiroyuki Ikezoe <poinc****@ikezo*****>
* src/Makefile.am: Use --header and --body option simultaneously.
+ * configure.ac, module/embed/Makefile.am,
+ module/embed/ie/kz-ie.[cpp|h]: Use GtkIEEmbed.
2007-10-15 Kouhei Sutou <kou****@cozmi*****>
Modified: kazehakase/trunk/configure.ac
===================================================================
--- kazehakase/trunk/configure.ac 2007-10-15 01:47:41 UTC (rev 3278)
+++ kazehakase/trunk/configure.ac 2007-10-15 05:30:55 UTC (rev 3279)
@@ -128,18 +128,22 @@
AM_CONDITIONAL(HAVE_WEBKIT_GTK_WEBKIT_H, test x"$gtk_webcore_has_webkit_h" = "xyes")
dnl **************************************************************
-dnl Check for IE
+dnl Check for GtkIEEmbed
dnl **************************************************************
-ie_exists=no
-AC_ARG_ENABLE([ie],
- AS_HELP_STRING([--enable-ie]
- [Enable Internet Explorer (auto)]))
-if test x"$enable_ie" != "xno"; then
- AC_CHECK_HEADER([objbase.h], [ie_exists=yes])
+gtk_ie_embed_exists=no
+PKG_CHECK_MODULES(GTKIEEMBED, gtk-ie-embed,
+ [gtk_ie_embed_exists=yes], [gtk_ie_embed_exists=no])
+AC_SUBST([GTKIEEMBED_CFLAGS])
+AC_SUBST([GTKIEEMBED_LIBS])
+if test x"$gtk_ie_embed_exists" = "xyes"; then
+ gtk_ie_embed_available=yes
+else
+ gtk_ie_embed_available=no
fi
-AM_CONDITIONAL([WITH_IE], [test x"$ie_exists" = "xyes"])
+AM_CONDITIONAL([WITH_GTK_IE_EMBED], [test $gtk_ie_embed_available = "yes"])
+
dnl **************************************************************
dnl Check for GNU TLS
dnl **************************************************************
Modified: kazehakase/trunk/module/embed/Makefile.am
===================================================================
--- kazehakase/trunk/module/embed/Makefile.am 2007-10-15 01:47:41 UTC (rev 3278)
+++ kazehakase/trunk/module/embed/Makefile.am 2007-10-15 05:30:55 UTC (rev 3279)
@@ -8,6 +8,6 @@
SUBDIRS += gtk-webcore
endif
-if WITH_IE
+if WITH_GTK_IE_EMBED
SUBDIRS += ie
endif
Modified: kazehakase/trunk/module/embed/ie/kz-ie.cpp
===================================================================
--- kazehakase/trunk/module/embed/ie/kz-ie.cpp 2007-10-15 01:47:41 UTC (rev 3278)
+++ kazehakase/trunk/module/embed/ie/kz-ie.cpp 2007-10-15 05:30:55 UTC (rev 3279)
@@ -20,10 +20,7 @@
* $Id: kz-gtk-webcore.cpp 3111 2007-03-30 08:18:40Z makeinu $
*/
-#include <objbase.h>
-
#include <glib/gi18n.h>
-#include <math.h>
#include "kazehakase.h"
#include "kz-ie.h"
@@ -41,7 +38,7 @@
#define KZ_IE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), KZ_TYPE_IE, KzIEPrivate))
static GType kz_type_ie = 0;
-static GtkWidgetClass *kz_ie_parent_class;
+static GtkIEEmbedClass *kz_ie_parent_class;
GtkWidget *kz_ie_new (void);
static void kz_ie_class_init (KzIEClass *klass);
Modified: kazehakase/trunk/module/embed/ie/kz-ie.h
===================================================================
--- kazehakase/trunk/module/embed/ie/kz-ie.h 2007-10-15 01:47:41 UTC (rev 3278)
+++ kazehakase/trunk/module/embed/ie/kz-ie.h 2007-10-15 05:30:55 UTC (rev 3279)
@@ -23,7 +23,7 @@
#ifndef __KZ_IE_H__
#define __KZ_IE_H__
-#include <gtk/gtk.h>
+#include <gtk-ie-embed.h>
G_BEGIN_DECLS
@@ -39,12 +39,12 @@
struct _KzIE
{
- GtkWidget parent;
+ GtkIEEmbed parent;
};
struct _KzIEClass
{
- GtkWidgetClass parent_class;
+ GtkIEEmbedClass parent_class;
};