diff options
| author | das <das> | 2006-03-28 02:44:12 (GMT) |
|---|---|---|
| committer | das <das> | 2006-03-28 02:44:12 (GMT) |
| commit | eb472aefb989640dc300fe2bc7d5228296a4ac4b (patch) | |
| tree | 1a879bdfefa8a636bfc1f0e4a6f1bc4de6bfe05e /macosx/tkMacOSXButton.c | |
| parent | 132f2dd82aa35a0ceb92fb4db6c0a4d5f3e46d53 (diff) | |
| download | tk-eb472aefb989640dc300fe2bc7d5228296a4ac4b.zip tk-eb472aefb989640dc300fe2bc7d5228296a4ac4b.tar.gz tk-eb472aefb989640dc300fe2bc7d5228296a4ac4b.tar.bz2 | |
* macosx/tkMacOSX.h: Cleaned up & rationalized order of
* macosx/tkMacOSXBitmap.c: #includes of tk and carbon headers;
* macosx/tkMacOSXButton.c: sync whitespace, comments & minor
* macosx/tkMacOSXCarbonEvents.c: changes with HEAD.
* macosx/tkMacOSXClipboard.c:
* macosx/tkMacOSXColor.c:
* macosx/tkMacOSXConfig.c:
* macosx/tkMacOSXCursor.c:
* macosx/tkMacOSXDialog.c:
* macosx/tkMacOSXDraw.c:
* macosx/tkMacOSXEmbed.c:
* macosx/tkMacOSXEntry.c:
* macosx/tkMacOSXEvent.c:
* macosx/tkMacOSXEvent.h:
* macosx/tkMacOSXFont.c:
* macosx/tkMacOSXFont.h (new file):
* macosx/tkMacOSXHLEvents.c:
* macosx/tkMacOSXInit.c:
* macosx/tkMacOSXInt.h:
* macosx/tkMacOSXKeyEvent.c:
* macosx/tkMacOSXKeyboard.c:
* macosx/tkMacOSXMenu.c:
* macosx/tkMacOSXMenubutton.c:
* macosx/tkMacOSXMenus.c:
* macosx/tkMacOSXMouseEvent.c:
* macosx/tkMacOSXNotify.c:
* macosx/tkMacOSXRegion.c:
* macosx/tkMacOSXScale.c:
* macosx/tkMacOSXScrlbr.c:
* macosx/tkMacOSXSend.c:
* macosx/tkMacOSXSubwindows.c:
* macosx/tkMacOSXTest.c:
* macosx/tkMacOSXWindowEvent.c:
* macosx/tkMacOSXWm.c:
* macosx/tkMacOSXWm.h:
* macosx/tkMacOSXXStubs.c:
Diffstat (limited to 'macosx/tkMacOSXButton.c')
| -rw-r--r-- | macosx/tkMacOSXButton.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c index d5672cc..78fc303 100644 --- a/macosx/tkMacOSXButton.c +++ b/macosx/tkMacOSXButton.c @@ -10,11 +10,12 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXButton.c,v 1.2.2.12 2005/11/27 02:36:46 das Exp $ + * RCS: @(#) $Id: tkMacOSXButton.c,v 1.2.2.13 2006/03/28 02:44:12 das Exp $ */ -#include "tkButton.h" #include "tkMacOSXInt.h" +#include "tkButton.h" +#include "tkMacOSXFont.h" #include "tkMacOSXDebug.h" #define DEFAULT_USE_TK_TEXT 0 @@ -27,8 +28,6 @@ #define DEF_INSET_TOP 2 #define DEF_INSET_BOTTOM 4 -#include <Carbon/Carbon.h> - /* * Some defines used to control what type of control is drawn. */ @@ -109,9 +108,6 @@ static void SetupBevelButton _ANSI_ARGS_((MacButton *butPtr, ControlRef controlHandle, GWorldPtr destPort, GC gc, Pixmap pixmap)); -extern int TkFontGetFirstTextLayout(Tk_TextLayout layout, Tk_Font * font, char * dst); -extern void TkMacOSXInitControlFontStyle(Tk_Font tkfont,ControlFontStylePtr fsPtr); - /* * The class procedure table for the button widgets. */ |