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/tkMacOSXMenubutton.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/tkMacOSXMenubutton.c')
| -rw-r--r-- | macosx/tkMacOSXMenubutton.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/macosx/tkMacOSXMenubutton.c b/macosx/tkMacOSXMenubutton.c index 91460a8..50c9591 100644 --- a/macosx/tkMacOSXMenubutton.c +++ b/macosx/tkMacOSXMenubutton.c @@ -10,13 +10,13 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXMenubutton.c,v 1.2.2.6 2005/11/27 06:47:33 das Exp $ + * RCS: @(#) $Id: tkMacOSXMenubutton.c,v 1.2.2.7 2006/03/28 02:44:13 das Exp $ */ -#include <Carbon/Carbon.h> +#include "tkMacOSXInt.h" #include "tkMenu.h" #include "tkMenubutton.h" -#include "tkMacOSXInt.h" +#include "tkMacOSXFont.h" #include "tkMacOSXDebug.h" #if !defined(MAC_OS_X_VERSION_10_3) || \ @@ -90,9 +90,6 @@ static void CompareControlTitleParams( int * styleChanged ); -extern int TkFontGetFirstTextLayout(Tk_TextLayout layout, Tk_Font * font, char * dst); -extern void TkMacOSXInitControlFontStyle(Tk_Font tkfont,ControlFontStylePtr fsPtr); - /* * The structure below defines menubutton class behavior by means of * procedures that can be invoked from generic window code. |