// Get the window with the focus
-WXWidget wxWidgetImpl::FindFocus()
+NSView* GetViewFromResponder( NSResponder* responder )
{
- NSView* focusedView = nil;
- NSWindow* keyWindow = [[NSApplication sharedApplication] keyWindow];
- if ( keyWindow != nil )
+ NSView* view = nil;
+ if ( [responder isKindOfClass:[NSTextView class]] )
{
- NSResponder* responder = [keyWindow firstResponder];
- if ( [responder isKindOfClass:[NSTextView class]] &&
- [keyWindow fieldEditor:NO forObject:nil] != nil )
- {
- focusedView = [(NSTextView*)responder delegate];
- }
+ NSView* delegate = [(NSTextView*)responder delegate];
+ if ( [delegate isKindOfClass:[NSTextField class] ] )
+ view = delegate;
else
- {
- if ( [responder isKindOfClass:[NSView class]] )
- focusedView = (NSView*) responder;
- }
+ view = (NSView*) responder;
}
+ else
+ {
+ if ( [responder isKindOfClass:[NSView class]] )
+ view = (NSView*) responder;
+ }
+ return view;
+}
+
+NSView* GetFocusedViewInWindow( NSWindow* keyWindow )
+{
+ NSView* focusedView = nil;
+ if ( keyWindow != nil )
+ focusedView = GetViewFromResponder([keyWindow firstResponder]);
+
return focusedView;
}
+WXWidget wxWidgetImpl::FindFocus()
+{
+ return GetFocusedViewInWindow( [[NSApplication sharedApplication] keyWindow] );
+}
+
NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin )
{
int x, y, w, h ;
NSTrackingRectTag rectTag;
}
-// the tracking tag is needed to track mouse enter / exit events
+// the tracking tag is needed to track mouse enter / exit events
- (void) setTrackingTag: (NSTrackingRectTag)tag;
- (NSTrackingRectTag) trackingTag;
@end // wxNSView
-@interface NSView(PossibleMethods)
+@interface NSView(PossibleMethods)
- (void)setTitle:(NSString *)aString;
- (void)setStringValue:(NSString *)aString;
- (void)setIntValue:(int)anInt;
- (void)setTarget:(id)anObject;
- (void)setAction:(SEL)aSelector;
- (void)setDoubleAction:(SEL)aSelector;
-@end
+- (void)setBackgroundColor:(NSColor*)aColor;
+- (void)setImagePosition:(NSCellImagePosition)aPosition;
+@end
long wxOSXTranslateCocoaKey( NSEvent* event )
{
long retval = 0;
if ([event type] != NSFlagsChanged)
- {
+ {
NSString* s = [event charactersIgnoringModifiers];
// backspace char reports as delete w/modifiers for some reason
if ([s length] == 1)
{
// backspace key
case 0x7F :
- case 8 :
+ case 8 :
retval = WXK_BACK;
break;
case NSUpArrowFunctionKey :
}
}
}
-
+
// Some keys don't seem to have constants. The code mimics the approach
// taken by WebKit. See:
// http://trac.webkit.org/browser/trunk/WebCore/platform/mac/KeyEventMac.mm
retval = WXK_CONTROL;
break;
// clear key
- case 71:
+ case 71:
retval = WXK_CLEAR;
break;
// tab key
- case 48:
+ case 48:
retval = WXK_TAB;
break;
case 75: // /
retval = WXK_NUMPAD_DIVIDE;
- break;
+ break;
case 67: // *
retval = WXK_NUMPAD_MULTIPLY;
break;
return retval;
}
-void SetupKeyEvent( wxKeyEvent &wxevent , NSEvent * nsEvent, NSString* charString = NULL )
+void wxWidgetCocoaImpl::SetupKeyEvent(wxKeyEvent &wxevent , NSEvent * nsEvent, NSString* charString)
{
UInt32 modifiers = [nsEvent modifierFlags] ;
int eventType = [nsEvent type];
wxevent.m_controlDown = modifiers & NSControlKeyMask;
wxevent.m_altDown = modifiers & NSAlternateKeyMask;
wxevent.m_metaDown = modifiers & NSCommandKeyMask;
-
+
wxevent.m_rawCode = [nsEvent keyCode];
wxevent.m_rawFlags = modifiers;
-
- wxevent.SetTimestamp( [nsEvent timestamp] * 1000.0 ) ;
+
+ wxevent.SetTimestamp( (int)([nsEvent timestamp] * 1000) ) ;
wxString chars;
if ( eventType != NSFlagsChanged )
{
// if charString is set, it did not come from key up / key down
wxevent.SetEventType( wxEVT_CHAR );
- wxCFStringRef cfchars((CFStringRef)[charString retain]);
- chars = cfchars.AsString();
+ chars = wxCFStringRef::AsString(charString);
}
else if ( nschars )
{
- wxCFStringRef cfchars((CFStringRef)[nschars retain]);
- chars = cfchars.AsString();
+ chars = wxCFStringRef::AsString(nschars);
}
}
-
+
int aunichar = chars.Length() > 0 ? chars[0] : 0;
long keyval = 0;
-
+
if (wxevent.GetEventType() != wxEVT_CHAR)
{
keyval = wxOSXTranslateCocoaKey(nsEvent) ;
else
keyval = aunichar;
}
-
+
#if wxUSE_UNICODE
wxevent.m_uniChar = aunichar;
#endif
wxevent.m_keyCode = keyval;
+
+ wxWindowMac* peer = GetWXPeer();
+ if ( peer )
+ {
+ wxevent.SetEventObject(peer);
+ wxevent.SetId(peer->GetId()) ;
+ }
}
UInt32 g_lastButton = 0 ;
bool g_lastButtonWasFakeRight = false ;
-void SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
+void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
{
int eventType = [nsEvent type];
UInt32 modifiers = [nsEvent modifierFlags] ;
wxevent.m_controlDown = modifiers & NSControlKeyMask;
wxevent.m_altDown = modifiers & NSAlternateKeyMask;
wxevent.m_metaDown = modifiers & NSCommandKeyMask;
- wxevent.SetTimestamp( [nsEvent timestamp] * 1000.0 ) ;
+ wxevent.SetTimestamp( (int)([nsEvent timestamp] * 1000) ) ;
- UInt32 mouseChord = 0;
+ UInt32 mouseChord = 0;
switch (eventType)
{
if ( fabs([nsEvent deltaX]) > fabs([nsEvent deltaY]) )
{
wxevent.m_wheelAxis = 1;
- wxevent.m_wheelRotation = [nsEvent deltaX] * 10.0;
+ wxevent.m_wheelRotation = (int)([nsEvent deltaX] * 10);
}
else
{
- wxevent.m_wheelRotation = [nsEvent deltaY] * 10.0;
+ wxevent.m_wheelRotation = (int)([nsEvent deltaY] * 10);
}
}
break ;
default :
break ;
}
-
+
wxevent.m_clickCount = clickCount;
-
+ wxWindowMac* peer = GetWXPeer();
+ if ( peer )
+ {
+ wxevent.SetEventObject(peer);
+ wxevent.SetId(peer->GetId()) ;
+ }
}
@implementation wxNSView
+ (void)initialize
{
static BOOL initialized = NO;
- if (!initialized)
+ if (!initialized)
{
initialized = YES;
wxOSXCocoaClassAddWXMethods( self );
wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
if (impl == NULL)
return NSDragOperationNone;
-
+
return impl->draggingEntered(sender, self, _cmd);
}
wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
if (impl == NULL)
return ;
-
+
return impl->draggingExited(sender, self, _cmd);
}
wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
if (impl == NULL)
return NSDragOperationNone;
-
+
return impl->draggingUpdated(sender, self, _cmd);
}
wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
if (impl == NULL)
return NSDragOperationNone;
-
+
return impl->performDragOperation(sender, self, _cmd) ? YES:NO ;
}
-void wxOSX_mouseEvent(NSView* self, SEL _cmd, NSEvent *event)
+#endif
+
+void wxOSX_mouseEvent(NSView* self, SEL _cmd, NSEvent *event)
{
wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
if (impl == NULL)
return;
-
+
impl->mouseEvent(event, self, _cmd);
}
-void wxOSX_keyEvent(NSView* self, SEL _cmd, NSEvent *event)
+void wxOSX_keyEvent(NSView* self, SEL _cmd, NSEvent *event)
{
wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
if (impl == NULL)
return;
-
+
impl->keyEvent(event, self, _cmd);
}
-void wxOSX_insertText(NSView* self, SEL _cmd, NSString* text)
+void wxOSX_insertText(NSView* self, SEL _cmd, NSString* text)
{
wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
if (impl == NULL)
return;
-
+
impl->insertText(text, self, _cmd);
}
-BOOL wxOSX_performKeyEquivalent(NSView* self, SEL _cmd, NSEvent *event)
+BOOL wxOSX_performKeyEquivalent(NSView* self, SEL _cmd, NSEvent *event)
{
wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
if (impl == NULL)
return NO;
-
+
return impl->performKeyEquivalent(event, self, _cmd);
}
wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
if (impl == NULL)
return NO;
-
+
return impl->acceptsFirstResponder(self, _cmd);
}
wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
if (impl == NULL)
return NO;
-
+
return impl->becomeFirstResponder(self, _cmd);
}
wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
if (impl == NULL)
return NO;
-
+
return impl->resignFirstResponder(self, _cmd);
}
wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
if (impl == NULL)
return;
-
+
impl->resetCursorRects(self, _cmd);
}
wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
if (impl == NULL)
return NO;
-
+
return impl->isFlipped(self, _cmd) ? YES:NO;
}
wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
if (impl == NULL)
return;
-
+
return impl->drawRect(&rect, self, _cmd);
}
wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
if (impl == NULL)
return;
-
+
impl->controlAction(self, _cmd, sender);
}
wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
if (impl == NULL)
return;
-
+
impl->controlDoubleAction(self, _cmd, sender);
}
id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
NSPasteboard *pboard = [sender draggingPasteboard];
NSDragOperation sourceDragMask = [sender draggingSourceOperationMask];
-
+
wxWindow* wxpeer = GetWXPeer();
if ( wxpeer == NULL )
return NSDragOperationNone;
-
+
wxDropTarget* target = wxpeer->GetDropTarget();
if ( target == NULL )
return NSDragOperationNone;
else if ( sourceDragMask & NSDragOperationMove )
result = wxDragMove;
- PasteboardRef pboardRef;
+ PasteboardRef pboardRef;
PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
target->SetCurrentDragPasteboard(pboardRef);
result = target->OnEnter(pt.x, pt.y, result);
CFRelease(pboardRef);
-
+
NSDragOperation nsresult = NSDragOperationNone;
switch (result )
{
{
id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
NSPasteboard *pboard = [sender draggingPasteboard];
-
+
wxWindow* wxpeer = GetWXPeer();
if ( wxpeer == NULL )
return;
-
+
wxDropTarget* target = wxpeer->GetDropTarget();
if ( target == NULL )
return;
-
- PasteboardRef pboardRef;
+
+ PasteboardRef pboardRef;
PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
target->SetCurrentDragPasteboard(pboardRef);
target->OnLeave();
id <NSDraggingInfo>sender = (id <NSDraggingInfo>) s;
NSPasteboard *pboard = [sender draggingPasteboard];
NSDragOperation sourceDragMask = [sender draggingSourceOperationMask];
-
+
wxWindow* wxpeer = GetWXPeer();
if ( wxpeer == NULL )
return NSDragOperationNone;
-
+
wxDropTarget* target = wxpeer->GetDropTarget();
if ( target == NULL )
return NSDragOperationNone;
else if ( sourceDragMask & NSDragOperationMove )
result = wxDragMove;
- PasteboardRef pboardRef;
+ PasteboardRef pboardRef;
PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
target->SetCurrentDragPasteboard(pboardRef);
result = target->OnDragOver(pt.x, pt.y, result);
CFRelease(pboardRef);
-
+
NSDragOperation nsresult = NSDragOperationNone;
switch (result )
{
NSPasteboard *pboard = [sender draggingPasteboard];
NSDragOperation sourceDragMask = [sender draggingSourceOperationMask];
-
+
wxWindow* wxpeer = GetWXPeer();
wxDropTarget* target = wxpeer->GetDropTarget();
wxDragResult result = wxDragNone;
else if ( sourceDragMask & NSDragOperationMove )
result = wxDragMove;
- PasteboardRef pboardRef;
+ PasteboardRef pboardRef;
PasteboardCreate((CFStringRef)[pboard name], &pboardRef);
target->SetCurrentDragPasteboard(pboardRef);
result = target->OnData(pt.x, pt.y, result);
CFRelease(pboardRef);
-
+
return result != wxDragNone;
}
-#endif
-
typedef void (*wxOSX_TextEventHandlerPtr)(NSView* self, SEL _cmd, NSString *event);
typedef void (*wxOSX_EventHandlerPtr)(NSView* self, SEL _cmd, NSEvent *event);
typedef BOOL (*wxOSX_PerformKeyEventHandlerPtr)(NSView* self, SEL _cmd, NSEvent *event);
typedef BOOL (*wxOSX_FocusHandlerPtr)(NSView* self, SEL _cmd);
typedef BOOL (*wxOSX_ResetCursorRectsHandlerPtr)(NSView* self, SEL _cmd);
-typedef BOOL (*wxOSX_DrawRectHandlerPtr)(NSView* self, SEL _cmd, NSRect rect);
+typedef void (*wxOSX_DrawRectHandlerPtr)(NSView* self, SEL _cmd, NSRect rect);
void wxWidgetCocoaImpl::mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
{
void wxWidgetCocoaImpl::keyEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
{
- if ( [[slf window] firstResponder] != slf || !DoHandleKeyEvent(event) )
+ if ( [event type] == NSKeyDown )
+ m_lastKeyDownEvent = event;
+ if ( GetFocusedViewInWindow([slf window]) != slf || m_hasEditor || !DoHandleKeyEvent(event) )
{
wxOSX_EventHandlerPtr superimpl = (wxOSX_EventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
superimpl(slf, (SEL)_cmd, event);
}
+ m_lastKeyDownEvent = NULL;
}
void wxWidgetCocoaImpl::insertText(NSString* text, WXWidget slf, void *_cmd)
{
- if (m_lastKeyDownEvent && !DoHandleCharEvent(m_lastKeyDownEvent, text) )
+ if ( m_lastKeyDownEvent==NULL || m_hasEditor || !DoHandleCharEvent(m_lastKeyDownEvent, text) )
{
wxOSX_TextEventHandlerPtr superimpl = (wxOSX_TextEventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
superimpl(slf, (SEL)_cmd, text);
}
- m_lastKeyDownEvent = NULL;
}
{
wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
// get the current focus before running becomeFirstResponder
- NSView* otherView = FindFocus();
+ NSView* otherView = FindFocus();
+
wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);
BOOL r = superimpl(slf, (SEL)_cmd);
if ( r )
{
DoNotifyFocusEvent( true, otherWindow );
}
+
return r;
}
wxOSX_FocusHandlerPtr superimpl = (wxOSX_FocusHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
BOOL r = superimpl(slf, (SEL)_cmd);
// get the current focus after running resignFirstResponder
- NSView* otherView = FindFocus();
+ // note that this value isn't reliable, it might return the same view that
+ // is resigning
+ NSView* otherView = FindFocus();
wxWidgetImpl* otherWindow = FindFromWXWidget(otherView);
// NSTextViews have an editor as true responder, therefore the might get the
- // resign notification if their editor takes over, don't trigger any event hen
- if ( r && otherWindow != this)
+ // resign notification if their editor takes over, don't trigger any event then
+ if ( r && !m_hasEditor)
{
DoNotifyFocusEvent( false, otherWindow );
}
}
}
}
-
+
bool wxWidgetCocoaImpl::isFlipped(WXWidget WXUNUSED(slf), void *WXUNUSED(_cmd))
{
return m_isFlipped;
{
CGContextRef context = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
CGContextSaveGState( context );
-
+
#if OSX_DEBUG_DRAWING
CGContextBeginPath( context );
CGContextMoveToPoint(context, 0, 0);
CGContextTranslateCTM( context, 0, [m_osxView bounds].size.height );
CGContextScaleCTM( context, 1, -1 );
}
-
+
wxRegion updateRgn;
const NSRect *rects;
NSInteger count;
wxWindow* wxpeer = GetWXPeer();
wxpeer->GetUpdateRegion() = updateRgn;
wxpeer->MacSetCGContextRef( context );
-
+
bool handled = wxpeer->MacDoRedraw( 0 );
-
+
CGContextRestoreGState( context );
CGContextSaveGState( context );
{
}
-//
+//
#if OBJC_API_VERSION >= 2
wxOSX_CLASS_ADD_METHOD(c, @selector(scrollWheel:), (IMP) wxOSX_mouseEvent, "v@:@" )
wxOSX_CLASS_ADD_METHOD(c, @selector(mouseEntered:), (IMP) wxOSX_mouseEvent, "v@:@" )
wxOSX_CLASS_ADD_METHOD(c, @selector(mouseExited:), (IMP) wxOSX_mouseEvent, "v@:@" )
-
+
wxOSX_CLASS_ADD_METHOD(c, @selector(keyDown:), (IMP) wxOSX_keyEvent, "v@:@" )
wxOSX_CLASS_ADD_METHOD(c, @selector(keyUp:), (IMP) wxOSX_keyEvent, "v@:@" )
wxOSX_CLASS_ADD_METHOD(c, @selector(flagsChanged:), (IMP) wxOSX_keyEvent, "v@:@" )
-
+
wxOSX_CLASS_ADD_METHOD(c, @selector(insertText:), (IMP) wxOSX_insertText, "v@:@" )
- wxOSX_CLASS_ADD_METHOD(c, @selector(performKeyEquivalent:), (IMP) wxOSX_performKeyEquivalent, "v@:@" )
+ wxOSX_CLASS_ADD_METHOD(c, @selector(performKeyEquivalent:), (IMP) wxOSX_performKeyEquivalent, "c@:@" )
wxOSX_CLASS_ADD_METHOD(c, @selector(acceptsFirstResponder), (IMP) wxOSX_acceptsFirstResponder, "c@:" )
wxOSX_CLASS_ADD_METHOD(c, @selector(becomeFirstResponder), (IMP) wxOSX_becomeFirstResponder, "c@:" )
wxOSX_CLASS_ADD_METHOD(c, @selector(draggingUpdated:), (IMP) wxOSX_draggingUpdated, "I@:@" )
wxOSX_CLASS_ADD_METHOD(c, @selector(draggingExited:), (IMP) wxOSX_draggingExited, "v@:@" )
wxOSX_CLASS_ADD_METHOD(c, @selector(performDragOperation:), (IMP) wxOSX_performDragOperation, "c@:@" )
-#endif
-
+#endif
+
#if OBJC_API_VERSION < 2
} ;
static int method_count = WXSIZEOF( wxmethods );
{
Init();
m_osxView = w;
+
+ // check if the user wants to create the control initially hidden
+ if ( !peer->IsShown() )
+ SetVisibility(false);
+
+ // gc aware handling
+ if ( m_osxView )
+ CFRetain(m_osxView);
+ [m_osxView release];
}
-wxWidgetCocoaImpl::wxWidgetCocoaImpl()
+wxWidgetCocoaImpl::wxWidgetCocoaImpl()
{
Init();
}
m_osxView = NULL;
m_isFlipped = true;
m_lastKeyDownEvent = NULL;
+ m_hasEditor = false;
}
wxWidgetCocoaImpl::~wxWidgetCocoaImpl()
if ( sv != nil )
[m_osxView removeFromSuperview];
}
- [m_osxView release];
+ // gc aware handling
+ if ( m_osxView )
+ CFRelease(m_osxView);
}
-
-bool wxWidgetCocoaImpl::IsVisible() const
+
+bool wxWidgetCocoaImpl::IsVisible() const
{
return [m_osxView isHiddenOrHasHiddenAncestor] == NO;
}
void wxWidgetCocoaImpl::Raise()
{
+ // Not implemented
}
-
+
void wxWidgetCocoaImpl::Lower()
{
+ // Not implemented
}
void wxWidgetCocoaImpl::ScrollRect( const wxRect *WXUNUSED(rect), int WXUNUSED(dx), int WXUNUSED(dy) )
void wxWidgetCocoaImpl::Move(int x, int y, int width, int height)
{
wxWindowMac* parent = GetWXPeer()->GetParent();
- // under Cocoa we might have a contentView in the wxParent to which we have to
+ // under Cocoa we might have a contentView in the wxParent to which we have to
// adjust the coordinates
if (parent && [m_osxView superview] != parent->GetHandle() )
{
[[m_osxView superview] setNeedsDisplayInRect:[m_osxView frame]];
NSRect r = wxToNSRect( [m_osxView superview], wxRect(x,y,width, height) );
[m_osxView setFrame:r];
- [[m_osxView superview] setNeedsDisplayInRect:r];
-
+ [[m_osxView superview] setNeedsDisplayInRect:r];
+
if ([m_osxView respondsToSelector:@selector(trackingTag)] )
{
if ( [(wxNSView*)m_osxView trackingTag] )
[m_osxView removeTrackingRect: [(wxNSView*)m_osxView trackingTag]];
-
+
[(wxNSView*)m_osxView setTrackingTag: [m_osxView addTrackingRect: [m_osxView bounds] owner: m_osxView userData: nil assumeInside: NO]];
}
}
void wxWidgetCocoaImpl::GetSize( int &width, int &height ) const
{
NSRect rect = [m_osxView frame];
- width = rect.size.width;
- height = rect.size.height;
+ width = (int)rect.size.width;
+ height = (int)rect.size.height;
}
void wxWidgetCocoaImpl::GetContentArea( int&left, int &top, int &width, int &height ) const
if ( [m_osxView respondsToSelector:@selector(contentView) ] )
{
NSView* cv = [m_osxView contentView];
-
+
NSRect bounds = [m_osxView bounds];
NSRect rect = [cv frame];
-
- int y = rect.origin.y;
- int x = rect.origin.x;
+
+ int y = (int)rect.origin.y;
+ int x = (int)rect.origin.x;
if ( ![ m_osxView isFlipped ] )
- y = bounds.size.height - (rect.origin.y + rect.size.height);
+ y = (int)(bounds.size.height - (rect.origin.y + rect.size.height));
left = x;
top = y;
- width = rect.size.width;
- height = rect.size.height;
+ width = (int)rect.size.width;
+ height = (int)rect.size.height;
}
else
{
return ( FindFocus() == m_osxView );
}
-bool wxWidgetCocoaImpl::SetFocus()
+bool wxWidgetCocoaImpl::SetFocus()
{
if ( [m_osxView canBecomeKeyView] == NO )
return false;
-
+
[[m_osxView window] makeFirstResponder: m_osxView] ;
+ [[m_osxView window] makeKeyAndOrderFront:nil] ;
return true;
}
[container addSubview:m_osxView];
}
-void wxWidgetCocoaImpl::SetBackgroundColour( const wxColour &WXUNUSED(col) )
+void wxWidgetCocoaImpl::SetBackgroundColour( const wxColour &col )
{
- // m_osxView.backgroundColor = [[UIColor alloc] initWithCGColor:col.GetCGColor()];
+ NSView* targetView = m_osxView;
+ if ( [m_osxView isKindOfClass:[NSScrollView class] ] )
+ targetView = [(NSScrollView*) m_osxView documentView];
+
+ if ( [targetView respondsToSelector:@selector(setBackgroundColor:) ] )
+ {
+ [targetView setBackgroundColor:[NSColor colorWithCalibratedRed:(CGFloat) (col.Red() / 255.0)
+ green:(CGFloat) (col.Green() / 255.0)
+ blue:(CGFloat) (col.Blue() / 255.0)
+ alpha:(CGFloat) (col.Alpha() / 255.0)]];
+ }
}
void wxWidgetCocoaImpl::SetLabel( const wxString& title, wxFontEncoding encoding )
[m_osxView setStringValue:cf.AsNSString()];
}
}
-
+
void wxWidgetImpl::Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to )
{
NSPoint p = wxToNSPoint( from->GetWXWidget(), *pt );
- p = [from->GetWXWidget() convertPoint:p toView:to->GetWXWidget() ];
+ p = [from->GetWXWidget() convertPoint:p toView:to->GetWXWidget() ];
*pt = wxFromNSPoint( to->GetWXWidget(), p );
}
-wxInt32 wxWidgetCocoaImpl::GetValue() const
+wxInt32 wxWidgetCocoaImpl::GetValue() const
{
return [(NSControl*)m_osxView intValue];
}
-void wxWidgetCocoaImpl::SetValue( wxInt32 v )
+void wxWidgetCocoaImpl::SetValue( wxInt32 v )
{
if ( [m_osxView respondsToSelector:@selector(setIntValue:)] )
{
}
}
-void wxWidgetCocoaImpl::SetMinimum( wxInt32 v )
+void wxWidgetCocoaImpl::SetMinimum( wxInt32 v )
{
if ( [m_osxView respondsToSelector:@selector(setMinValue:)] )
{
}
}
-void wxWidgetCocoaImpl::SetMaximum( wxInt32 v )
+void wxWidgetCocoaImpl::SetMaximum( wxInt32 v )
{
if ( [m_osxView respondsToSelector:@selector(setMaxValue:)] )
{
}
}
-wxInt32 wxWidgetCocoaImpl::GetMinimum() const
+wxInt32 wxWidgetCocoaImpl::GetMinimum() const
{
if ( [m_osxView respondsToSelector:@selector(getMinValue:)] )
{
- return [m_osxView minValue];
+ return (int)[m_osxView minValue];
}
return 0;
}
-wxInt32 wxWidgetCocoaImpl::GetMaximum() const
+wxInt32 wxWidgetCocoaImpl::GetMaximum() const
{
if ( [m_osxView respondsToSelector:@selector(getMaxValue:)] )
{
- return [m_osxView maxValue];
+ return (int)[m_osxView maxValue];
}
return 0;
}
+wxBitmap wxWidgetCocoaImpl::GetBitmap() const
+{
+ wxBitmap bmp;
+
+ // TODO: how to create a wxBitmap from NSImage?
+#if 0
+ if ( [m_osxView respondsToSelector:@selector(image:)] )
+ bmp = [m_osxView image];
+#endif
+
+ return bmp;
+}
+
void wxWidgetCocoaImpl::SetBitmap( const wxBitmap& bitmap )
{
if ( [m_osxView respondsToSelector:@selector(setImage:)] )
}
}
+void wxWidgetCocoaImpl::SetBitmapPosition( wxDirection dir )
+{
+ if ( [m_osxView respondsToSelector:@selector(setImagePosition:)] )
+ {
+ NSCellImagePosition pos;
+ switch ( dir )
+ {
+ case wxLEFT:
+ pos = NSImageLeft;
+ break;
+
+ case wxRIGHT:
+ pos = NSImageRight;
+ break;
+
+ case wxTOP:
+ pos = NSImageAbove;
+ break;
+
+ case wxBOTTOM:
+ pos = NSImageBelow;
+ break;
+
+ default:
+ wxFAIL_MSG( "invalid image position" );
+ pos = NSNoImage;
+ }
+
+ [m_osxView setImagePosition:pos];
+ }
+}
+
void wxWidgetCocoaImpl::SetupTabs( const wxNotebook& WXUNUSED(notebook))
{
// implementation in subclass
[m_osxView sizeToFit];
NSRect best = [m_osxView frame];
[m_osxView setFrame:former];
- r->width = best.size.width;
- r->height = best.size.height;
+ r->width = (int)best.size.width;
+ r->height = (int)best.size.height;
}
}
{
}
-void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant )
+void wxWidgetCocoaImpl::SetControlSize( wxWindowVariant variant )
{
NSControlSize size = NSRegularControlSize;
-
+
switch ( variant )
{
case wxWINDOW_VARIANT_NORMAL :
break ;
default:
- wxFAIL_MSG(_T("unexpected window variant"));
+ wxFAIL_MSG(wxT("unexpected window variant"));
break ;
}
if ( [m_osxView respondsToSelector:@selector(setControlSize:)] )
[m_osxView setControlSize:size];
+ else if ([m_osxView respondsToSelector:@selector(cell)])
+ {
+ id cell = [(id)m_osxView cell];
+ if ([cell respondsToSelector:@selector(setControlSize:)])
+ [cell setControlSize:size];
+ }
}
void wxWidgetCocoaImpl::SetFont(wxFont const& font, wxColour const&, long, bool)
{
[c setDoubleAction: @selector(controlDoubleAction:)];
}
-
+
}
}
{
wxKeyEvent wxevent(wxEVT_CHAR);
SetupKeyEvent( wxevent, event, text );
- wxevent.SetEventObject(GetWXPeer());
return GetWXPeer()->OSXHandleKeyEvent(wxevent);
}
{
wxKeyEvent wxevent(wxEVT_KEY_DOWN);
SetupKeyEvent( wxevent, event );
- wxevent.SetEventObject(GetWXPeer());
bool result = GetWXPeer()->OSXHandleKeyEvent(wxevent);
// this will fire higher level events, like insertText, to help
// us handle EVT_CHAR, etc.
- if ([event type] == NSKeyDown)
+
+ if ( m_wxPeer->MacIsUserPane() && [event type] == NSKeyDown)
{
- m_lastKeyDownEvent = event;
if ( !result )
- [m_osxView interpretKeyEvents:[NSArray arrayWithObject:event]];
+ {
+ if ( [m_osxView isKindOfClass:[NSScrollView class] ] )
+ [[(NSScrollView*)m_osxView documentView] interpretKeyEvents:[NSArray arrayWithObject:event]];
+ else
+ [m_osxView interpretKeyEvents:[NSArray arrayWithObject:event]];
+ result = true;
+ }
}
+
return result;
}
bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event)
{
- NSPoint clickLocation;
- clickLocation = [m_osxView convertPoint:[event locationInWindow] fromView:nil];
+ NSPoint clickLocation;
+ clickLocation = [m_osxView convertPoint:[event locationInWindow] fromView:nil];
wxPoint pt = wxFromNSPoint( m_osxView, clickLocation );
wxMouseEvent wxevent(wxEVT_LEFT_DOWN);
- SetupMouseEvent( wxevent , event ) ;
- wxevent.SetEventObject(GetWXPeer());
+ SetupMouseEvent(wxevent , event) ;
wxevent.m_x = pt.x;
wxevent.m_y = pt.y;
if ( receivedFocus )
{
- wxLogTrace(_T("Focus"), _T("focus set(%p)"), static_cast<void*>(thisWindow));
+ wxLogTrace(wxT("Focus"), wxT("focus set(%p)"), static_cast<void*>(thisWindow));
wxChildFocusEvent eventFocus((wxWindow*)thisWindow);
thisWindow->HandleWindowEvent(eventFocus);
thisWindow->GetCaret()->OnKillFocus();
#endif
- wxLogTrace(_T("Focus"), _T("focus lost(%p)"), static_cast<void*>(thisWindow));
-
+ wxLogTrace(wxT("Focus"), wxT("focus lost(%p)"), static_cast<void*>(thisWindow));
+
wxFocusEvent event( wxEVT_KILL_FOCUS, thisWindow->GetId());
event.SetEventObject(thisWindow);
if (otherWindow)
// Factory methods
//
-wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* WXUNUSED(parent),
+wxWidgetImpl* wxWidgetImpl::CreateUserPane( wxWindowMac* wxpeer, wxWindowMac* WXUNUSED(parent),
wxWindowID WXUNUSED(id), const wxPoint& pos, const wxSize& size,
long WXUNUSED(style), long WXUNUSED(extraStyle))
{
// temporary hook for dnd
[v registerForDraggedTypes:[NSArray arrayWithObjects:
NSStringPboardType, NSFilenamesPboardType, NSTIFFPboardType, NSPICTPboardType, NSPDFPboardType, nil]];
-
+
wxWidgetCocoaImpl* c = new wxWidgetCocoaImpl( wxpeer, v );
return c;
}
-wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now )
+wxWidgetImpl* wxWidgetImpl::CreateContentView( wxNonOwnedWindow* now )
{
NSWindow* tlw = now->GetWXWindow();
wxNSView* v = [[wxNSView alloc] initWithFrame:[[tlw contentView] frame]];
projects / wxWidgets.git / blobdiff