summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
Diffstat (limited to 'generic')
-rw-r--r--generic/ttk/ttkLayout.c4
-rw-r--r--generic/ttk/ttkManager.h4
-rw-r--r--generic/ttk/ttkTheme.h10
3 files changed, 14 insertions, 4 deletions
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