|
|
|
@@ -1532,9 +1532,11 @@ private: |
|
|
|
|
|
|
|
static NSRange markedRange (id self, SEL)
|
|
|
|
{
|
|
|
|
NSViewComponentPeer* const owner = getOwner (self);
|
|
|
|
return owner->stringBeingComposed.isNotEmpty() ? NSMakeRange (0, (NSUInteger) owner->stringBeingComposed.length())
|
|
|
|
: NSMakeRange (NSNotFound, 0);
|
|
|
|
if (NSViewComponentPeer* const owner = getOwner (self))
|
|
|
|
if (owner->stringBeingComposed.isNotEmpty())
|
|
|
|
return NSMakeRange (0, (NSUInteger) owner->stringBeingComposed.length());
|
|
|
|
|
|
|
|
return NSMakeRange (NSNotFound, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static NSRange selectedRange (id self, SEL)
|
|
|
|
@@ -1585,10 +1587,9 @@ private: |
|
|
|
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
|
|
|
|
static BOOL performKeyEquivalent (id self, SEL, NSEvent* ev)
|
|
|
|
{
|
|
|
|
NSViewComponentPeer* const owner = getOwner (self);
|
|
|
|
|
|
|
|
if (owner != nullptr && owner->redirectPerformKeyEquivalent (ev))
|
|
|
|
return true;
|
|
|
|
if (NSViewComponentPeer* const owner = getOwner (self))
|
|
|
|
if (owner->redirectPerformKeyEquivalent (ev))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
objc_super s = { self, [NSView class] };
|
|
|
|
return objc_msgSendSuper (&s, @selector (performKeyEquivalent:), ev) != nil;
|
|
|
|
@@ -1751,10 +1752,9 @@ private: |
|
|
|
|
|
|
|
static void windowWillMove (id self, SEL, NSNotification*)
|
|
|
|
{
|
|
|
|
NSViewComponentPeer* const owner = getOwner (self);
|
|
|
|
|
|
|
|
if (owner != nullptr && owner->hasNativeTitleBar())
|
|
|
|
owner->sendModalInputAttemptIfBlocked();
|
|
|
|
if (NSViewComponentPeer* const owner = getOwner (self))
|
|
|
|
if (owner->hasNativeTitleBar())
|
|
|
|
owner->sendModalInputAttemptIfBlocked();
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
|