aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2004-04-30 03:22:07 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2004-04-30 03:22:07 +0800
commit834c8272bf2427a49310ec8382c1b4aa92b6484c (patch)
treef1e8d9a074f7c7456558a4cc13b651d5512757ac
parent1ca5301bf8fec28c653dffed125bb32cfbc3b44a (diff)
downloadgsoc2013-epiphany-834c8272bf2427a49310ec8382c1b4aa92b6484c.tar
gsoc2013-epiphany-834c8272bf2427a49310ec8382c1b4aa92b6484c.tar.gz
gsoc2013-epiphany-834c8272bf2427a49310ec8382c1b4aa92b6484c.tar.bz2
gsoc2013-epiphany-834c8272bf2427a49310ec8382c1b4aa92b6484c.tar.lz
gsoc2013-epiphany-834c8272bf2427a49310ec8382c1b4aa92b6484c.tar.xz
gsoc2013-epiphany-834c8272bf2427a49310ec8382c1b4aa92b6484c.tar.zst
gsoc2013-epiphany-834c8272bf2427a49310ec8382c1b4aa92b6484c.zip
Complete headers defines
2004-04-29 Marco Pesenti Gritti <marco@gnome.org> * embed/mozilla/EventContext.cpp: * embed/mozilla/EventContext.h: * embed/mozilla/MozillaPrivate.cpp: * embed/mozilla/MozillaPrivate.h: * embed/mozilla/mozilla-embed.cpp: Complete headers defines
-rw-r--r--ChangeLog10
-rw-r--r--embed/mozilla/EventContext.cpp50
-rw-r--r--embed/mozilla/EventContext.h27
-rw-r--r--embed/mozilla/MozillaPrivate.cpp6
-rw-r--r--embed/mozilla/MozillaPrivate.h19
-rw-r--r--embed/mozilla/mozilla-embed.cpp1
6 files changed, 75 insertions, 38 deletions
diff --git a/ChangeLog b/ChangeLog
index 5ec847872..f489a6a37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-04-29 Marco Pesenti Gritti <marco@gnome.org>
+
+ * embed/mozilla/EventContext.cpp:
+ * embed/mozilla/EventContext.h:
+ * embed/mozilla/MozillaPrivate.cpp:
+ * embed/mozilla/MozillaPrivate.h:
+ * embed/mozilla/mozilla-embed.cpp:
+
+ Complete headers defines
+
2004-04-29 Patanjali Somayaji <patanjali@codito.com>
* lib/ephy-gui.c
diff --git a/embed/mozilla/EventContext.cpp b/embed/mozilla/EventContext.cpp
index 07144e3b3..d62039f31 100644
--- a/embed/mozilla/EventContext.cpp
+++ b/embed/mozilla/EventContext.cpp
@@ -24,28 +24,36 @@
#endif
#include "EventContext.h"
-#include "nsIDOMEventTarget.h"
-#include "nsIDocument.h"
-#include "nsIDOMHTMLInputElement.h"
-#include "nsIDOMHTMLObjectElement.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIDOMHTMLImageElement.h"
-#include "nsIDOMElement.h"
-#include "nsIDOMXULDocument.h"
-#include "nsIURI.h"
-#include "nsNetUtil.h"
-#include "nsIDOMNSDocument.h"
-#include "nsReadableUtils.h"
-#include "nsGUIEvent.h"
-#include "nsIDOMNSEvent.h"
-#include "nsIDOMCharacterData.h"
-#include "nsIDOMHTMLButtonElement.h"
-#include "nsIDOMHTMLLabelElement.h"
-#include "nsIDOMHTMLLegendElement.h"
-#include "nsIDOMHTMLTextAreaElement.h"
+
#include <gdk/gdkkeysyms.h>
-#include "nsIPrivateDOMEvent.h"
-#include "nsIDOMNSUIEvent.h"
+
+#include <nsIInterfaceRequestor.h>
+#include <nsIDOMEventTarget.h>
+#include <nsIDOMHTMLInputElement.h>
+#include <nsIDOMHTMLObjectElement.h>
+#include <nsIDOMHTMLImageElement.h>
+#include <nsIDOMElement.h>
+#include <nsIURI.h>
+#include <nsIDOMCharacterData.h>
+#include <nsIDOMHTMLButtonElement.h>
+#include <nsIDOMHTMLLabelElement.h>
+#include <nsIDOMHTMLLegendElement.h>
+#include <nsIDOMHTMLTextAreaElement.h>
+#include <nsIDOMElementCSSInlineStyle.h>
+#include <nsIDOMCSSStyleDeclaration.h>
+
+#ifdef ALLOW_PRIVATE_API
+#include <nsIDOMXULDocument.h>
+#include <nsIDOMNSEvent.h>
+#include <nsIDOMNSHTMLElement.h>
+#endif
+
+#ifdef ALLOW_PRIVATE_STRINGS
+#include <nsIDocument.h>
+#include <nsReadableUtils.h>
+#include <nsNetUtil.h>
+#endif
+
#define KEY_CODE 256
diff --git a/embed/mozilla/EventContext.h b/embed/mozilla/EventContext.h
index 870787cb9..41fc1dfcb 100644
--- a/embed/mozilla/EventContext.h
+++ b/embed/mozilla/EventContext.h
@@ -21,24 +21,25 @@
#ifndef EVENT_CONTEXT_H
#define EVENT_CONTEXT_H
-#include "nsIDOMMouseEvent.h"
-#include "nsIDOMKeyEvent.h"
-#include "nsIDOMEvent.h"
-#include "nsIDOMNode.h"
-#include "nsString.h"
-#include "nsIDOMHTMLAnchorElement.h"
-#include "nsIDOMNSHTMLElement.h"
-#include "nsIDOMHTMLAreaElement.h"
-#include "nsIDOMHTMLBodyElement.h"
-#include "nsIDOMElementCSSInlineStyle.h"
-#include "nsIDOMCSSStyleDeclaration.h"
-#include "nsIDOMDocument.h"
-#include "nsIDocument.h"
#include "EphyBrowser.h"
#include "ephy-embed.h"
#include "mozilla-embed-event.h"
+#include <nsIDOMMouseEvent.h>
+#include <nsIDOMKeyEvent.h>
+#include <nsIDOMEvent.h>
+#include <nsIDOMNode.h>
+#include <nsIDOMHTMLAnchorElement.h>
+#include <nsIDOMHTMLAreaElement.h>
+#include <nsIDOMHTMLBodyElement.h>
+#include <nsIDOMDocument.h>
+
+#ifdef ALLOW_PRIVATE_API
+#include <nsIDocument.h>
+#include <nsString.h>
+#endif
+
class EventContext
{
public:
diff --git a/embed/mozilla/MozillaPrivate.cpp b/embed/mozilla/MozillaPrivate.cpp
index 82dd5cd32..daa3e284d 100644
--- a/embed/mozilla/MozillaPrivate.cpp
+++ b/embed/mozilla/MozillaPrivate.cpp
@@ -22,6 +22,9 @@
#include "config.h"
#endif
+#include "ephy-embed.h"
+#include "mozilla-embed.h"
+
#include "MozillaPrivate.h"
#include <nsIServiceManagerUtils.h>
@@ -30,9 +33,6 @@
#include <nsIWebBrowserChrome.h>
#include <gtkmozembed.h>
-#include "ephy-embed.h"
-#include "mozilla-embed.h"
-
GtkWidget *MozillaFindEmbed (nsIDOMWindow *aDOMWindow)
{
if (!aDOMWindow) return nsnull;
diff --git a/embed/mozilla/MozillaPrivate.h b/embed/mozilla/MozillaPrivate.h
index c2f9a4b42..525902b16 100644
--- a/embed/mozilla/MozillaPrivate.h
+++ b/embed/mozilla/MozillaPrivate.h
@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2004 Marco Pesenti Gritti
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
#include <nsIPrintSettings.h>
#include <nsIDOMWindow.h>
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 30d825f5f..82b8adf14 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -300,7 +300,6 @@ static void
mozilla_embed_destroy (GtkObject *object)
{
MozillaEmbed *embed = MOZILLA_EMBED (object);
- int i;
if (embed->priv->browser)
{