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

Minor changes so it compiles with Cocoa widgetset; minor change to Mac scripts so it uses system's libsqlite3.dylib rather than XUL's, which Snow Leopard does not consider secure enough.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1386 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
macpgmr
2010-11-28 17:33:37 +00:00
parent 5495efb66f
commit c40167afdd
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1888,7 +1888,7 @@ begin
Result := Handle; Result := Handle;
{$ENDIF} {$ENDIF}
{$IFDEF LCLCarbon} {$IFDEF LCLCarbon}
Result := TCarbonWindow(Handle).Window; Result := THANDLE(TCarbonWindow(Handle).Window);
{$ENDIF} {$ENDIF}
{$IFDEF LCLCocoa} {$IFDEF LCLCocoa}
ARect := NSView(TCocoaWindow(Handle).contentView).visibleRect; ARect := NSView(TCocoaWindow(Handle).contentView).visibleRect;
@ -1898,7 +1898,7 @@ begin
ARect.origin.y := 15; ARect.origin.y := 15;
AView := NSView.alloc.initWithFrame(ARect); AView := NSView.alloc.initWithFrame(ARect);
NSView(TCocoaWindow(Handle).contentView).addSubView(AView); NSView(TCocoaWindow(Handle).contentView).addSubView(AView);
Result := HANDLE(AView); Result := THANDLE(AView);
{$ENDIF} {$ENDIF}
{$IFDEF LCLGtk} {$IFDEF LCLGtk}
Result := Handle; Result := Handle;

14
components/geckoport/Components/GeckoChromeWindow.pas
View File

@ -168,12 +168,17 @@ var
begin begin
{$IFDEF MSWINDOWS}Result := Handle;{$ENDIF} {$IFDEF MSWINDOWS}Result := Handle;{$ENDIF}
{$IFDEF LCLCarbon}Result := TCarbonWindow(Handle).Window;{$ENDIF} {$IFDEF LCLCarbon}Result := THANDLE(TCarbonWindow(Handle).Window);{$ENDIF}
//Carbon doesn't work but leave in so package compiles in Carbon IDE. //Carbon doesn't work but leave in so package compiles in Carbon IDE.
// {$IFDEF LCLCocoa}Result := Pointer(TCocoaForm(Handle).MainWindowView.superview);{$ENDIF} // {$IFDEF LCLCocoa}Result := Pointer(TCocoaForm(Handle).MainWindowView.superview);{$ENDIF}
//Old PasCocoa-based widgetset. //Old PasCocoa-based widgetset.
//NSLog(NSStringUtf8(FloatToStr(NSView(TCocoaWindow(Handle).contentView).frame.size.width)));
{$IFDEF LCLCocoa}Result := THANDLE(TCocoaWindow(Handle).contentView);{$ENDIF}
//New ObjC-based Cocoa widgetset.
(*
//Does adding a view work better than using window's view (below)? No, it doesn't. //Does adding a view work better than using window's view (below)? No, it doesn't.
{$IFDEF LCLCocoa} {$IFDEF LCLCocoa}
ARect := NSView(TCocoaWindow(Handle).contentView).visibleRect; ARect := NSView(TCocoaWindow(Handle).contentView).visibleRect;
@ -183,12 +188,9 @@ begin
ARect.origin.y := 15; ARect.origin.y := 15;
AView := NSView.alloc.initWithFrame(ARect); AView := NSView.alloc.initWithFrame(ARect);
NSView(TCocoaWindow(Handle).contentView).addSubView(AView); NSView(TCocoaWindow(Handle).contentView).addSubView(AView);
Result := HANDLE(AView); Result := THANDLE(AView);
{$ENDIF} {$ENDIF}
*)
//NSLog(NSStringUtf8(FloatToStr(NSView(TCocoaWindow(Handle).contentView).frame.size.width)));
// {$IFDEF LCLCocoa}Result := Pointer(TCocoaWindow(Handle).contentView);{$ENDIF}
//New ObjC-based Cocoa widgetset.
{$IFDEF LCLGtk}Result := Handle;{$ENDIF} //Is Handle same as GTK Window? {$IFDEF LCLGtk}Result := Handle;{$ENDIF} //Is Handle same as GTK Window?

4
components/geckoport/SampleApps/run-cw-mac.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#export DYLD_LIBRARY_PATH=/Applications/Firefox.app/Contents/MacOS #export DYLD_LIBRARY_PATH=/usr/lib:/Applications/Firefox.app/Contents/MacOS
export DYLD_LIBRARY_PATH=/Library/Frameworks/XUL.framework/Versions/Current export DYLD_LIBRARY_PATH=/usr/lib:/Library/Frameworks/XUL.framework/Versions/Current
open ChromeWin.app open ChromeWin.app

4
components/geckoport/SampleApps/run-gb-mac.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#export DYLD_LIBRARY_PATH=/Applications/Firefox.app/Contents/MacOS #export DYLD_LIBRARY_PATH=/usr/lib:/Applications/Firefox.app/Contents/MacOS
export DYLD_LIBRARY_PATH=/Library/Frameworks/XUL.framework/Versions/Current export DYLD_LIBRARY_PATH=/usr/lib:/Library/Frameworks/XUL.framework/Versions/Current
open GBrowser.app open GBrowser.app