Show
Ignore:
Timestamp:
02/29/08 19:32:35 (2 years ago)
Author:
rob.linden
Message:

Latest internal snapshot
Last Changed Rev: 80909
Last Changed Date: 2008-02-27 15:08:55 -0800 (Wed, 27 Feb 2008)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/llmozlib2/llembeddedbrowser.h

    r3 r8  
    1 /** 
    2  * @file llembeddedbrowser.h 
    3  * @brief LLEmbeddedBrowser declaration. 
     1/* ***** BEGIN LICENSE BLOCK ***** 
     2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 
    43 * 
    5  * $LicenseInfo:firstyear=2006&license=viewergpl$ 
     4 * The contents of this file are subject to the Mozilla Public License Version 
     5 * 1.1 (the "License"); you may not use this file except in compliance with 
     6 * the License. You may obtain a copy of the License at 
     7 * http://www.mozilla.org/MPL/ 
    68 * 
    7  * Copyright (c) 2006-2007, Linden Research, Inc. 
     9 * Software distributed under the License is distributed on an "AS IS" basis, 
     10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
     11 * for the specific language governing rights and limitations under the 
     12 * License. 
    813 * 
    9  * Second Life Viewer Source Code 
    10  * The source code in this file ("Source Code") is provided by Linden Lab 
    11  * to you under the terms of the GNU General Public License, version 2.0 
    12  * ("GPL"), unless you have obtained a separate licensing agreement 
    13  * ("Other License"), formally executed by you and Linden Lab.  Terms of 
    14  * the GPL can be found in doc/GPL-license.txt in this distribution, or 
    15  * online at http://secondlife.com/developers/opensource/gplv2 
     14 * The Original Code is Linden Lab Inc. (http://lindenlab.com) code. 
    1615 * 
    17  * There are special exceptions to the terms and conditions of the GPL as 
    18  * it is applied to this Source Code. View the full text of the exception 
    19  * in the file doc/FLOSS-exception.txt in this software distribution, or 
    20  * online at http://secondlife.com/developers/opensource/flossexception 
     16 * The Initial Developer of the Original Code is: 
     17 *   Callum Prentice (callum@ubrowser.com) 
    2118 * 
    22  * By copying, modifying or distributing this software, you acknowledge 
    23  * that you have read and understood your obligations described above, 
    24  * and agree to abide by those obligations. 
     19 * Portions created by the Initial Developer are Copyright (C) 2006 
     20 * the Initial Developer. All Rights Reserved. 
    2521 * 
    26  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO 
    27  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, 
    28  * COMPLETENESS OR PERFORMANCE. 
    29  * $/LicenseInfo$ 
    30  */ 
     22 * Contributor(s): 
     23 *  Callum Prentice (callum@ubrowser.com) 
     24 * 
     25 * Alternatively, the contents of this file may be used under the terms of 
     26 * either the GNU General Public License Version 2 or later (the "GPL"), or 
     27 * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), 
     28 * in which case the provisions of the GPL or the LGPL are applicable instead 
     29 * of those above. If you wish to allow use of your version of this file only 
     30 * under the terms of either the GPL or the LGPL, and not to allow others to 
     31 * use your version of this file under the terms of the MPL, indicate your 
     32 * decision by deleting the provisions above and replace them with the notice 
     33 * and other provisions required by the GPL or the LGPL. If you do not delete 
     34 * the provisions above, a recipient may use your version of this file under 
     35 * the terms of any one of the MPL, the GPL or the LGPL. 
     36 * 
     37 * ***** END LICENSE BLOCK ***** */ 
    3138 
    3239#ifndef LLEMBEDDEDBROWSER_H 
    …… 
    4754                static LLEmbeddedBrowser* getInstance(); 
    4855 
    49                 bool init( std::string applicationDir, std::string componentDir, std::string profileDir ); 
     56                bool init( std::string applicationDir, std::string componentDir, std::string profileDir, void* nativeWindowHandleIn ); 
    5057                bool reset(); 
    5158                bool clearCache(); 
    …… 
    5663                std::string getGREVersion(); 
    5764                void setBrowserAgentId( std::string idIn ); 
    58                 LLEmbeddedBrowserWindow* createBrowserWindow( void* nativeWindowHandleIn, int browserWidthIn, int browserHeightIn ); 
     65                LLEmbeddedBrowserWindow* createBrowserWindow( int browserWidthIn, int browserHeightIn ); 
    5966                bool destroyBrowserWindow( LLEmbeddedBrowserWindow* browserWindowIn ); 
    60                 bool setCaretColor( int browserWindowIdIn, const int redIn, const int greenIn, const int blueIn ); 
    6167                void setLastError( int errorNumIn ); 
    6268                void clearLastError(); 
    …… 
    6571        private: 
    6672                static LLEmbeddedBrowser* sInstance; 
     73                void* mNativeWindowHandle; 
    6774                int mErrorNum; 
    6875}; 
    6976 
    7077#endif  // LLEMBEDDEDBROWSER_H 
     78