diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | generic/ttk/ttkLayout.c | 4 | ||||
| -rw-r--r-- | generic/ttk/ttkManager.h | 4 | ||||
| -rw-r--r-- | generic/ttk/ttkTheme.h | 10 | ||||
| -rw-r--r-- | win/ttkWinMonitor.c | 10 |
5 files changed, 25 insertions, 9 deletions
@@ -1,5 +1,11 @@ 2006-11-03 Pat Thoyts <patthoyts@users.sourceforge.net> + * generic/ttk/ttkLayout.c: We do not want to require tkInt in + * generic/ttk/ttkMananager.h: all the ttk files so added the + * generic/ttk/ttkTheme.h: definition of MODULE_SCOPE to + * generic/ttk/ttkWinMonitor.c: ttkTheme.h Ensure everyone + gets to see the definition from someplace. + * library/ttk/fonts.tcl: In a safe interp there is no osVersion field in tcl_platform so work around it. diff --git a/generic/ttk/ttkLayout.c b/generic/ttk/ttkLayout.c index c1b394a..09370ea 100644 --- a/generic/ttk/ttkLayout.c +++ b/generic/ttk/ttkLayout.c @@ -5,7 +5,7 @@ * * Copyright (c) 2003 Joe English. Freely redistributable. * - * $Id: ttkLayout.c,v 1.2 2006/11/03 03:06:22 das Exp $ + * $Id: ttkLayout.c,v 1.3 2006/11/03 15:42:42 patthoyts Exp $ */ #include <string.h> @@ -255,7 +255,7 @@ Ttk_Box Ttk_PlaceBox( * Ttk_PositionBox -- * Pack and stick a box according to PositionSpec flags. */ -TTKAPI Ttk_Box +MODULE_SCOPE Ttk_Box Ttk_PositionBox(Ttk_Box *cavity, int width, int height, Ttk_PositionSpec flags) { Ttk_Box parcel; diff --git a/generic/ttk/ttkManager.h b/generic/ttk/ttkManager.h index 0e22ce0..bf057c3 100644 --- a/generic/ttk/ttkManager.h +++ b/generic/ttk/ttkManager.h @@ -1,4 +1,4 @@ -/* $Id: ttkManager.h,v 1.2 2006/11/03 03:06:22 das Exp $ +/* $Id: ttkManager.h,v 1.3 2006/11/03 15:42:42 patthoyts Exp $ * * Copyright (c) 2005, Joe English. Freely redistributable. * @@ -10,6 +10,8 @@ #ifndef _TTKMANAGER #define _TTKMANAGER +#include "ttkTheme.h" + typedef struct TtkManager_ Ttk_Manager; /* forward */ typedef struct TtkSlave_ Ttk_Slave; /* forward */ diff --git a/generic/ttk/ttkTheme.h b/generic/ttk/ttkTheme.h index 9df78ae..1871a91 100644 --- a/generic/ttk/ttkTheme.h +++ b/generic/ttk/ttkTheme.h @@ -4,7 +4,7 @@ * * Copyright (c) 2003 Joe English. Freely redistributable. * - * $Id: ttkTheme.h,v 1.2 2006/11/03 03:06:22 das Exp $ + * $Id: ttkTheme.h,v 1.3 2006/11/03 15:42:42 patthoyts Exp $ */ #ifndef _TTKTHEME @@ -21,6 +21,14 @@ extern "C" { # define TTKAPI DLLIMPORT #endif +#ifndef MODULE_SCOPE +# ifdef __cplusplus +# define MODULE_SCOPE extern "C" +# else +# define MODULE_SCOPE extern +# endif +#endif + /* Ttk syncs to the Tk version & patchlevel */ #define TTK_VERSION TK_VERSION #define TTK_PATCH_LEVEL TK_PATCH_LEVEL diff --git a/win/ttkWinMonitor.c b/win/ttkWinMonitor.c index 0d8b21b..11f2dda 100644 --- a/win/ttkWinMonitor.c +++ b/win/ttkWinMonitor.c @@ -1,4 +1,4 @@ -/* $Id: ttkWinMonitor.c,v 1.3 2006/11/03 14:42:09 das Exp $ +/* $Id: ttkWinMonitor.c,v 1.4 2006/11/03 15:42:42 patthoyts Exp $ */ #ifdef _MSC_VER @@ -146,8 +146,8 @@ WndProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) * Windows-specific platform initialization: */ -extern int TtkWinTheme_Init(Tcl_Interp *, HWND hwnd); -extern int TtkXPTheme_Init(Tcl_Interp *, HWND hwnd); +MODULE_SCOPE int TtkWinTheme_Init(Tcl_Interp *, HWND hwnd); +MODULE_SCOPE int TtkXPTheme_Init(Tcl_Interp *, HWND hwnd); MODULE_SCOPE int Ttk_WinPlatformInit(Tcl_Interp *interp) { @@ -156,8 +156,8 @@ MODULE_SCOPE int Ttk_WinPlatformInit(Tcl_Interp *interp) hwnd = CreateThemeMonitorWindow(Tk_GetHINSTANCE(), interp); Ttk_RegisterCleanup(interp, (ClientData)hwnd, DestroyThemeMonitorWindow); - WinTheme_Init(interp, hwnd); - XPTheme_Init(interp, hwnd); + TtkWinTheme_Init(interp, hwnd); + TtkXPTheme_Init(interp, hwnd); return TCL_OK; } |