Import Tk 8.6.12
This commit is contained in:
@@ -483,8 +483,8 @@ TkRecomputeMenu(
|
||||
|
||||
void
|
||||
TkEventuallyRedrawMenu(
|
||||
register TkMenu *menuPtr, /* Information about menu to redraw. */
|
||||
register TkMenuEntry *mePtr)/* Entry to redraw. NULL means redraw all the
|
||||
TkMenu *menuPtr, /* Information about menu to redraw. */
|
||||
TkMenuEntry *mePtr)/* Entry to redraw. NULL means redraw all the
|
||||
* entries in the menu. */
|
||||
{
|
||||
int i;
|
||||
@@ -586,7 +586,7 @@ TkMenuSelectImageProc(
|
||||
* <=0). */
|
||||
int imgWidth, int imgHeight)/* New dimensions of image. */
|
||||
{
|
||||
register TkMenuEntry *mePtr = clientData;
|
||||
TkMenuEntry *mePtr = clientData;
|
||||
|
||||
if ((mePtr->entryFlags & ENTRY_SELECTED)
|
||||
&& !(mePtr->menuPtr->menuFlags & REDRAW_PENDING)) {
|
||||
@@ -615,9 +615,9 @@ static void
|
||||
DisplayMenu(
|
||||
ClientData clientData) /* Information about widget. */
|
||||
{
|
||||
register TkMenu *menuPtr = clientData;
|
||||
register TkMenuEntry *mePtr;
|
||||
register Tk_Window tkwin = menuPtr->tkwin;
|
||||
TkMenu *menuPtr = clientData;
|
||||
TkMenuEntry *mePtr;
|
||||
Tk_Window tkwin = menuPtr->tkwin;
|
||||
int index, strictMotif;
|
||||
Tk_Font tkfont;
|
||||
Tk_FontMetrics menuMetrics;
|
||||
@@ -824,7 +824,7 @@ TkMenuImageProc(
|
||||
* <=0). */
|
||||
int imgWidth, int imgHeight)/* New dimensions of image. */
|
||||
{
|
||||
register TkMenu *menuPtr = ((TkMenuEntry *) clientData)->menuPtr;
|
||||
TkMenu *menuPtr = ((TkMenuEntry *) clientData)->menuPtr;
|
||||
|
||||
if ((menuPtr->tkwin != NULL) && !(menuPtr->menuFlags & RESIZE_PENDING)) {
|
||||
menuPtr->menuFlags |= RESIZE_PENDING;
|
||||
@@ -882,8 +882,8 @@ int
|
||||
TkPostSubmenu(
|
||||
Tcl_Interp *interp, /* Used for invoking sub-commands and
|
||||
* reporting errors. */
|
||||
register TkMenu *menuPtr, /* Information about menu as a whole. */
|
||||
register TkMenuEntry *mePtr)/* Info about submenu that is to be posted.
|
||||
TkMenu *menuPtr, /* Information about menu as a whole. */
|
||||
TkMenuEntry *mePtr)/* Info about submenu that is to be posted.
|
||||
* NULL means make sure that no submenu is
|
||||
* posted. */
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user