From a68362bcf184da74829fce5eb5e43e5b8101a84b Mon Sep 17 00:00:00 2001 From: "gerv%gerv.net" Date: Mon, 27 Dec 2004 18:45:32 +0000 Subject: [PATCH] iBug 236613: change to MPL/LGPL/GPL tri-license. --- db/sqlite3/src/Makefile.in | 2 + .../browser/cocoa/src/CHBrowserListener.h | 62 ---------- storage/Makefile.in | 2 + storage/build/Makefile.in | 2 + storage/test/Makefile.in | 2 + widget/src/xlibxtbin/xlibxtbin.h | 108 ------------------ 6 files changed, 8 insertions(+), 170 deletions(-) diff --git a/db/sqlite3/src/Makefile.in b/db/sqlite3/src/Makefile.in index ac72b659df5..7b545e02642 100644 --- a/db/sqlite3/src/Makefile.in +++ b/db/sqlite3/src/Makefile.in @@ -12,6 +12,8 @@ # for the specific language governing rights and limitations under the # License. # +# The Original Code is Oracle Corporation code. +# # The Initial Developer of the Original Code is # Oracle Corporation # Portions created by the Initial Developer are Copyright (C) 2004 diff --git a/embedding/browser/cocoa/src/CHBrowserListener.h b/embedding/browser/cocoa/src/CHBrowserListener.h index 80950778e3b..e69de29bb2d 100644 --- a/embedding/browser/cocoa/src/CHBrowserListener.h +++ b/embedding/browser/cocoa/src/CHBrowserListener.h @@ -1,62 +0,0 @@ -// -// CHBrowserListener.h -// Chimera -// -// Created by Simon Fraser on Sat Aug 17 2002. -// Copyright (c) 2001 __MyCompanyName__. All rights reserved. -// - - -#ifndef __nsCocoaBrowserListener_h__ -#define __nsCocoaBrowserListener_h__ - -#include "nsWeakReference.h" -#include "nsIInterfaceRequestor.h" -#include "nsIWebBrowser.h" -#include "nsIWebBrowserChrome.h" -#include "nsIWebProgressListener.h" -#include "nsIEmbeddingSiteWindow2.h" -#include "nsIWindowCreator.h" - -#include "nsIContextMenuListener.h" -#include "nsITooltipListener.h" - -@class CHBrowserView; - -class CHBrowserListener : public nsSupportsWeakReference, - public nsIInterfaceRequestor, - public nsIWebBrowserChrome, - public nsIWindowCreator, - public nsIEmbeddingSiteWindow2, - public nsIWebProgressListener, - public nsIContextMenuListener, - public nsITooltipListener -{ -public: - CHBrowserListener(CHBrowserView* aView); - virtual ~CHBrowserListener(); - - NS_DECL_ISUPPORTS - NS_DECL_NSIINTERFACEREQUESTOR - NS_DECL_NSIWEBBROWSERCHROME - NS_DECL_NSIWINDOWCREATOR - NS_DECL_NSIEMBEDDINGSITEWINDOW - NS_DECL_NSIEMBEDDINGSITEWINDOW2 - NS_DECL_NSIWEBPROGRESSLISTENER - NS_DECL_NSICONTEXTMENULISTENER - NS_DECL_NSITOOLTIPLISTENER - - void AddListener(id aListener); - void RemoveListener(id aListener); - void SetContainer(id aContainer); - -private: - CHBrowserView* mView; // WEAK - it owns us - NSMutableArray* mListeners; - id mContainer; - PRBool mIsModal; - PRUint32 mChromeFlags; -}; - - -#endif // __nsCocoaBrowserListener_h__ diff --git a/storage/Makefile.in b/storage/Makefile.in index 19c027638c3..5c5bf7562da 100644 --- a/storage/Makefile.in +++ b/storage/Makefile.in @@ -12,6 +12,8 @@ # for the specific language governing rights and limitations under the # License. # +# The Original Code is Oracle Corporation code. +# # The Initial Developer of the Original Code is # Oracle Corporation # Portions created by the Initial Developer are Copyright (C) 2004 diff --git a/storage/build/Makefile.in b/storage/build/Makefile.in index 33f6b6dab7b..052db9c7cf7 100644 --- a/storage/build/Makefile.in +++ b/storage/build/Makefile.in @@ -12,6 +12,8 @@ # for the specific language governing rights and limitations under the # License. # +# The Original Code is Oracle Corporation code. +# # The Initial Developer of the Original Code is # Oracle Corporation # Portions created by the Initial Developer are Copyright (C) 2004 diff --git a/storage/test/Makefile.in b/storage/test/Makefile.in index 6876f7af45a..ce974474b1c 100644 --- a/storage/test/Makefile.in +++ b/storage/test/Makefile.in @@ -12,6 +12,8 @@ # for the specific language governing rights and limitations under the # License. # +# The Original Code is Oracle Corporation code. +# # The Initial Developer of the Original Code is # Oracle Corporation # Portions created by the Initial Developer are Copyright (C) 2004 diff --git a/widget/src/xlibxtbin/xlibxtbin.h b/widget/src/xlibxtbin/xlibxtbin.h index 446a3331d77..e69de29bb2d 100644 --- a/widget/src/xlibxtbin/xlibxtbin.h +++ b/widget/src/xlibxtbin/xlibxtbin.h @@ -1,108 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __XLIB_XTBIN_H__ -#define __XLIB_XTBIN_H__ - -#include "xlibrgb.h" - -#include -#include -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -typedef struct _XtTMRec { - XtTranslations translations; /* private to Translation Manager */ - XtBoundActions proc_table; /* procedure bindings for actions */ - struct _XtStateRec *current_state; /* Translation Manager state ptr */ - unsigned long lastEventTime; -} XtTMRec, *XtTM; - -typedef struct _CorePart { - Widget self; /* pointer to widget itself */ - WidgetClass widget_class; /* pointer to Widget's ClassRec */ - Widget parent; /* parent widget */ - XrmName xrm_name; /* widget resource name quarkified */ - Boolean being_destroyed; /* marked for destroy */ - XtCallbackList destroy_callbacks; /* who to call when widget destroyed */ - XtPointer constraints; /* constraint record */ - Position x, y; /* window position */ - Dimension width, height; /* window dimensions */ - Dimension border_width; /* window border width */ - Boolean managed; /* is widget geometry managed? */ - Boolean sensitive; /* is widget sensitive to user events*/ - Boolean ancestor_sensitive; /* are all ancestors sensitive? */ - XtEventTable event_table; /* private to event dispatcher */ - XtTMRec tm; /* translation management */ - XtTranslations accelerators; /* accelerator translations */ - Pixel border_pixel; /* window border pixel */ - Pixmap border_pixmap; /* window border pixmap or NULL */ - WidgetList popup_list; /* list of popups */ - Cardinal num_popups; /* how many popups */ - String name; /* widget resource name */ - Screen *screen; /* window's screen */ - Colormap colormap; /* colormap */ - Window window; /* window ID */ - Cardinal depth; /* number of planes in window */ - Pixel background_pixel; /* window background pixel */ - Pixmap background_pixmap; /* window background pixmap or NULL */ - Boolean visible; /* is window mapped and not occluded?*/ - Boolean mapped_when_managed;/* map window if it's managed? */ -} CorePart; - -typedef struct _WidgetRec { - CorePart core; - } WidgetRec, CoreRec; -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -class xtbin { -public: - xtbin(); - ~xtbin(); - - void xtbin_init(); - void xtbin_realize(); - void xtbin_new(Window aParent); - void xtbin_destroy(); - void xtbin_resize(int aX, int aY, int aWidth, int aHeight); - Window xtbin_xtwindow() { return xtwindow; } - int xtbin_initialized(); - void sync(); - -private: - int initialized; - XlibRgbHandle *mXlibRgbHandle; - Display *xtdisplay; - Window xtwindow; - XtAppContext app_context; - Window parent_window; - Widget xtwidget; - Window window; - Window oldwindow; - int x, y, width, height; -}; - - -#endif /* __XLIB_XTBIN_H__ */ -