Adapted for Universal Headers 3.4

3 files changed, 8 insertions, 19 deletions

diff --git a/Mac/Modules/dlg/_Dlgmodule.c b/Mac/Modules/dlg/_Dlgmodule.c
index d21f46c..afa50cc 100644
--- a/Mac/Modules/dlg/_Dlgmodule.c
+++ b/Mac/Modules/dlg/_Dlgmodule.c
@@ -957,7 +957,6 @@ static PyMethodDef DlgObj_methods[] = {
 	 "() -> None"},
 	{"GetDialogPort", (PyCFunction)DlgObj_GetDialogPort, 1,
 	 "() -> (CGrafPtr _rv)"},
-
 	{NULL, NULL, 0}
 };
 
diff --git a/Mac/Modules/dlg/dlgscan.py b/Mac/Modules/dlg/dlgscan.py
index 2c63080..b1f9a14 100644
--- a/Mac/Modules/dlg/dlgscan.py
+++ b/Mac/Modules/dlg/dlgscan.py
@@ -54,17 +54,19 @@ class MyScanner(Scanner):
 			'SetDialogMovableModal',
 			'GetDialogControlNotificationProc',
 			'SetGrafPortOfDialog', # Funny, and probably not useful
+			# Can't find these:
+			'CloseStandardSheet',
+			'RunStandardAlert',
 			]
 
 	def makegreylist(self):
 		return [
-			('#if !TARGET_API_MAC_CARBON', [
-				'SetGrafPortOfDialog',
-			]),
 			('#if TARGET_API_MAC_CARBON', [
 				'InsertDialogItem',
 				'RemoveDialogItems',
 				'GetParamText',
+				'CloseStandardSheet',
+				'RunStandardAlert',
 			])]
 			
 	def makeblacklisttypes(self):
@@ -72,6 +74,9 @@ class MyScanner(Scanner):
 			"AlertStdAlertParamPtr",	# Too much work, for now
 			"AlertStdAlertParamRec",	# ditto
 			"AlertStdAlertParamRec_ptr",	# ditto
+			"AlertStdCFStringAlertParamPtr",	# ditto
+			"AlertStdCFStringAlertParamRec",
+			"AlertStdCFStringAlertParamRec_ptr",
 			"QTModelessCallbackProcPtr",
 			]
 
diff --git a/Mac/Modules/dlg/dlgsupport.py b/Mac/Modules/dlg/dlgsupport.py
index 88c19ac..2146906 100644
--- a/Mac/Modules/dlg/dlgsupport.py
+++ b/Mac/Modules/dlg/dlgsupport.py
@@ -257,21 +257,6 @@ execfile("dlggen.py")
 for f in functions: module.add(f)
 for f in methods: object.add(f)
 
-# Some methods that are currently macro's in C, but will be real routines
-# in MacOS 8.
-
-##f = Method(ExistingWindowPtr, 'GetDialogWindow', (DialogRef, 'dialog', InMode))
-##object.add(f)
-##f = Method(SInt16, 'GetDialogDefaultItem', (DialogRef, 'dialog', InMode))
-##object.add(f)
-##f = Method(SInt16, 'GetDialogCancelItem', (DialogRef, 'dialog', InMode))
-##object.add(f)
-##f = Method(SInt16, 'GetDialogKeyboardFocusItem', (DialogRef, 'dialog', InMode))
-##object.add(f)
-f = Method(void, 'SetGrafPortOfDialog', (DialogRef, 'dialog', InMode), 
-	condition='#if !TARGET_API_MAC_CARBON')
-object.add(f)
-
 setuseritembody = """
 	PyObject *new = NULL;