Emulate a few more non-carbon calls in carbon and the other way around.

1 files changed, 31 insertions, 93 deletions

diff --git a/Mac/Modules/win/winedit.py b/Mac/Modules/win/winedit.py
index 42fbcf8..09fd300 100644
--- a/Mac/Modules/win/winedit.py
+++ b/Mac/Modules/win/winedit.py
@@ -1,105 +1,43 @@
 # These are inline-routines/defines, so we do them "by hand"
 #
-if 0:
-	f = Method(CGrafPtr, 'GetWindowPort',
-	    (WindowRef, 'theWindow', InMode),
-	)
-	methods.append(f)
 
-	f = Method(void, 'SetPortWindowPort',
-	    (WindowRef, 'theWindow', InMode),
-	)
-	methods.append(f)
-
-	f = Method(short, 'GetWindowKind',
-	    (WindowRef, 'theWindow', InMode),
-	)
-	methods.append(f)
-
-	f = Method(void, 'SetWindowKind',
-	    (WindowRef, 'theWindow', InMode),
-	    (short, 'wKind', InMode),
-	)
-	methods.append(f)
-
-
-	f = Method(Boolean, 'IsWindowVisible',
-	    (WindowRef, 'theWindow', InMode),
-	)
-	methods.append(f)
-
-	f = Method(Boolean, 'IsWindowHilited',
-	    (WindowRef, 'theWindow', InMode),
-	)
-	methods.append(f)
-
-	f = Method(Boolean, 'GetWindowGoAwayFlag',
-	    (WindowRef, 'theWindow', InMode),
-	)
-	methods.append(f)
-
-	f = Method(Boolean, 'GetWindowZoomFlag',
-	    (WindowRef, 'theWindow', InMode),
-	    condition='#if !TARGET_API_MAC_CARBON'
-	)
-	methods.append(f)
-
-	f = Method(void, 'GetWindowStructureRgn',
-		(WindowRef, 'theWindow', InMode),
-		(RgnHandle, 'r', InMode),
-	    condition='#if !TARGET_API_MAC_CARBON'
-	)
-	methods.append(f)
-
-	f = Method(void, 'GetWindowContentRgn',
-		(WindowRef, 'theWindow', InMode),
-		(RgnHandle, 'r', InMode),
-	    condition='#if !TARGET_API_MAC_CARBON'
-	)
-	methods.append(f)
-
-	f = Method(void, 'GetWindowUpdateRgn',
-		(WindowRef, 'theWindow', InMode),
-		(RgnHandle, 'r', InMode),
-	    condition='#if !TARGET_API_MAC_CARBON'
-	)
-	methods.append(f)
-
-	f = Method(short, 'GetWindowTitleWidth',
-	    (WindowRef, 'theWindow', InMode),
-	    condition='#if !TARGET_API_MAC_CARBON'
-	)
-	methods.append(f)
+f = Method(Boolean, 'IsWindowVisible',
+    (WindowRef, 'theWindow', InMode),
+)
+methods.append(f)
 
-	f = Method(ExistingWindowPtr, 'GetNextWindow',
-		(WindowRef, 'theWindow', InMode),
-	)
-	methods.append(f)
+f = Method(Boolean, 'GetWindowZoomFlag',
+    (WindowRef, 'theWindow', InMode),
+)
+methods.append(f)
 
-	f = Method(void, 'GetWindowStandardState',
-		(WindowRef, 'theWindow', InMode),
-		(Rect, 'r', OutMode),
-	)
-	methods.append(f)
+f = Method(void, 'GetWindowStructureRgn',
+	(WindowRef, 'theWindow', InMode),
+	(RgnHandle, 'r', InMode),
+)
+methods.append(f)
 
-	f = Method(void, 'GetWindowUserState',
-		(WindowRef, 'theWindow', InMode),
-		(Rect, 'r', OutMode),
-	)
-	methods.append(f)
+f = Method(void, 'GetWindowContentRgn',
+	(WindowRef, 'theWindow', InMode),
+	(RgnHandle, 'r', InMode),
+)
+methods.append(f)
 
+f = Method(void, 'GetWindowUpdateRgn',
+	(WindowRef, 'theWindow', InMode),
+	(RgnHandle, 'r', InMode),
+)
+methods.append(f)
 
-	f = Method(void, 'SetWindowStandardState',
-		(WindowRef, 'theWindow', InMode),
-		(Rect, 'r', InMode),
-	)
-	methods.append(f)
+f = Method(short, 'GetWindowTitleWidth',
+    (WindowRef, 'theWindow', InMode),
+)
+methods.append(f)
 
-	f = Method(void, 'SetWindowUserState',
-		(WindowRef, 'theWindow', InMode),
-		(Rect, 'r', InMode),
-	)
-	methods.append(f)
+f = Method(ExistingWindowPtr, 'GetNextWindow',
+	(WindowRef, 'theWindow', InMode),
+)
+methods.append(f)
 
 # These have Mac prefixed to their name in the 3.1 universal headers,
 # so we add the old/real names by hand.