summaryrefslogtreecommitdiffstats
path: root/generic/tkScrollbar.h
diff options
context:
space:
mode:
authornijtmans@users.sourceforge.net <jan.nijtmans>2012-10-23 07:39:03 (GMT)
committernijtmans@users.sourceforge.net <jan.nijtmans>2012-10-23 07:39:03 (GMT)
commiteb2910e329d4314bc9bec018d534ea412f3e6916 (patch)
treee3a5b11b190a9a0a0c70b9e0204b5444a4c24508 /generic/tkScrollbar.h
parent5caad6334049eea1df6fa474c4b2534c22718860 (diff)
downloadtk-eb2910e329d4314bc9bec018d534ea412f3e6916.zip
tk-eb2910e329d4314bc9bec018d534ea412f3e6916.tar.gz
tk-eb2910e329d4314bc9bec018d534ea412f3e6916.tar.bz2
Backport of ::tk::mac::useCompatibilityMetrics handling and scrollbar metrics handling from trunk
Diffstat (limited to 'generic/tkScrollbar.h')
-rw-r--r--generic/tkScrollbar.h18
1 files changed, 3 insertions, 15 deletions
diff --git a/generic/tkScrollbar.h b/generic/tkScrollbar.h
index e2890f4..126d590 100644
--- a/generic/tkScrollbar.h
+++ b/generic/tkScrollbar.h
@@ -17,11 +17,6 @@
#include "tkInt.h"
#endif
-#ifdef BUILD_tk
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLEXPORT
-#endif
-
/*
* A data structure of the following type is kept for each scrollbar widget.
*/
@@ -162,16 +157,12 @@ typedef struct TkScrollbar {
#define GOT_FOCUS 4
/*
- * Declaration of scrollbar class functions structure.
+ * Declaration of scrollbar class functions structure
+ * and default scrollbar width, for use in configSpec.
*/
MODULE_SCOPE Tk_ClassProcs tkpScrollbarProcs;
-
-/*
- * Declaration of scrollbar configuration options.
- */
-
-MODULE_SCOPE Tk_ConfigSpec tkpScrollbarConfigSpecs[];
+MODULE_SCOPE char tkDefScrollbarWidth[TCL_INTEGER_SPACE];
/*
* Declaration of functions used in the implementation of the scrollbar
@@ -189,7 +180,4 @@ MODULE_SCOPE void TkpConfigureScrollbar(TkScrollbar *scrollPtr);
MODULE_SCOPE int TkpScrollbarPosition(TkScrollbar *scrollPtr,
int x, int y);
-# undef TCL_STORAGE_CLASS
-# define TCL_STORAGE_CLASS DLLIMPORT
-
#endif /* _TKSCROLLBAR */