mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-05 03:50:07 +00:00
Code Activity

Fixed a couple of mac 64-bit warnings.

Browse source
This commit is contained in:
Julian Storer 2010-07-08 17:33:57 +01:00
parent e2e1eacc30
commit 8d3be2913a
4 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
juce_amalgamated.cpp
View file

@ -270110,7 +270110,7 @@ END_JUCE_NAMESPACE
- (NSRange) markedRange;
- (NSRange) selectedRange;
- (NSRect) firstRectForCharacterRange: (NSRange) theRange;
- (unsigned int) characterIndexForPoint: (NSPoint) thePoint;
- (NSUInteger) characterIndexForPoint: (NSPoint) thePoint;
- (NSArray*) validAttributesForMarkedText;
- (void) flagsChanged: (NSEvent*) ev;
@ -270486,13 +270486,15 @@ END_JUCE_NAMESPACE
- (void) insertText: (id) aString
{
// This commits multi-byte text when return is pressed, or after every keypress for western keyboards
if ([aString length] > 0)
NSString* newText = [aString isKindOfClass: [NSAttributedString class]] ? [aString string] : aString;
if ([newText length] > 0)
{
TextInputTarget* const target = owner->findCurrentTextInputTarget();
if (target != 0)
{
target->insertTextAtCaret (nsStringToJuce ([aString isKindOfClass: [NSAttributedString class]] ? [aString string] : aString));
target->insertTextAtCaret (nsStringToJuce (newText));
textWasInserted = true;
}
}
@ -270603,7 +270605,7 @@ END_JUCE_NAMESPACE
bounds.getHeight());
}
- (unsigned int) characterIndexForPoint: (NSPoint) thePoint
- (NSUInteger) characterIndexForPoint: (NSPoint) thePoint
{
(void) thePoint;
return NSNotFound;
@ -271438,6 +271440,9 @@ void NSViewComponentPeer::redirectMouseWheel (NSEvent* ev)
y = [ev deviceDeltaY] * 0.5f;
}
@catch (...)
{}
if (x == 0 && y == 0)
{
x = [ev deltaX] * 10.0f;
y = [ev deltaY] * 10.0f;

2
juce_amalgamated.h
View file

@ -64,7 +64,7 @@
*/
#define JUCE_MAJOR_VERSION 1
#define JUCE_MINOR_VERSION 52
#define JUCE_BUILDNUMBER 38
#define JUCE_BUILDNUMBER 39
/** Current Juce version number.

2
src/core/juce_StandardHeader.h
View file

@ -33,7 +33,7 @@
*/
#define JUCE_MAJOR_VERSION 1
#define JUCE_MINOR_VERSION 52
#define JUCE_BUILDNUMBER 38
#define JUCE_BUILDNUMBER 39
/** Current Juce version number.

13
src/native/mac/juce_mac_NSViewComponentPeer.mm
View file

@ -87,7 +87,7 @@ END_JUCE_NAMESPACE
- (NSRange) markedRange;
- (NSRange) selectedRange;
- (NSRect) firstRectForCharacterRange: (NSRange) theRange;
- (unsigned int) characterIndexForPoint: (NSPoint) thePoint;
- (NSUInteger) characterIndexForPoint: (NSPoint) thePoint;
- (NSArray*) validAttributesForMarkedText;
- (void) flagsChanged: (NSEvent*) ev;
@ -474,13 +474,15 @@ END_JUCE_NAMESPACE
- (void) insertText: (id) aString
{
// This commits multi-byte text when return is pressed, or after every keypress for western keyboards
if ([aString length] > 0)
NSString* newText = [aString isKindOfClass: [NSAttributedString class]] ? [aString string] : aString;
if ([newText length] > 0)
{
TextInputTarget* const target = owner->findCurrentTextInputTarget();
if (target != 0)
{
target->insertTextAtCaret (nsStringToJuce ([aString isKindOfClass: [NSAttributedString class]] ? [aString string] : aString));
target->insertTextAtCaret (nsStringToJuce (newText));
textWasInserted = true;
}
}
@ -591,7 +593,7 @@ END_JUCE_NAMESPACE
bounds.getHeight());
}
- (unsigned int) characterIndexForPoint: (NSPoint) thePoint
- (NSUInteger) characterIndexForPoint: (NSPoint) thePoint
{
(void) thePoint;
return NSNotFound;
@ -1437,6 +1439,9 @@ void NSViewComponentPeer::redirectMouseWheel (NSEvent* ev)
y = [ev deviceDeltaY] * 0.5f;
}
@catch (...)
{}
if (x == 0 && y == 0)
{
x = [ev deltaX] * 10.0f;
y = [ev deltaY] * 10.0f;