pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

* Use the same mechanism to get the native handle as in TGeckoChromeWindow

Browse Source 
* Use the right handle for GTK2


git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1365 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
Loesje_
2010-11-03 11:27:11 +00:00
parent 12c1226196
commit 75da85c8d7
1 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
components/geckoport/Components/GeckoBrowser.pas
View File

@ -58,7 +58,8 @@ uses
nsGeckoStrings, CallbackInterfaces, nsTypes, nsXPCOMGlue, BrowserSupports, nsGeckoStrings, CallbackInterfaces, nsTypes, nsXPCOMGlue, BrowserSupports,
nsXPCOM_std19 nsXPCOM_std19
{$IFDEF LCLCarbon}, CarbonPrivate {$ENDIF} {$IFDEF LCLCarbon}, CarbonPrivate {$ENDIF}
{$IFDEF LCLCocoa}, CocoaPrivate {$ENDIF}; {$IFDEF LCLCocoa}, CocoaPrivate, CocoaAll, CocoaUtils {$ENDIF}
{$IFDEF LCLGtk2}, gtk2 {$ENDIF};
resourcestring resourcestring
SGeckoBrowserInitError = 'Failed to initialize TGeckoBrowser.'; SGeckoBrowserInitError = 'Failed to initialize TGeckoBrowser.';
@ -201,6 +202,7 @@ type
function GetWebBrowserFind: nsIWebBrowserFind; function GetWebBrowserFind: nsIWebBrowserFind;
function GetWebBrowserPrint: nsIWebBrowserPrint; function GetWebBrowserPrint: nsIWebBrowserPrint;
function GetWebNavigation: nsIWebNavigation; function GetWebNavigation: nsIWebNavigation;
function GetNativeWindow : THANDLE;
//function GetMarkupDocumentViewer: nsIMarkupDocumentViewer; //function GetMarkupDocumentViewer: nsIMarkupDocumentViewer;
//function GetDocShell: nsIDocShell; //function GetDocShell: nsIDocShell;
//function GetDocumentCharsetInfo: nsIDocumentCharsetInfo; //function GetDocumentCharsetInfo: nsIDocumentCharsetInfo;
@ -1117,12 +1119,7 @@ begin
baseWin := FWebBrowser as nsIBaseWindow; baseWin := FWebBrowser as nsIBaseWindow;
rc := ClientRect; rc := ClientRect;
baseWin.InitWindow({$IFDEF MSWINDOWS}Handle,{$ENDIF} baseWin.InitWindow(getNativeWindow,
{$IFDEF LCLCarbon}TCarbonWindow(Handle).Window,{$ENDIF}
// {$IFDEF LCLCocoa}Pointer(TCocoaForm(Handle).MainWindowView.superview),{$ENDIF}
{$IFDEF LCLCocoa}TCocoaWindow(Handle).contentView,{$ENDIF}
{$IFDEF LCLGtk}Handle,{$ENDIF} //Is Handle same as GTK Window?
{$IFDEF LCLGtk2}Handle,{$ENDIF} //Is Handle same as GTK Window?
nil, nil,
rc.Left, rc.Left,
rc.Top, rc.Top,
@ -1879,6 +1876,37 @@ begin
Result := FWebBrowser as nsIWebNavigation; Result := FWebBrowser as nsIWebNavigation;
end; end;
function TCustomGeckoBrowser.GetNativeWindow: THANDLE;
{$IFDEF LCLCocoa}
var
ARect : NSRect;
AView : NSView;
{$ENDIF}
begin
{$IFDEF MSWINDOWS}
Result := Handle;
{$ENDIF}
{$IFDEF LCLCarbon}
Result := TCarbonWindow(Handle).Window;
{$ENDIF}
{$IFDEF LCLCocoa}
ARect := NSView(TCocoaWindow(Handle).contentView).visibleRect;
ARect.size.width := ARect.size.width - 30;
ARect.size.height := ARect.size. height - 30;
ARect.origin.x := 15;
ARect.origin.y := 15;
AView := NSView.alloc.initWithFrame(ARect);
NSView(TCocoaWindow(Handle).contentView).addSubView(AView);
Result := HANDLE(AView);
{$ENDIF}
{$IFDEF LCLGtk}
Result := Handle;
{$ENDIF}
{$IFDEF LCLGtk2}
Result := PtrInt(PGtkWindow(Handle)^.default_widget);
{$ENDIF}
end;
{ {
function TCustomGeckoBrowser.GetMarkupDocumentViewer: nsIMarkupDocumentViewer; function TCustomGeckoBrowser.GetMarkupDocumentViewer: nsIMarkupDocumentViewer;
var var