Imported Tk 8.6.9
This commit is contained in:
@@ -773,7 +773,7 @@ TkpPostMenu(
|
||||
int result;
|
||||
|
||||
inPostMenu = 1;
|
||||
|
||||
|
||||
result = TkPreprocessMenu(menuPtr);
|
||||
if (result != TCL_OK) {
|
||||
inPostMenu = 0;
|
||||
@@ -785,7 +785,7 @@ TkpPostMenu(
|
||||
NSRect frame = NSMakeRect(x + 9, tkMacOSXZeroScreenHeight - y - 9, 1, 1);
|
||||
|
||||
frame.origin = [view convertPoint:
|
||||
[win convertPointFromScreen:frame.origin] fromView:nil];
|
||||
[win tkConvertPointFromScreen:frame.origin] fromView:nil];
|
||||
|
||||
NSMenu *menu = (NSMenu *) menuPtr->platformData;
|
||||
NSPopUpButtonCell *popUpButtonCell = [[NSPopUpButtonCell alloc]
|
||||
@@ -1139,7 +1139,7 @@ TkpComputeStandardMenuGeometry(
|
||||
columnEntryPtr->x = x;
|
||||
columnEntryPtr->entryFlags &= ~ENTRY_LAST_COLUMN;
|
||||
}
|
||||
x += maxIndicatorSpace + maxWidth + 2 * borderWidth;
|
||||
x += maxIndicatorSpace + maxWidth + 2 * activeBorderWidth;
|
||||
maxWidth = maxIndicatorSpace = 0;
|
||||
lastColumnBreak = i;
|
||||
y = borderWidth;
|
||||
@@ -1625,8 +1625,7 @@ TkpDrawMenuEntry(
|
||||
int height, /* Height of the current rectangle */
|
||||
int strictMotif, /* Boolean flag */
|
||||
int drawArrow) /* Whether or not to draw the cascade arrow
|
||||
* for cascade items. Only applies to
|
||||
* Windows. */
|
||||
* for cascade items. */
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user