diff options
| author | wolfsuit <wolfsuit> | 2001-10-17 07:01:59 (GMT) |
|---|---|---|
| committer | wolfsuit <wolfsuit> | 2001-10-17 07:01:59 (GMT) |
| commit | 6b35d5ac810fe303bef0457ef2341b1e6e37381b (patch) | |
| tree | 0bcbcb93b0bf6989564775472e66ffd40df05f1e /xlib/X11 | |
| parent | 0b64d45c003691be2d70c9418f49868d3e9a3660 (diff) | |
| download | tk-6b35d5ac810fe303bef0457ef2341b1e6e37381b.zip tk-6b35d5ac810fe303bef0457ef2341b1e6e37381b.tar.gz tk-6b35d5ac810fe303bef0457ef2341b1e6e37381b.tar.bz2 | |
Replace MAC_OSX_TCL with MAC_OSX_TK for all windowing specific things. This is so we can separate the macosx specific additions to Tcl (which are added ON to the Unix core) from the Aqua additions (which are orthogonal to Unix - which itself is overloaded to mean X11 as well...)
Diffstat (limited to 'xlib/X11')
| -rw-r--r-- | xlib/X11/X.h | 4 | ||||
| -rw-r--r-- | xlib/X11/Xlib.h | 8 | ||||
| -rw-r--r-- | xlib/X11/Xutil.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/xlib/X11/X.h b/xlib/X11/X.h index a86fd26..7755cac 100644 --- a/xlib/X11/X.h +++ b/xlib/X11/X.h @@ -33,7 +33,7 @@ SOFTWARE. #define X_PROTOCOL 11 /* current protocol version */ #define X_PROTOCOL_REVISION 0 /* current minor version */ -#if defined(MAC_TCL) || defined(MAC_OSX_TCL) +#if defined(MAC_TCL) || defined(MAC_OSX_TK) # define Cursor XCursor # define Region XRegion #endif @@ -669,7 +669,7 @@ are reserved in the protocol for errors and replies. */ #define LSBFirst 0 #define MSBFirst 1 -#if defined(MAC_TCL) || defined(MAC_OSX_TCL) +#if defined(MAC_TCL) || defined(MAC_OSX_TK) # undef Cursor # undef Region #endif diff --git a/xlib/X11/Xlib.h b/xlib/X11/Xlib.h index 7edbebc..252b11d 100644 --- a/xlib/X11/Xlib.h +++ b/xlib/X11/Xlib.h @@ -27,7 +27,7 @@ #define XlibSpecificationRelease 5 -#if !defined(MAC_TCL) && !defined(MAC_OSX_TCL) +#if !defined(MAC_TCL) && !defined(MAC_OSX_TK) # include <X11/X.h> #endif #ifdef MAC_TCL @@ -35,7 +35,7 @@ # define Cursor XCursor # define Region XRegion #endif -#ifdef MAC_OSX_TCL +#ifdef MAC_OSX_TK # include <X11/X.h> # define Cursor XCursor # define Region XRegion @@ -64,7 +64,7 @@ typedef unsigned long wchar_t; typedef char *XPointer; #define Bool int -#if defined(MAC_TCL) || defined(MAC_OSX_TCL) +#if defined(MAC_TCL) || defined(MAC_OSX_TK) /* Use define rather than typedef, since may need to undefine this later */ #define Status int #else @@ -1206,7 +1206,7 @@ _XFUNCPROTOBEGIN _XFUNCPROTOEND -#if defined(MAC_TCL) || defined(MAC_OSX_TCL) +#if defined(MAC_TCL) || defined(MAC_OSX_TK) # undef Cursor # undef Region #endif diff --git a/xlib/X11/Xutil.h b/xlib/X11/Xutil.h index 6913c12..8812c80 100644 --- a/xlib/X11/Xutil.h +++ b/xlib/X11/Xutil.h @@ -29,7 +29,7 @@ SOFTWARE. /* You must include <X11/Xlib.h> before including this file */ -#if defined(MAC_TCL) || defined(MAC_OSX_TCL) +#if defined(MAC_TCL) || defined(MAC_OSX_TK) # define Region XRegion #endif @@ -848,7 +848,7 @@ extern void XXorRegion( _XFUNCPROTOEND -#if defined(MAC_TCL) || defined(MAC_OSX_TCL) +#if defined(MAC_TCL) || defined(MAC_OSX_TK) # undef Region #endif |