Browse Source

Minor tidying-up of docs + warnings.

tags/2021-05-28
jules 12 years ago
parent
commit
4e17b8d2a9
6 changed files with 18 additions and 20 deletions
  1. +1
    -1
      modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp
  2. +3
    -5
      modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.mm
  3. +1
    -1
      modules/juce_gui_basics/keyboard/juce_KeyListener.h
  4. +1
    -1
      modules/juce_gui_basics/keyboard/juce_KeyPress.h
  5. +1
    -1
      modules/juce_gui_basics/keyboard/juce_ModifierKeys.h
  6. +11
    -11
      modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm

+ 1
- 1
modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp View File

@@ -248,7 +248,7 @@ struct AAXClasses
} }
} }
virtual AAX_Result GetViewSize (AAX_Point* const viewSize) const
virtual AAX_Result GetViewSize (AAX_Point* viewSize) const
{ {
if (component != nullptr) if (component != nullptr)
{ {


+ 3
- 5
modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.mm View File

@@ -215,8 +215,7 @@ void setNativeHostWindowSize (void* nsWindow, Component* component, int newWidth
JUCE_AUTORELEASEPOOL JUCE_AUTORELEASEPOOL
#if JUCE_64BIT #if JUCE_64BIT
NSView* hostView = (NSView*) nsWindow;
if (hostView != nil)
if (NSView* hostView = (NSView*) nsWindow)
{ {
// xxx is this necessary, or do the hosts detect a change in the child view and do this automatically? // xxx is this necessary, or do the hosts detect a change in the child view and do this automatically?
[hostView setFrameSize: NSMakeSize ([hostView frame].size.width + (newWidth - component->getWidth()), [hostView setFrameSize: NSMakeSize ([hostView frame].size.width + (newWidth - component->getWidth()),
@@ -224,9 +223,8 @@ void setNativeHostWindowSize (void* nsWindow, Component* component, int newWidth
} }
#else #else
HIViewRef dummyView = (HIViewRef) (void*) (pointer_sized_int)
component->getProperties() ["dummyViewRef"].toString().getHexValue64();
if (dummyView != 0)
if (HIViewRef dummyView = (HIViewRef) (void*) (pointer_sized_int)
component->getProperties() ["dummyViewRef"].toString().getHexValue64())
{ {
HIRect frameRect; HIRect frameRect;
HIViewGetFrame (dummyView, &frameRect); HIViewGetFrame (dummyView, &frameRect);


+ 1
- 1
modules/juce_gui_basics/keyboard/juce_KeyListener.h View File

@@ -37,7 +37,7 @@ class Component;
You can add a key listener to a component to be informed when that component You can add a key listener to a component to be informed when that component
gets key events. See the Component::addListener method for more details. gets key events. See the Component::addListener method for more details.
@see KeyPress, Component::addKeyListener, KeyPressMappingManager
@see KeyPress, Component::addKeyListener, KeyPressMappingSet
*/ */
class JUCE_API KeyListener class JUCE_API KeyListener
{ {


+ 1
- 1
modules/juce_gui_basics/keyboard/juce_KeyPress.h View File

@@ -35,7 +35,7 @@
E.g. a KeyPress might represent CTRL+C, SHIFT+ALT+H, Spacebar, Escape, etc. E.g. a KeyPress might represent CTRL+C, SHIFT+ALT+H, Spacebar, Escape, etc.
@see Component, KeyListener, Button::addShortcut, KeyPressMappingManager
@see Component, KeyListener, KeyPressMappingSet, Button::addShortcut
*/ */
class JUCE_API KeyPress class JUCE_API KeyPress
{ {


+ 1
- 1
modules/juce_gui_basics/keyboard/juce_ModifierKeys.h View File

@@ -106,7 +106,7 @@ public:
*/ */
inline bool isCtrlDown() const noexcept { return testFlags (ctrlModifier); } inline bool isCtrlDown() const noexcept { return testFlags (ctrlModifier); }
/** Checks whether the shift key's flag is set. */
/** Checks whether the ALT key's flag is set. */
inline bool isAltDown() const noexcept { return testFlags (altModifier); } inline bool isAltDown() const noexcept { return testFlags (altModifier); }
//============================================================================== //==============================================================================


+ 11
- 11
modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm View File

@@ -1532,9 +1532,11 @@ private:
static NSRange markedRange (id self, SEL) 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) static NSRange selectedRange (id self, SEL)
@@ -1585,10 +1587,9 @@ private:
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 #if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
static BOOL performKeyEquivalent (id self, SEL, NSEvent* ev) 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] }; objc_super s = { self, [NSView class] };
return objc_msgSendSuper (&s, @selector (performKeyEquivalent:), ev) != nil; return objc_msgSendSuper (&s, @selector (performKeyEquivalent:), ev) != nil;
@@ -1751,10 +1752,9 @@ private:
static void windowWillMove (id self, SEL, NSNotification*) 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();
} }
}; };


Loading…
Cancel
Save