Author: ArcRiley
Date: 2008-02-11 01:05:08 -0500 (Mon, 11 Feb 2008)
New Revision: 853

Added:
   trunk/pysoy/include/carbon.pxd
Removed:
   trunk/pysoy/include/Carbon.pxd
   trunk/pysoy/src/_core-osx/
Modified:
   trunk/pysoy/src/_core/soy._core.pxd
Log:
Final merge of changes to date for _core-osx to _core


Deleted: trunk/pysoy/include/Carbon.pxd
===================================================================
--- trunk/pysoy/include/Carbon.pxd      2008-02-11 05:50:20 UTC (rev 852)
+++ trunk/pysoy/include/Carbon.pxd      2008-02-11 06:05:08 UTC (rev 853)
@@ -1,29 +0,0 @@
-# PySoy Carbon Declarations for OSX
-#
-# Copyright (C) 2006,2007,2008 PySoy Group
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, see http://www.gnu.org/licenses
-#
-# $Id$
-
-
-cdef extern from "Carbon/Carbon.h" :
-   OSStatus
-
-   cdef OSStatus CreateNewWindow (
-      WindowClass windowClass,
-      WindowAttributes attributes,
-      const Rect * contentBounds,
-      WindowRef * outWindow
-   )

Copied: trunk/pysoy/include/carbon.pxd (from rev 851, 
trunk/pysoy/include/Carbon.pxd)
===================================================================
--- trunk/pysoy/include/carbon.pxd                              (rev 0)
+++ trunk/pysoy/include/carbon.pxd      2008-02-11 06:05:08 UTC (rev 853)
@@ -0,0 +1,29 @@
+# PySoy Carbon Declarations for OSX
+#
+# Copyright (C) 2006,2007,2008 PySoy Group
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, see http://www.gnu.org/licenses
+#
+# $Id$
+
+
+cdef extern from "Carbon/Carbon.h" :
+   OSStatus
+
+   cdef OSStatus CreateNewWindow (
+      WindowClass windowClass,
+      WindowAttributes attributes,
+      const Rect * contentBounds,
+      WindowRef * outWindow
+   )

Modified: trunk/pysoy/src/_core/soy._core.pxd
===================================================================
--- trunk/pysoy/src/_core/soy._core.pxd 2008-02-11 05:50:20 UTC (rev 852)
+++ trunk/pysoy/src/_core/soy._core.pxd 2008-02-11 06:05:08 UTC (rev 853)
@@ -28,6 +28,8 @@
 
 IF UNAME_SYSNAME == "Windows" :
   cimport windows
+ELIF UNAME_SYSNAME == "Darwin" :
+  cimport carbon
 ELSE:
   cimport glx
 

_______________________________________________
PySoy-SVN mailing list
[email protected]
http://www.pysoy.org/mailman/listinfo/pysoy-svn

Reply via email to