diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-02 16:07:23 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-02 16:07:23 (GMT) |
| commit | 06420ba2fed328cf5559b51d715c8554ff00c69c (patch) | |
| tree | 4352e4ab25a6a1a63247f7c413a465b5d41f2e9a /macosx/tkMacOSXMenubutton.c | |
| parent | 34fbe0438a0f9b87108fb087f3d21c3d01399a58 (diff) | |
| parent | 9c29a905fa4d7ec4c5aa8528475f312dc3d39dab (diff) | |
| download | tk-06420ba2fed328cf5559b51d715c8554ff00c69c.zip tk-06420ba2fed328cf5559b51d715c8554ff00c69c.tar.gz tk-06420ba2fed328cf5559b51d715c8554ff00c69c.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'macosx/tkMacOSXMenubutton.c')
| -rw-r--r-- | macosx/tkMacOSXMenubutton.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/macosx/tkMacOSXMenubutton.c b/macosx/tkMacOSXMenubutton.c index 7de2b46..0502029 100644 --- a/macosx/tkMacOSXMenubutton.c +++ b/macosx/tkMacOSXMenubutton.c @@ -165,8 +165,8 @@ void TkpDisplayMenuButton( ClientData clientData) /* Information about widget. */ { - MacMenuButton *mbPtr = clientData; - TkMenuButton *butPtr = clientData; + MacMenuButton *mbPtr = (MacMenuButton *)clientData; + TkMenuButton *butPtr = (TkMenuButton *)clientData; Tk_Window tkwin = butPtr->tkwin; Pixmap pixmap; DrawParams *dpPtr = &mbPtr->drawParams; @@ -240,8 +240,8 @@ TkpDestroyMenuButton( */ void -TkpComputeMenuButtonGeometry(butPtr) - TkMenuButton *butPtr; /* Widget record for menu button. */ +TkpComputeMenuButtonGeometry( + TkMenuButton *butPtr) /* Widget record for menu button. */ { int width, height, avgWidth, haveImage = 0, haveText = 0; int txtWidth, txtHeight; @@ -689,8 +689,8 @@ MenuButtonEventProc( ClientData clientData, /* Information about window. */ XEvent *eventPtr) /* Information about event. */ { - TkMenuButton *buttonPtr = clientData; - MacMenuButton *mbPtr = clientData; + TkMenuButton *buttonPtr = (TkMenuButton *)clientData; + MacMenuButton *mbPtr = (MacMenuButton *)clientData; if (eventPtr->type == ActivateNotify || eventPtr->type == DeactivateNotify) { |