c1919441ed
- make NavigationTest not run M build.xml - Move Win32BrowserControlCanvas up to parent package M classes_spec/org/mozilla/webclient/BrowserControlCanvas.java - You can't resize until you're initialized - pass visibility through to native layer M classes_spec/org/mozilla/webclient/impl/BrowserControlImpl.java - Use WrapperFactory to create the BrowserControlCanvas impl. A classes_spec/org/mozilla/webclient/impl/wrapper_native/Win32BrowserControlCanvas.java - moved up from child package M classes_spec/org/mozilla/webclient/impl/wrapper_native/WindowControlImpl.java - use the new thread model for nativeSetBounds(), nativeRealize(), nativeSetVisible(). M classes_spec/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImpl.java - make this create the BrowserControlCanvas instance. - honor the new package name for Win32BrowserControlCanvas. R classes_spec/org/mozilla/webclient/impl/wrapper_native/win32/Win32BrowserControlCanvas.java - moved up one level. M src_moz/EmbedWindow.cpp M src_moz/EmbedWindow.h - Take size parameters to CreateWindow_ M src_moz/Makefile.in - add WindowControlImpl.cpp M src_moz/NativeBrowserControl.cpp M src_moz/NativeBrowserControl.h - add size parameters to Realize(). M src_moz/WindowControlImpl.cpp - reactivate nativeRealize(), nativeSetVisible(), nativesetBounds(), M src_moz/win32/Win32BrowserControlCanvas.cpp - new package name M test/automated/src/classes/org/mozilla/webclient/NavigationTest.java - we have to create a Canvas to load a URL. Mozilla limitation. M test/automated/src/classes/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImplTest.java - remove unneeded test metdod git-svn-id: svn://10.0.0.236/trunk@155219 18797224-902f-48f8-a5cc-f745e15eee43
91 lines
2.6 KiB
C++
91 lines
2.6 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
|
*
|
|
* The contents of this file are subject to the Mozilla Public
|
|
* License Version 1.1 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.mozilla.org/MPL/
|
|
*
|
|
* Software distributed under the License is distributed on an "AS
|
|
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
|
* implied. See the License for the specific language governing
|
|
* rights and limitations under the License.
|
|
*
|
|
* The Original Code is RaptorCanvas.
|
|
*
|
|
* The Initial Developer of the Original Code is Kirk Baker and
|
|
* Ian Wilkinson. Portions created by Kirk Baker and Ian Wilkinson are
|
|
* Copyright (C) 1999 Kirk Baker and Ian Wilkinson. All
|
|
* Rights Reserved.
|
|
*
|
|
* Contributor(s): Kirk Baker <kbaker@eb.com>
|
|
* Ian Wilkinson <iw@ennoble.com>
|
|
* Mark Lin <mark.lin@eng.sun.com>
|
|
* Mark Goddard
|
|
* Ed Burns <edburns@acm.org>
|
|
* Ashutosh Kulkarni <ashuk@eng.sun.com>
|
|
* Christopher Blizzard
|
|
*/
|
|
|
|
#ifndef EmbedWindow_h
|
|
#define EmbedWindow_h
|
|
|
|
#include <nsString.h>
|
|
#include <nsIWebBrowserChrome.h>
|
|
#include <nsIWebBrowserChromeFocus.h>
|
|
#include <nsIEmbeddingSiteWindow.h>
|
|
#include <nsITooltipListener.h>
|
|
#include <nsISupports.h>
|
|
#include <nsIWebBrowser.h>
|
|
#include <nsIBaseWindow.h>
|
|
#include <nsIInterfaceRequestor.h>
|
|
#include <nsCOMPtr.h>
|
|
#include "nsString.h"
|
|
|
|
class NativeBrowserControl;
|
|
|
|
class EmbedWindow : public nsIWebBrowserChrome,
|
|
public nsIWebBrowserChromeFocus,
|
|
public nsIEmbeddingSiteWindow,
|
|
public nsITooltipListener,
|
|
public nsIInterfaceRequestor
|
|
{
|
|
|
|
public:
|
|
|
|
EmbedWindow();
|
|
virtual ~EmbedWindow();
|
|
|
|
nsresult Init (NativeBrowserControl *aOwner);
|
|
nsresult CreateWindow_ (PRUint32 width, PRUint32 height);
|
|
void ReleaseChildren (void);
|
|
|
|
NS_DECL_ISUPPORTS
|
|
|
|
NS_DECL_NSIWEBBROWSERCHROME
|
|
|
|
NS_DECL_NSIWEBBROWSERCHROMEFOCUS
|
|
|
|
NS_DECL_NSIEMBEDDINGSITEWINDOW
|
|
|
|
NS_DECL_NSITOOLTIPLISTENER
|
|
|
|
NS_DECL_NSIINTERFACEREQUESTOR
|
|
|
|
nsString mTitle;
|
|
nsString mJSStatus;
|
|
nsString mLinkMessage;
|
|
|
|
nsCOMPtr<nsIBaseWindow> mBaseWindow; // [OWNER]
|
|
|
|
private:
|
|
|
|
NativeBrowserControl *mOwner;
|
|
nsCOMPtr<nsIWebBrowser> mWebBrowser; // [OWNER]
|
|
// PENDING(edburns): what about the tooltip window?
|
|
PRBool mVisibility;
|
|
PRBool mIsModal;
|
|
|
|
};
|
|
|
|
#endif // EmbedWindow_h
|