diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-06-15 20:56:00 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-06-15 20:56:00 (GMT) |
| commit | 0df448d72dc5f494bf12f7b51263f5564caf044b (patch) | |
| tree | 5a393326af3dc0ccaaf6e659939b88a6fb5a7c13 /win | |
| parent | 8f72212fd698ae61734ebcaff08e59a3781f31f4 (diff) | |
| parent | a780a7ac0367c7321e60e836e3694b0b8052e4a2 (diff) | |
| download | tk-0df448d72dc5f494bf12f7b51263f5564caf044b.zip tk-0df448d72dc5f494bf12f7b51263f5564caf044b.tar.gz tk-0df448d72dc5f494bf12f7b51263f5564caf044b.tar.bz2 | |
Merge trunk
Diffstat (limited to 'win')
| -rw-r--r-- | win/tkWinWm.c | 2 | ||||
| -rw-r--r-- | win/ttkWinTheme.c | 16 | ||||
| -rw-r--r-- | win/ttkWinXPTheme.c | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 1337cbc..6c8e613 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -66,7 +66,7 @@ typedef struct ProtocolHandler { } ProtocolHandler; #define HANDLER_SIZE(cmdLength) \ - (Tk_Offset(ProtocolHandler, command) + 1 + cmdLength) + (offsetof(ProtocolHandler, command) + 1 + cmdLength) /* * Helper type passed via lParam to TkWmStackorderToplevelEnumProc diff --git a/win/ttkWinTheme.c b/win/ttkWinTheme.c index 63e9704..ad3c94e 100644 --- a/win/ttkWinTheme.c +++ b/win/ttkWinTheme.c @@ -188,7 +188,7 @@ typedef struct { } BorderElement; static Ttk_ElementOptionSpec BorderElementOptions[] = { - { "-relief",TK_OPTION_RELIEF,Tk_Offset(BorderElement,reliefObj), "flat" }, + { "-relief",TK_OPTION_RELIEF, offsetof(BorderElement,reliefObj), "flat" }, {NULL, 0, 0, NULL} }; @@ -239,7 +239,7 @@ typedef struct { static Ttk_ElementOptionSpec FieldElementOptions[] = { { "-fieldbackground", TK_OPTION_BORDER, - Tk_Offset(FieldElement,backgroundObj), "white" }, + offsetof(FieldElement,backgroundObj), "white" }, { NULL, 0, 0, NULL } }; @@ -290,11 +290,11 @@ typedef struct { static Ttk_ElementOptionSpec ButtonBorderElementOptions[] = { { "-relief",TK_OPTION_RELIEF, - Tk_Offset(ButtonBorderElement,reliefObj), "flat" }, + offsetof(ButtonBorderElement,reliefObj), "flat" }, { "-highlightcolor",TK_OPTION_COLOR, - Tk_Offset(ButtonBorderElement,highlightColorObj), "black" }, + offsetof(ButtonBorderElement,highlightColorObj), "black" }, { "-default", TK_OPTION_ANY, - Tk_Offset(ButtonBorderElement,defaultStateObj), "disabled" }, + offsetof(ButtonBorderElement,defaultStateObj), "disabled" }, {NULL, 0, 0, NULL} }; @@ -418,7 +418,7 @@ typedef struct { static Ttk_ElementOptionSpec FillFocusElementOptions[] = { { "-focusfill", TK_OPTION_COLOR, - Tk_Offset(FillFocusElement,fillColorObj), "white" }, + offsetof(FillFocusElement,fillColorObj), "white" }, {NULL, 0, 0, NULL} }; @@ -542,7 +542,7 @@ typedef struct { } ThumbElement; static Ttk_ElementOptionSpec ThumbElementOptions[] = { - { "-orient", TK_OPTION_ANY,Tk_Offset(ThumbElement,orientObj),"horizontal"}, + { "-orient", TK_OPTION_ANY, offsetof(ThumbElement,orientObj),"horizontal"}, { NULL, 0, 0, NULL } }; @@ -598,7 +598,7 @@ typedef struct { } SliderElement; static Ttk_ElementOptionSpec SliderElementOptions[] = { - { "-orient", TK_OPTION_ANY, Tk_Offset(SliderElement,orientObj), + { "-orient", TK_OPTION_ANY, offsetof(SliderElement,orientObj), "horizontal" }, { NULL, 0, 0, NULL } }; diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c index e217149..55446c5 100644 --- a/win/ttkWinXPTheme.c +++ b/win/ttkWinXPTheme.c @@ -811,9 +811,9 @@ typedef struct static Ttk_ElementOptionSpec TextElementOptions[] = { { "-text", TK_OPTION_STRING, - Tk_Offset(TextElement,textObj), "" }, + offsetof(TextElement,textObj), "" }, { "-font", TK_OPTION_FONT, - Tk_Offset(TextElement,fontObj), DEFAULT_FONT }, + offsetof(TextElement,fontObj), DEFAULT_FONT }, { NULL } }; |