浏览代码

+ added {$linkframework Carbon} to FPCMacOSAll so -k"-framework Carbon" is
not longer needed when using that unit
- removed the same statement from the Mac OS X graph unit (since it uses
FPCMacOSAll)

git-svn-id: trunk@10411 -

Jonas Maebe 17 年之前
父节点
当前提交
dbc7e36007
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 0 3
      packages/graph/src/macosx/graph.pp
  2. 3 0
      packages/univint/src/FPCMacOSAll.pas

+ 0 - 3
packages/graph/src/macosx/graph.pp

@@ -20,8 +20,6 @@ uses
   { the ones in the universal interfaces                              }
   FPCMacOSAll;
 
-{$linkframework Carbon}
-
 {$pascalmainname FPCMacOSXGraphMain}
 
 {$i graphh.inc}
@@ -768,7 +766,6 @@ begin
                         or kWindowInWindowMenuAttribute
                         or kWindowCompositingAttribute
                         or kWindowLiveResizeAttribute
-                        or kWindowInWindowMenuAttribute
                         or kWindowNoUpdatesAttribute; 
 
   SetRect (contentRect, 0,  0,

+ 3 - 0
packages/univint/src/FPCMacOSAll.pas

@@ -9,6 +9,9 @@
 
 unit FPCMacOSAll;
 interface
+
+{$linkframework Carbon}
+
 {$setc UNIVERSAL_INTERFACES_VERSION := $0342}
 {$setc GAP_INTERFACES_VERSION := $0200}