From: Brendan Shanks bshanks@codeweavers.com
The Mac OS X 10.6 SDK was the last version to define these QuickDraw functions. --- dlls/win32u/freetype.c | 22 ----------------- dlls/winemac.drv/macdrv_cocoa.h | 44 --------------------------------- dlls/winspool.drv/cups.c | 44 --------------------------------- 3 files changed, 110 deletions(-)
diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index 2eea7535466..c638a6addfb 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -47,25 +47,14 @@ #define GetCurrentThread __carbon_GetCurrentThread #define GetCurrentProcess __carbon_GetCurrentProcess #define GetProcessInformation __carbon_GetProcessInformation -#define AnimatePalette __carbon_AnimatePalette #define DeleteMenu __carbon_DeleteMenu #define DrawMenu __carbon_DrawMenu #define DrawMenuBar __carbon_DrawMenuBar #define EnableMenuItem __carbon_EnableMenuItem -#define EqualRgn __carbon_EqualRgn -#define FillRgn __carbon_FillRgn -#define FrameRgn __carbon_FrameRgn #define GetMenu __carbon_GetMenu -#define GetPixel __carbon_GetPixel -#define InvertRgn __carbon_InvertRgn #define IsWindowVisible __carbon_IsWindowVisible -#define LineTo __carbon_LineTo #define MoveWindow __carbon_MoveWindow -#define OffsetRgn __carbon_OffsetRgn -#define PaintRgn __carbon_PaintRgn #define Polygon __carbon_Polygon -#define ResizePalette __carbon_ResizePalette -#define SetRectRgn __carbon_SetRectRgn #define ShowWindow __carbon_ShowWindow #include <Carbon/Carbon.h> #undef LoadResource @@ -74,26 +63,15 @@ #undef _CDECL #undef GetCurrentProcess #undef GetProcessInformation -#undef AnimatePalette #undef CheckMenuItem #undef DeleteMenu #undef DrawMenu #undef DrawMenuBar #undef EnableMenuItem -#undef EqualRgn -#undef FillRgn -#undef FrameRgn #undef GetMenu -#undef GetPixel -#undef InvertRgn #undef IsWindowVisible -#undef LineTo #undef MoveWindow -#undef OffsetRgn -#undef PaintRgn #undef Polygon -#undef ResizePalette -#undef SetRectRgn #undef ShowWindow #endif /* __APPLE__ */
diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 9807d4e53fc..82a577fed37 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -32,29 +32,7 @@ #define GetCurrentThread MacGetCurrentThread #define GetProcessInformation MacGetProcessInformation #define LoadResource MacLoadResource -#define AnimatePalette MacAnimatePalette -#define EqualRgn MacEqualRgn -#define FillRgn MacFillRgn -#define FrameRgn MacFrameRgn -#define GetPixel MacGetPixel -#define InvertRgn MacInvertRgn -#define LineTo MacLineTo -#define OffsetRgn MacOffsetRgn -#define PaintRgn MacPaintRgn #define Polygon MacPolygon -#define ResizePalette MacResizePalette -#define SetRectRgn MacSetRectRgn -#define EqualRect MacEqualRect -#define FillRect MacFillRect -#define FrameRect MacFrameRect -#define GetCursor MacGetCursor -#define InvertRect MacInvertRect -#define OffsetRect MacOffsetRect -#define PtInRect MacPtInRect -#define SetCursor MacSetCursor -#define SetRect MacSetRect -#define ShowCursor MacShowCursor -#define UnionRect MacUnionRect
#include <ApplicationServices/ApplicationServices.h>
@@ -62,29 +40,7 @@ #undef GetCurrentThread #undef GetProcessInformation #undef LoadResource -#undef AnimatePalette -#undef EqualRgn -#undef FillRgn -#undef FrameRgn -#undef GetPixel -#undef InvertRgn -#undef LineTo -#undef OffsetRgn -#undef PaintRgn #undef Polygon -#undef ResizePalette -#undef SetRectRgn -#undef EqualRect -#undef FillRect -#undef FrameRect -#undef GetCursor -#undef InvertRect -#undef OffsetRect -#undef PtInRect -#undef SetCursor -#undef SetRect -#undef ShowCursor -#undef UnionRect
#include <pthread.h>
diff --git a/dlls/winspool.drv/cups.c b/dlls/winspool.drv/cups.c index 8cdc193d33a..65b399ab6bf 100644 --- a/dlls/winspool.drv/cups.c +++ b/dlls/winspool.drv/cups.c @@ -46,57 +46,13 @@ #define GetCurrentThread GetCurrentThread_Mac #define GetProcessInformation GetProcessInformation_Mac #define LoadResource LoadResource_Mac -#define AnimatePalette AnimatePalette_Mac -#define EqualRgn EqualRgn_Mac -#define FillRgn FillRgn_Mac -#define FrameRgn FrameRgn_Mac -#define GetPixel GetPixel_Mac -#define InvertRgn InvertRgn_Mac -#define LineTo LineTo_Mac -#define OffsetRgn OffsetRgn_Mac -#define PaintRgn PaintRgn_Mac #define Polygon Polygon_Mac -#define ResizePalette ResizePalette_Mac -#define SetRectRgn SetRectRgn_Mac -#define EqualRect EqualRect_Mac -#define FillRect FillRect_Mac -#define FrameRect FrameRect_Mac -#define GetCursor GetCursor_Mac -#define InvertRect InvertRect_Mac -#define OffsetRect OffsetRect_Mac -#define PtInRect PtInRect_Mac -#define SetCursor SetCursor_Mac -#define SetRect SetRect_Mac -#define ShowCursor ShowCursor_Mac -#define UnionRect UnionRect_Mac #include <ApplicationServices/ApplicationServices.h> #undef GetCurrentProcess #undef GetCurrentThread #undef GetProcessInformation #undef LoadResource -#undef AnimatePalette -#undef EqualRgn -#undef FillRgn -#undef FrameRgn -#undef GetPixel -#undef InvertRgn -#undef LineTo -#undef OffsetRgn -#undef PaintRgn #undef Polygon -#undef ResizePalette -#undef SetRectRgn -#undef EqualRect -#undef FillRect -#undef FrameRect -#undef GetCursor -#undef InvertRect -#undef OffsetRect -#undef PtInRect -#undef SetCursor -#undef SetRect -#undef ShowCursor -#undef UnionRect #endif
#include "ntstatus.h"