From 37249c55248d8e355e3184d597f89aace42798ab Mon Sep 17 00:00:00 2001
From: Jack Jansen <jack.jansen@cwi.nl>
Date: Wed, 19 Nov 2003 15:32:46 +0000
Subject: [PATCH] WITHOUT_FRAMEWORKS conditional code bites the dust: this was
 for pre-carbon MacOS9 support.

---
 Include/pymactoolbox.h          | 17 -----------------
 Mac/Modules/ColorPickermodule.c |  4 ----
 Mac/Modules/Nav.c               |  4 ----
 Mac/Modules/OSATerminology.c    |  4 ----
 Mac/Modules/gestaltmodule.c     |  5 -----
 Mac/Modules/icgluemodule.c      |  4 ----
 Mac/Modules/macosmodule.c       |  8 --------
 Python/mactoolboxglue.c         |  4 ----
 8 files changed, 50 deletions(-)

diff --git a/Include/pymactoolbox.h b/Include/pymactoolbox.h
index 916dac71486..cb658626970 100644
--- a/Include/pymactoolbox.h
+++ b/Include/pymactoolbox.h
@@ -7,25 +7,8 @@
 	extern "C" {
 #endif
 
-#ifdef WITHOUT_FRAMEWORKS
-#include <Memory.h>
-#include <Dialogs.h>
-#include <Menus.h>
-#include <Controls.h>
-#include <Components.h>
-#include <Lists.h>
-#include <Movies.h>
-#include <Errors.h>
-#include <CFBase.h>
-#include <CFArray.h>
-#include <CFData.h>
-#include <CFDictionary.h>
-#include <CFString.h>
-#include <CFURL.h>
-#else
 #include <Carbon/Carbon.h>
 #include <QuickTime/QuickTime.h>
-#endif
 
 /*
 ** Helper routines for error codes and such.
diff --git a/Mac/Modules/ColorPickermodule.c b/Mac/Modules/ColorPickermodule.c
index 12a632f82a5..ec0afa74c5c 100644
--- a/Mac/Modules/ColorPickermodule.c
+++ b/Mac/Modules/ColorPickermodule.c
@@ -21,11 +21,7 @@ PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
 
-#ifdef WITHOUT_FRAMEWORKS
-#include <ColorPicker.h>
-#else
 #include <Carbon/Carbon.h>
-#endif
 #include "Python.h"
 #include "macglue.h"
 #include "pymactoolbox.h"
diff --git a/Mac/Modules/Nav.c b/Mac/Modules/Nav.c
index a679df7bb84..54f852fb315 100644
--- a/Mac/Modules/Nav.c
+++ b/Mac/Modules/Nav.c
@@ -32,11 +32,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "Python.h"
 #include "macglue.h"
 #include "pymactoolbox.h"
-#ifdef WITHOUT_FRAMEWORKS
-#include <Navigation.h>
-#else
 #include <Carbon/Carbon.h>
-#endif
 
 static PyObject *ErrorObject;
 
diff --git a/Mac/Modules/OSATerminology.c b/Mac/Modules/OSATerminology.c
index 2d8b1e2db76..a3ed4b4340a 100644
--- a/Mac/Modules/OSATerminology.c
+++ b/Mac/Modules/OSATerminology.c
@@ -9,11 +9,7 @@
 #include "Python.h"
 #include "macglue.h"
 
-#ifdef WITHOUT_FRAMEWORKS
-#include <OpenScripting.h>
-#else
 #include <Carbon/Carbon.h>
-#endif
 
 static PyObject *
 PyOSA_GetAppTerminology(PyObject* self, PyObject* args)
diff --git a/Mac/Modules/gestaltmodule.c b/Mac/Modules/gestaltmodule.c
index 11946a5ff7f..8097de82dc8 100644
--- a/Mac/Modules/gestaltmodule.c
+++ b/Mac/Modules/gestaltmodule.c
@@ -27,12 +27,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "Python.h"
 #include "macglue.h"
 
-#ifdef WITHOUT_FRAMEWORKS
-#include <Types.h>
-#include <Gestalt.h>
-#else
 #include <Carbon/Carbon.h>
-#endif
 
 static PyObject *
 gestalt_gestalt(PyObject *self, PyObject *args)
diff --git a/Mac/Modules/icgluemodule.c b/Mac/Modules/icgluemodule.c
index 56c20a3f073..ee42c59fc04 100644
--- a/Mac/Modules/icgluemodule.c
+++ b/Mac/Modules/icgluemodule.c
@@ -34,11 +34,7 @@ PERFORMANCE OF THIS SOFTWARE.
 
 extern int ResObj_Convert(PyObject *, Handle *); /* From Resmodule.c */
 
-#ifdef WITHOUT_FRAMEWORKS
-#include <InternetConfig.h>
-#else
 #include <Carbon/Carbon.h>
-#endif
 
 static PyObject *ErrorObject;
 
diff --git a/Mac/Modules/macosmodule.c b/Mac/Modules/macosmodule.c
index 3217f86e6b8..242cf57e684 100644
--- a/Mac/Modules/macosmodule.c
+++ b/Mac/Modules/macosmodule.c
@@ -28,16 +28,8 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "macglue.h"
 #include "pythonresources.h"
 
-#ifdef WITHOUT_FRAMEWORKS
-#include <Windows.h>
-#include <Files.h>
-#include <LowMem.h>
-#include <Sound.h>
-#include <Events.h>
-#else
 #include <Carbon/Carbon.h>
 #include <ApplicationServices/ApplicationServices.h>
-#endif
 
 static PyObject *MacOS_Error; /* Exception MacOS.Error */
 
diff --git a/Python/mactoolboxglue.c b/Python/mactoolboxglue.c
index 8b31f7f619e..bf101fd88a9 100644
--- a/Python/mactoolboxglue.c
+++ b/Python/mactoolboxglue.c
@@ -26,10 +26,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "Python.h"
 #include "pymactoolbox.h"
 
-#ifdef WITHOUT_FRAMEWORKS
-#include <Script.h>
-#include <Resources.h>
-#endif
 
 /*
 ** Find out what the current script is.