Tk Source Code

Check-in [8b2f601a]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Bug 3545457: Crash on packing a menubutton
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | core-8-4-branch
Files: files | file ages | folders
SHA1: 8b2f601a0d3a67275ae98f968ce7b878b76fa271
User & Date: fvogel 2012-07-19 21:34:47
Context
2012-07-19
21:35
Fixed previous commit date in changelog check-in: 4991c550 user: fvogel tags: core-8-4-branch
21:34
Bug 3545457: Crash on packing a menubutton check-in: 8b2f601a user: fvogel tags: core-8-4-branch
2012-07-18
18:38
[Bug 3545457]: Crash on packing a menubutton Closed-Leaf check-in: 04a26474 user: fvogel tags: bug-3545457
2012-07-17
13:10
[Bug 3544932]: Visual studio compiler check fails check-in: f277df6f user: jan.nijtmans tags: core-8-4-branch
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to ChangeLog.





1
2
3
4
5
6
7




2012-07-17  Jan Nijtmans  <[email protected]>

	* win/makefile.vc: [Bug 3544932]: Visual studio compiler check fails

2012-07-08  Jan Nijtmans  <[email protected]>

	* generic/tkIntXlibDecls.h: [Bug 3541305]: Xfree/Xsync...
>
>
>
>







1
2
3
4
5
6
7
8
9
10
11
2012-07-??  Francois Vogel  <[email protected]>

	* unix/tkUnixMenuBu.c: [Bug 3545457]: Crash on packing a menubutton

2012-07-17  Jan Nijtmans  <[email protected]>

	* win/makefile.vc: [Bug 3544932]: Visual studio compiler check fails

2012-07-08  Jan Nijtmans  <[email protected]>

	* generic/tkIntXlibDecls.h: [Bug 3541305]: Xfree/Xsync...

Changes to unix/tkUnixMenubu.c.

70
71
72
73
74
75
76
77
78
79
80


81
82
83
84
85
86
87
    GC gc;
    Tk_3DBorder border;
    Pixmap pixmap;
    int x = 0;			/* Initialization needed only to stop
				 * compiler warning. */
    int y = 0;
    register Tk_Window tkwin = mbPtr->tkwin;
    int width, height, fullWidth, fullHeight;
    int textXOffset, textYOffset;
    int imageWidth, imageHeight;
    int imageXOffset, imageYOffset; /* image information that will be used to


				     * restrict disabled pixmap as well */
    int haveImage = 0, haveText = 0;

    mbPtr->flags &= ~REDRAW_PENDING;
    if ((mbPtr->tkwin == NULL) || !Tk_IsMapped(tkwin)) {
	return;
    }







|


|
>
>







70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
    GC gc;
    Tk_3DBorder border;
    Pixmap pixmap;
    int x = 0;			/* Initialization needed only to stop
				 * compiler warning. */
    int y = 0;
    register Tk_Window tkwin = mbPtr->tkwin;
    int fullWidth, fullHeight;
    int textXOffset, textYOffset;
    int imageWidth, imageHeight;
    int imageXOffset, imageYOffset;
    int width = 0, height = 0;
				    /* image information that will be used to
				     * restrict disabled pixmap as well */
    int haveImage = 0, haveText = 0;

    mbPtr->flags &= ~REDRAW_PENDING;
    if ((mbPtr->tkwin == NULL) || !Tk_IsMapped(tkwin)) {
	return;
    }