From f70e069a3d1438b22c18181269cc03d448032bd5 Mon Sep 17 00:00:00 2001 From: dgp Date: Tue, 10 Jul 2007 21:54:28 +0000 Subject: merge updates from HEAD --- ChangeLog | 25 ++++- macosx/tkMacOSXDraw.c | 75 +++++---------- macosx/tkMacOSXMouseEvent.c | 224 +++++++++++++++++++++++++------------------ macosx/tkMacOSXWindowEvent.c | 27 +++--- unix/Makefile.in | 22 +++-- 5 files changed, 209 insertions(+), 164 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9040968..30807ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,29 @@ +2007-07-09 Jeff Hobbs + + * unix/Makefile.in: clarify what the headers installed are, and + add ttkTheme.h and ttkDecls.h to private headers (later public). + +2007-07-09 Daniel Steffen + + * macosx/tkMacOSXWindowEvent.c (Tk_MacOSXIsAppInFront): use process mgr + * macosx/tkMacOSXMouseEvent.c: to determine if + app is in front instead of relying on activate/deactivate events (which + may arrive after this info is needed, e.g. during window drag/click + activation); replace other process mgr use to get this info with calls + to Tk_MacOSXIsAppInFront(). + + * macosx/tkMacOSXMouseEvent.c (TkMacOSXProcessMouseEvent): correct + window click activation, titlebar click handling and background window + dragging/growing in the presence of grabs or window-/app-modal windows; + fix window click activation bringing all other app windows to front. + + * macosx/tkMacOSXDraw.c (TkPutImage): handle non-native XImage byte and + bit orders; reverse bits via xBitReverseTable instead of InvertByte(). + 2007-07-06 Joe English - * library/ttk/aquaTheme.tcl: Set -anchor w for TMenubuttons [#1614540] + * library/ttk/aquaTheme.tcl: Set -anchor w for TMenubuttons + [Bug 1614540]. 2007-07-04 Andreas Kupries diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c index 425ea5e..5438d4b 100644 --- a/macosx/tkMacOSXDraw.c +++ b/macosx/tkMacOSXDraw.c @@ -12,11 +12,12 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXDraw.c,v 1.21.2.6 2007/07/03 02:28:14 dgp Exp $ + * RCS: @(#) $Id: tkMacOSXDraw.c,v 1.21.2.7 2007/07/10 21:54:28 dgp Exp $ */ #include "tkMacOSXPrivate.h" #include "tkMacOSXDebug.h" +#include "xbytes.h" /* #ifdef TK_MAC_DEBUG @@ -51,7 +52,7 @@ static int useThemedFrame = 0; /* * Prototypes for functions used only in this file. */ -static unsigned char InvertByte(unsigned char data); + static void ClipToGC(Drawable d, GC gc, CGrafPtr port, RgnHandle clipRgn); static void NoQDClip(CGrafPtr port); @@ -373,7 +374,7 @@ TkPutImage( } bitmap.bounds.top = bitmap.bounds.left = 0; bitmap.bounds.bottom = (short) image->height; - dataPtr = image->data; + dataPtr = image->data + image->xoffset; do { if (slices) { bitmap.bounds.right = bitmap.bounds.left + sliceWidth; @@ -387,15 +388,26 @@ TkPutImage( newData = ckalloc(image->height * (sliceRowBytes+odd)); } newPtr = newData; - for (i = 0; i < image->height; i++) { - for (j = 0; j < sliceRowBytes; j++) { - *newPtr = InvertByte((unsigned char) *oldPtr); - newPtr++; oldPtr++; + if (image->bitmap_bit_order != MSBFirst) { + for (i = 0; i < image->height; i++) { + for (j = 0; j < sliceRowBytes; j++) { + *newPtr = xBitReverseTable[(unsigned char)*oldPtr]; + newPtr++; oldPtr++; + } + if (odd) { + *newPtr++ = 0; + } + oldPtr += rowBytes - sliceRowBytes; } - if (odd) { - *newPtr++ = 0; + } else { + for (i = 0; i < image->height; i++) { + memcpy(newPtr, oldPtr, sliceRowBytes); + newPtr += sliceRowBytes; + if (odd) { + *newPtr++ = 0; + } + oldPtr += rowBytes; } - oldPtr += rowBytes - sliceRowBytes; } bitmap.baseAddr = newData; bitmap.rowBytes = sliceRowBytes + odd; @@ -426,11 +438,8 @@ TkPutImage( pixmap.pixelSize = 32; pixmap.cmpCount = 3; pixmap.cmpSize = 8; -#ifdef WORDS_BIGENDIAN - pixmap.pixelFormat = k32ARGBPixelFormat; -#else - pixmap.pixelFormat = k32BGRAPixelFormat; -#endif + pixmap.pixelFormat = image->byte_order == MSBFirst ? + k32ARGBPixelFormat : k32BGRAPixelFormat; pixmap.pmTable = NULL; pixmap.pmExt = 0; if (rowBytes > maxRowBytes) { @@ -443,7 +452,7 @@ TkPutImage( } sliceWidth = (long) image->width * maxRowBytes / rowBytes; lastSliceWidth = image->width - (sliceWidth * slices); - dataPtr = image->data; + dataPtr = image->data + image->xoffset; newData = (char *) ckalloc(image->height * sliceRowBytes); do { if (slices) { @@ -471,7 +480,7 @@ TkPutImage( ckfree(newData); } else { pixmap.bounds.right = (short) image->width; - pixmap.baseAddr = image->data; + pixmap.baseAddr = image->data + image->xoffset; pixmap.rowBytes = rowBytes | 0x8000; CopyBits((BitMap*) &pixmap, dstBit, srcPtr, dstPtr, srcCopy, NULL); } @@ -1881,38 +1890,6 @@ TkMacOSXMakeStippleMap( /* *---------------------------------------------------------------------- * - * InvertByte -- - * - * This function reverses the bits in the passed in Byte of data. - * - * Results: - * The incoming byte in reverse bit order. - * - * Side effects: - * None. - * - *---------------------------------------------------------------------- - */ - -static unsigned char -InvertByte( - unsigned char data) /* Byte of data. */ -{ - unsigned char i; - unsigned char mask = 1, result = 0; - - for (i = (1 << 7); i != 0; i /= 2) { - if (data & mask) { - result |= i; - } - mask = mask << 1; - } - return result; -} - -/* - *---------------------------------------------------------------------- - * * TkpDrawHighlightBorder -- * * This procedure draws a rectangular ring around the outside of diff --git a/macosx/tkMacOSXMouseEvent.c b/macosx/tkMacOSXMouseEvent.c index fd5ad4e..8049432 100644 --- a/macosx/tkMacOSXMouseEvent.c +++ b/macosx/tkMacOSXMouseEvent.c @@ -54,7 +54,7 @@ * software in accordance with the terms specified in this * license. * - * RCS: @(#) $Id: tkMacOSXMouseEvent.c,v 1.29.2.2 2007/07/01 17:31:37 dgp Exp $ + * RCS: @(#) $Id: tkMacOSXMouseEvent.c,v 1.29.2.3 2007/07/10 21:54:28 dgp Exp $ */ #include "tkMacOSXPrivate.h" @@ -83,13 +83,15 @@ static int gEatButtonUp = 0; /* 1 if we need to eat the next up event */ * Declarations of functions used only in this file. */ -static void BringWindowForward(WindowRef wRef, Boolean isFrontProcess); +static void BringWindowForward(WindowRef wRef, int isFrontProcess, + int frontWindowOnly); static int GeneratePollingEvents(MouseEventData * medPtr); static int GenerateMouseWheelEvent(MouseEventData * medPtr); static int GenerateButtonEvent(MouseEventData * medPtr); static int GenerateToolbarButtonEvent(MouseEventData * medPtr); static int HandleWindowTitlebarMouseDown(MouseEventData * medPtr, Tk_Window tkwin); static unsigned int ButtonModifiers2State(UInt32 buttonState, UInt32 keyModifiers); +static Tk_Window GetGrabWindowForWindow(Tk_Window tkwin); static int TkMacOSXGetEatButtonUp(void); static void TkMacOSXSetEatButtonUp(int f); @@ -121,8 +123,7 @@ TkMacOSXProcessMouseEvent(TkMacOSXEvent *eventPtr, MacEventStatus * statusPtr) TkDisplay * dispPtr; OSStatus err; MouseEventData mouseEventData, * medPtr = &mouseEventData; - ProcessSerialNumber frontPsn, ourPsn = {0, kCurrentProcess}; - Boolean isFrontProcess = true; + int isFrontProcess; switch (eventPtr->eKind) { case kEventMouseDown: @@ -163,7 +164,8 @@ TkMacOSXProcessMouseEvent(TkMacOSXEvent *eventPtr, MacEventStatus * statusPtr) return false; } if (eventPtr->eKind == kEventMouseDown) { - if (IsWindowPathSelectEvent(medPtr->whichWin, eventPtr->eventRef)) { + if (IsWindowActive(medPtr->whichWin) && IsWindowPathSelectEvent( + medPtr->whichWin, eventPtr->eventRef)) { ChkErr(WindowPathSelect, medPtr->whichWin, NULL, NULL); return false; } @@ -178,10 +180,7 @@ TkMacOSXProcessMouseEvent(TkMacOSXEvent *eventPtr, MacEventStatus * statusPtr) } } } - err = ChkErr(GetFrontProcess, &frontPsn); - if (err == noErr) { - ChkErr(SameProcess, &frontPsn, &ourPsn, &isFrontProcess); - } + isFrontProcess = Tk_MacOSXIsAppInFront(); if (isFrontProcess) { medPtr->state = ButtonModifiers2State(GetCurrentEventButtonState(), GetCurrentEventKeyModifiers()); @@ -271,36 +270,29 @@ TkMacOSXProcessMouseEvent(TkMacOSXEvent *eventPtr, MacEventStatus * statusPtr) if (!(TkpIsWindowFloating(medPtr->whichWin)) && (medPtr->whichWin != medPtr->activeNonFloating || !isFrontProcess)) { - Tk_Window grabWin = TkMacOSXGetCapture(); - if (!grabWin) { - int grabState = TkGrabState((TkWindow*)tkwin); - if (grabState != TK_GRAB_NONE && grabState != TK_GRAB_IN_TREE) { - /* Now we want to set the focus to the local grabWin */ + int frontWindowOnly = 1; + int cmdDragGrow = ((medPtr->windowPart == inDrag || + medPtr->windowPart == inGrow) && medPtr->state & Mod1Mask); + + if (!cmdDragGrow) { + Tk_Window grabWin = GetGrabWindowForWindow(tkwin); + + frontWindowOnly = !grabWin; + if (grabWin && grabWin != tkwin) { TkMacOSXSetEatButtonUp(true); - grabWin = (Tk_Window) (((TkWindow*)tkwin)->dispPtr->grabWinPtr); BringWindowForward(TkMacOSXDrawableWindow( - ((TkWindow*)grabWin)->window), isFrontProcess); - statusPtr->stopProcessing = 1; + ((TkWindow*)grabWin)->window), isFrontProcess, + frontWindowOnly); return false; } } - if (grabWin && grabWin != tkwin) { - TkWindow * tkw, * grb; - tkw = (TkWindow *)tkwin; - grb = (TkWindow *)grabWin; - /* Now we want to set the focus to the global grabWin */ - TkMacOSXSetEatButtonUp(true); - BringWindowForward(TkMacOSXDrawableWindow( - ((TkWindow*)grabWin)->window), isFrontProcess); - statusPtr->stopProcessing = 1; - return false; - } /* * Clicks in the titlebar widgets are handled without bringing the * window forward. */ if ((result = HandleWindowTitlebarMouseDown(medPtr, tkwin)) != -1) { + statusPtr->stopProcessing = 1; return result; } else { /* @@ -313,11 +305,10 @@ TkMacOSXProcessMouseEvent(TkMacOSXEvent *eventPtr, MacEventStatus * statusPtr) * Allow background window dragging & growing with Command * down. */ - if (!((medPtr->windowPart == inDrag || - medPtr->windowPart == inGrow) && - medPtr->state & Mod1Mask)) { + if (!cmdDragGrow) { TkMacOSXSetEatButtonUp(true); - BringWindowForward(medPtr->whichWin, isFrontProcess); + BringWindowForward(medPtr->whichWin, isFrontProcess, + frontWindowOnly); } /* * Allow dragging & growing of windows that were/are in the @@ -331,6 +322,7 @@ TkMacOSXProcessMouseEvent(TkMacOSXEvent *eventPtr, MacEventStatus * statusPtr) } } else { if ((result = HandleWindowTitlebarMouseDown(medPtr, tkwin)) != -1) { + statusPtr->stopProcessing = 1; return result; } } @@ -399,42 +391,67 @@ TkMacOSXProcessMouseEvent(TkMacOSXEvent *eventPtr, MacEventStatus * statusPtr) int HandleWindowTitlebarMouseDown(MouseEventData * medPtr, Tk_Window tkwin) { - int result = 0; + int result = INT_MAX; - TkMacOSXTrackingLoop(1); switch (medPtr->windowPart) { case inGoAway: - if (TrackGoAway(medPtr->whichWin, medPtr->global)) { - if (tkwin) { - TkGenWMDestroyEvent(tkwin); - result = 1; - } - } - break; case inCollapseBox: - if (TrackBox(medPtr->whichWin, medPtr->global, medPtr->windowPart)) { - if (tkwin) { - TkpWmSetState((TkWindow *)tkwin, IconicState); - result = 1; - } - } - break; case inZoomIn: case inZoomOut: - if (TrackBox(medPtr->whichWin, medPtr->global, medPtr->windowPart)) { - result = TkMacOSXZoomToplevel(medPtr->whichWin, medPtr->windowPart); - } - break; case inToolbarButton: - if (TrackBox(medPtr->whichWin, medPtr->global, medPtr->windowPart)) { - result = GenerateToolbarButtonEvent(medPtr); + if (!IsWindowActive(medPtr->whichWin)) { + WindowRef frontWindow = FrontNonFloatingWindow(); + WindowModality frontWindowModality = kWindowModalityNone; + + if (frontWindow && frontWindow != medPtr->whichWin) { + ChkErr(GetWindowModality, frontWindow, + &frontWindowModality, NULL); + } + if (frontWindowModality == kWindowModalityAppModal) { + result = 0; + } } break; default: result = -1; break; } - TkMacOSXTrackingLoop(0); + + if (result == INT_MAX) { + result = 0; + TkMacOSXTrackingLoop(1); + switch (medPtr->windowPart) { + case inGoAway: + if (TrackGoAway(medPtr->whichWin, medPtr->global) && tkwin) { + TkGenWMDestroyEvent(tkwin); + result = 1; + } + break; + case inCollapseBox: + if (TrackBox(medPtr->whichWin, medPtr->global, + medPtr->windowPart) && tkwin) { + TkpWmSetState((TkWindow *)tkwin, IconicState); + result = 1; + } + break; + case inZoomIn: + case inZoomOut: + if (TrackBox(medPtr->whichWin, medPtr->global, + medPtr->windowPart)) { + result = TkMacOSXZoomToplevel(medPtr->whichWin, + medPtr->windowPart); + } + break; + case inToolbarButton: + if (TrackBox(medPtr->whichWin, medPtr->global, + medPtr->windowPart)) { + result = GenerateToolbarButtonEvent(medPtr); + } + break; + } + TkMacOSXTrackingLoop(0); + } + return result; } @@ -527,18 +544,27 @@ GeneratePollingEvents(MouseEventData * medPtr) static void BringWindowForward( WindowRef wRef, - Boolean isFrontProcess) + int isFrontProcess, + int frontWindowOnly) { + if (wRef && !TkpIsWindowFloating(wRef) && IsValidWindowPtr(wRef)) { + WindowRef frontWindow = FrontNonFloatingWindow(); + WindowModality frontWindowModality = kWindowModalityNone; + + if (frontWindow && frontWindow != wRef) { + ChkErr(GetWindowModality, frontWindow, &frontWindowModality, NULL); + } + if (frontWindowModality != kWindowModalityAppModal) { + SelectWindow(wRef); + } else { + frontWindowOnly = 0; + } + } if (!isFrontProcess) { ProcessSerialNumber ourPsn = {0, kCurrentProcess}; - ChkErr(SetFrontProcess, &ourPsn); - } - - if (!TkpIsWindowFloating(wRef)) { - if (IsValidWindowPtr(wRef)) { - SelectWindow(wRef); - } + ChkErr(SetFrontProcessWithOptions, &ourPsn, frontWindowOnly ? + kSetFrontProcessFrontWindowOnly : 0); } } @@ -547,8 +573,8 @@ BringWindowForward( * * TkMacOSXBringWindowForward -- * - * Bring this background window to the front (wrapper around - * BringWindowForward()). + * Bring this window to the front in response to a mouse click. If + * a grab is in effect, bring the grab window to the front instead. * * Results: * None. @@ -563,15 +589,48 @@ void TkMacOSXBringWindowForward( WindowRef wRef) { - OSStatus err; - ProcessSerialNumber frontPsn, ourPsn = {0, kCurrentProcess}; - Boolean isFrontProcess = true; + TkDisplay *dispPtr = TkGetDisplayList(); + Tk_Window tkwin = Tk_IdToWindow(dispPtr->display,TkMacOSXGetXWindow(wRef)); + Tk_Window grabWin = GetGrabWindowForWindow(tkwin); - err = ChkErr(GetFrontProcess, &frontPsn); - if (err == noErr) { - ChkErr(SameProcess, &frontPsn, &ourPsn, &isFrontProcess); + if (grabWin && grabWin != tkwin) { + wRef = TkMacOSXDrawableWindow(((TkWindow*)grabWin)->window); } - BringWindowForward(wRef, isFrontProcess); + TkMacOSXSetEatButtonUp(true); + BringWindowForward(wRef, Tk_MacOSXIsAppInFront(), !grabWin); +} + +/* + *---------------------------------------------------------------------- + * + * GetGrabWindowForWindow -- + * + * Get the grab window for the given window, if any. + * + * Results: + * Grab Tk_Window or None. + * + * Side effects: + * None. + * + *---------------------------------------------------------------------- + */ + +Tk_Window +GetGrabWindowForWindow( + Tk_Window tkwin) +{ + Tk_Window grabWin = TkMacOSXGetCapture(); + + if (!grabWin) { + int grabState = TkGrabState((TkWindow*)tkwin); + + if (grabState != TK_GRAB_NONE && grabState != TK_GRAB_IN_TREE) { + grabWin = (Tk_Window) (((TkWindow*)tkwin)->dispPtr->grabWinPtr); + } + } + + return grabWin; } /* @@ -694,16 +753,8 @@ EventModifiers TkMacOSXModifierState(void) { UInt32 keyModifiers; - Boolean isFrontProcess = false; - - if (GetCurrentEvent()) { - ProcessSerialNumber frontPsn, ourPsn = {0, kCurrentProcess}; - OSStatus err = ChkErr(GetFrontProcess, &frontPsn); + int isFrontProcess = (GetCurrentEvent() && Tk_MacOSXIsAppInFront()); - if (err == noErr) { - ChkErr(SameProcess, &frontPsn, &ourPsn, &isFrontProcess); - } - } keyModifiers = isFrontProcess ? GetCurrentEventKeyModifiers() : GetCurrentKeyModifiers(); @@ -731,16 +782,7 @@ unsigned int TkMacOSXButtonKeyState(void) { UInt32 buttonState = 0, keyModifiers; - Boolean isFrontProcess = false; - - if (GetCurrentEvent()) { - ProcessSerialNumber frontPsn, ourPsn = {0, kCurrentProcess}; - OSStatus err = ChkErr(GetFrontProcess, &frontPsn); - - if (err == noErr) { - ChkErr(SameProcess, &frontPsn, &ourPsn, &isFrontProcess); - } - } + int isFrontProcess = (GetCurrentEvent() && Tk_MacOSXIsAppInFront()); if (!TkMacOSXGetEatButtonUp()) { buttonState = isFrontProcess ? GetCurrentEventButtonState() : diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c index 5a12df7..ff7bbb7 100644 --- a/macosx/tkMacOSXWindowEvent.c +++ b/macosx/tkMacOSXWindowEvent.c @@ -54,7 +54,7 @@ * software in accordance with the terms specified in this * license. * - * RCS: @(#) $Id: tkMacOSXWindowEvent.c,v 1.22.2.5 2007/07/01 17:31:37 dgp Exp $ + * RCS: @(#) $Id: tkMacOSXWindowEvent.c,v 1.22.2.6 2007/07/10 21:54:28 dgp Exp $ */ #include "tkMacOSXPrivate.h" @@ -69,14 +69,6 @@ */ /* - * Declarations of global variables defined in this file. - */ - -static int tkMacOSXAppInFront = true; /* Boolean variable for determining if - * we are the frontmost app. Only set - * in TkMacOSXProcessApplicationEvent - */ -/* * Declaration of functions used only in this file */ @@ -99,7 +91,7 @@ static void ClearPort(CGrafPtr port, RgnHandle updateRgn); * 0. * * Side effects: - * Hide or reveal floating windows, and set tkMacOSXAppInFront. + * Hide or reveal floating windows. * *---------------------------------------------------------------------- */ @@ -121,12 +113,10 @@ TkMacOSXProcessApplicationEvent( switch (eventPtr->eKind) { case kEventAppActivated: - tkMacOSXAppInFront = true; ShowFloatingWindows(); break; case kEventAppDeactivated: TkSuspendClipboard(); - tkMacOSXAppInFront = false; HideFloatingWindows(); break; case kEventAppQuit: @@ -335,10 +325,10 @@ TkMacOSXProcessWindowEvent( } break; case kEventWindowDragStarted: - TkMacOSXTrackingLoop(1); if (!(TkMacOSXModifierState() & cmdKey)) { TkMacOSXBringWindowForward(whichWindow); } + TkMacOSXTrackingLoop(1); break; case kEventWindowDragCompleted: { Rect maxBounds, bounds, strWidths; @@ -925,7 +915,16 @@ TkWmProtocolEventProc( int Tk_MacOSXIsAppInFront(void) { - return tkMacOSXAppInFront; + OSStatus err; + ProcessSerialNumber frontPsn, ourPsn = {0, kCurrentProcess}; + Boolean isFrontProcess = true; + + err = ChkErr(GetFrontProcess, &frontPsn); + if (err == noErr) { + ChkErr(SameProcess, &frontPsn, &ourPsn, &isFrontProcess); + } + + return (isFrontProcess == true); } /* diff --git a/unix/Makefile.in b/unix/Makefile.in index 9bed599..12eabb4 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.128.2.2 2007/06/04 15:19:01 dgp Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.128.2.3 2007/07/10 21:54:29 dgp Exp $ # Current Tk version; used in various names. @@ -540,9 +540,16 @@ AQUA_PRIVATE_HDRS = $(MAC_OSX_DIR)/tkMacOSXPort.h $(MAC_OSX_DIR)/tkMacOSXInt.h X11_PRIVATE_HDRS = $(UNIX_DIR)/tkUnixPort.h $(UNIX_DIR)/tkUnixInt.h -HDRS = bltList.h \ - default.h ks_names.h tkPatch.h tk.h tkButton.h tkCanvas.h tkInt.h \ - tkPort.h tkScrollbar.h tkText.h +# Currently private, eventually public +TTK_HDRS = $(TTK_DIR)/ttkTheme.h $(TTK_DIR)/ttkDecls.h + +PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \ + $(GENERIC_DIR)/tkPlatDecls.h $(@TK_WINDOWINGSYSTEM@_HDRS) + +# The private headers we want installed for install-private-headers +PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \ + $(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \ + $(TTK_HDRS) $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS) DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget @@ -742,8 +749,7 @@ install-libraries: libraries chmod +x $(SRC_DIR)/install-sh; \ fi @echo "Installing header files"; - @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \ - $(GENERIC_DIR)/tkPlatDecls.h $(@TK_WINDOWINGSYSTEM@_HDRS) ; \ + @for i in $(PUBLIC_HDRS); \ do \ $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ done; @@ -854,9 +860,7 @@ install-private-headers: libraries chmod +x $(SRC_DIR)/install-sh; \ fi @echo "Installing private header files"; - @for i in $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \ - $(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \ - $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS); \ + @for i in $(PRIVATE_HDRS); \ do \ $(INSTALL_DATA) $$i $(PRIVATE_INCLUDE_INSTALL_DIR); \ done; -- cgit v0.12