diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-10-23 07:39:03 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-10-23 07:39:03 (GMT) |
| commit | c38626d1adc195c2d87e1d6c16fa61ab473683a5 (patch) | |
| tree | b315a885a77d6fd35d85e99ec0823db2f294f6cd /generic/tkButton.h | |
| parent | e053bd03f34f27fd2871e8275d281fb1277f98e8 (diff) | |
| download | tk-c38626d1adc195c2d87e1d6c16fa61ab473683a5.zip tk-c38626d1adc195c2d87e1d6c16fa61ab473683a5.tar.gz tk-c38626d1adc195c2d87e1d6c16fa61ab473683a5.tar.bz2 | |
Backport of ::tk::mac::useCompatibilityMetrics handling and scrollbar metrics handling from trunk
Diffstat (limited to 'generic/tkButton.h')
| -rw-r--r-- | generic/tkButton.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/generic/tkButton.h b/generic/tkButton.h index 4fde4c1..09aaee2 100644 --- a/generic/tkButton.h +++ b/generic/tkButton.h @@ -17,11 +17,6 @@ #include "tkInt.h" #endif -#ifdef BUILD_tk -# undef TCL_STORAGE_CLASS -# define TCL_STORAGE_CLASS DLLEXPORT -#endif - /* * Legal values for the "compound" field of TkButton records. */ @@ -293,18 +288,25 @@ typedef struct { #define TRISTATED (1 << 4) /* - * Declaration of variables shared between the files in the button module. + * Declaration of button class functions structure + * and button/label defaults, for use in optionSpecs. */ MODULE_SCOPE Tk_ClassProcs tkpButtonProcs; +MODULE_SCOPE char tkDefButtonHighlightWidth[TCL_INTEGER_SPACE]; +MODULE_SCOPE char tkDefButtonPadx[TCL_INTEGER_SPACE]; +MODULE_SCOPE char tkDefButtonPady[TCL_INTEGER_SPACE]; MODULE_SCOPE char tkDefButtonBorderWidth[TCL_INTEGER_SPACE]; +MODULE_SCOPE char tkDefLabelHighlightWidth[TCL_INTEGER_SPACE]; +MODULE_SCOPE char tkDefLabelPadx[TCL_INTEGER_SPACE]; +MODULE_SCOPE char tkDefLabelPady[TCL_INTEGER_SPACE]; /* * Declaration of functions used in the implementation of the button widget. */ #ifndef TkpButtonSetDefaults -MODULE_SCOPE void TkpButtonSetDefaults(Tk_OptionSpec *specPtr); +MODULE_SCOPE void TkpButtonSetDefaults(); #endif MODULE_SCOPE void TkButtonWorldChanged(ClientData instanceData); MODULE_SCOPE void TkpComputeButtonGeometry(TkButton *butPtr); @@ -317,7 +319,4 @@ MODULE_SCOPE void TkpDisplayButton(ClientData clientData); #endif MODULE_SCOPE int TkInvokeButton(TkButton *butPtr); -# undef TCL_STORAGE_CLASS -# define TCL_STORAGE_CLASS DLLIMPORT - #endif /* _TKBUTTON */ |