WITHOUT_FRAMEWORKS conditional code bites the dust: this was for
pre-carbon MacOS9 support.
This commit is contained in:
parent
f387e2d12b
commit
37249c5524
|
@ -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.
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in New Issue