svnno****@sourc*****
svnno****@sourc*****
Tue Oct 21 00:31:42 JST 2008
Revision: 3512
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3512
Author: pal_gene
Date: 2008-10-21 00:31:42 +0900 (Tue, 21 Oct 2008)
Log Message:
-----------
Work aound for GTK_MOZEMBED in gtkmozembed.h be shipped with mozilla.
GTK_CHECK_CAST is masked by GTK_DISABLE_DEPRECATED in gtk+-2.14.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
kazehakase/trunk/module/embed/gecko/kz-mozselectionlistener.cpp
kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2008-08-13 21:10:06 UTC (rev 3511)
+++ kazehakase/trunk/ChangeLog 2008-10-20 15:31:42 UTC (rev 3512)
@@ -1,3 +1,11 @@
+2008-10-20 Shunichi Fuji <palgl****@gmail*****>
+
+ * module/embed/gecko/kz-geck-embed.cpp,
+ module/embed/gecko/kz-mozselectionlistener.cpp,
+ module/embed/gecko/kz-mozwrapper.cpp:
+ Work aound for GTK_MOZEMBED in gtkmozembed.h be shipped with mozilla.
+ GTK_CHECK_CAST is masked by GTK_DISABLE_DEPRECATED in gtk+-2.14.
+
2008-08-14 Kouhei Sutou <kou****@cozmi*****>
* module/embed/gecko/kz-mozcookiepromptservice.cpp
Modified: kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2008-08-13 21:10:06 UTC (rev 3511)
+++ kazehakase/trunk/module/embed/gecko/kz-gecko-embed.cpp 2008-10-20 15:31:42 UTC (rev 3512)
@@ -102,6 +102,12 @@
#include <nsMemory.h>
#include <nsServiceManagerUtils.h>
+/* GTK_CHECK_CAST is masked by GTK_DISABLE_DEPRECATED in gtk+-2.14 */
+#ifndef GTK_CHECK_CAST
+#undef GTK_MOZ_EMBED
+#define GTK_MOZ_EMBED(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_MOZ_EMBED, GtkMozEmbed))
+#endif
+
#define KZ_GECKO_EMBED_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), KZ_TYPE_GECKO_EMBED, KzGeckoEmbedPrivate))
enum {
Modified: kazehakase/trunk/module/embed/gecko/kz-mozselectionlistener.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozselectionlistener.cpp 2008-08-13 21:10:06 UTC (rev 3511)
+++ kazehakase/trunk/module/embed/gecko/kz-mozselectionlistener.cpp 2008-10-20 15:31:42 UTC (rev 3512)
@@ -41,6 +41,12 @@
# include "config.h"
#endif /* HAVE_CONFIG_H */
+/* GTK_CHECK_CAST is masked by GTK_DISABLE_DEPRECATED in gtk+-2.14 */
+#ifndef GTK_CHECK_CAST
+#undef GTK_MOZ_EMBED
+#define GTK_MOZ_EMBED(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_MOZ_EMBED, GtkMozEmbed))
+#endif
+
KzMozSelectionListener::KzMozSelectionListener () :
mKzGeckoEmbed (nsnull),
mWebBrowser (nsnull),
Modified: kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp
===================================================================
--- kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp 2008-08-13 21:10:06 UTC (rev 3511)
+++ kazehakase/trunk/module/embed/gecko/kz-mozwrapper.cpp 2008-10-20 15:31:42 UTC (rev 3512)
@@ -112,6 +112,12 @@
# include <nsIX509Cert.h>
# include <nsISecureBrowserUI.h>
+/* GTK_CHECK_CAST is masked by GTK_DISABLE_DEPRECATED in gtk+-2.14 */
+#ifndef GTK_CHECK_CAST
+#undef GTK_MOZ_EMBED
+#define GTK_MOZ_EMBED(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_MOZ_EMBED, GtkMozEmbed))
+#endif
+
KzMozWrapper::KzMozWrapper () :
mWebBrowser (nsnull),
mEventTarget (nsnull),