void SetDefaultButton( bool isDefault );
void PerformClick();
- void SetLabel(const wxString& title, wxFontEncoding encoding);
+ virtual void SetLabel(const wxString& title, wxFontEncoding encoding);
+
+ void SetCursor( const wxCursor & cursor );
+ void CaptureMouse();
+ void ReleaseMouse();
wxInt32 GetValue() const;
void SetValue( wxInt32 v );
bool ButtonClickDidStateChange() { return true ;}
void SetMinimum( wxInt32 v );
void SetMaximum( wxInt32 v );
+ wxInt32 GetMinimum() const;
+ wxInt32 GetMaximum() const;
void PulseGauge();
void SetScrollThumb( wxInt32 value, wxInt32 thumbSize );
void InstallEventHandler( WXWidget control = NULL );
virtual bool DoHandleMouseEvent(NSEvent *event);
- virtual bool DoHandleKeyEvent(NSEvent *event);
- virtual void DoNotifyFocusEvent(bool receivedFocus);
+ virtual bool DoHandleKeyEvent(NSEvent *event);
+ virtual bool DoHandleCharEvent(NSEvent *event, NSString *text);
+ virtual void DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow);
+
+ void SetFlipped(bool flipped);
+ virtual bool IsFlipped() const { return m_isFlipped; }
+
+ // cocoa thunk connected calls
+
+ virtual unsigned int draggingEntered(void* sender, WXWidget slf, void* _cmd);
+ virtual void draggingExited(void* sender, WXWidget slf, void* _cmd);
+ virtual unsigned int draggingUpdated(void* sender, WXWidget slf, void* _cmd);
+ virtual bool performDragOperation(void* sender, WXWidget slf, void* _cmd);
+ virtual void mouseEvent(WX_NSEvent event, WXWidget slf, void* _cmd);
+ virtual void keyEvent(WX_NSEvent event, WXWidget slf, void* _cmd);
+ virtual void insertText(NSString* text, WXWidget slf, void* _cmd);
+ virtual bool performKeyEquivalent(WX_NSEvent event, WXWidget slf, void* _cmd);
+ virtual bool acceptsFirstResponder(WXWidget slf, void* _cmd);
+ virtual bool becomeFirstResponder(WXWidget slf, void* _cmd);
+ virtual bool resignFirstResponder(WXWidget slf, void* _cmd);
+ virtual void resetCursorRects(WXWidget slf, void* _cmd);
+ virtual bool isFlipped(WXWidget slf, void* _cmd);
+ virtual void drawRect(void* rect, WXWidget slf, void* _cmd);
+
+ virtual void controlAction(WXWidget slf, void* _cmd, void* sender);
+ virtual void controlDoubleAction(WXWidget slf, void* _cmd, void *sender);
protected:
WXWidget m_osxView;
+ NSEvent* m_lastKeyDownEvent;
+ bool m_isFlipped;
+ // if it the control has an editor, that editor will already send some
+ // events, don't resend them
+ bool m_hasEditor;
+
DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl)
};
#ifdef __OBJC__
- extern NSRect wxToNSRect( NSView* parent, const wxRect& r );
- extern wxRect wxFromNSRect( NSView* parent, const NSRect& rect );
- extern NSPoint wxToNSPoint( NSView* parent, const wxPoint& p );
- extern wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p );
+ WXDLLIMPEXP_CORE NSRect wxToNSRect( NSView* parent, const wxRect& r );
+ WXDLLIMPEXP_CORE wxRect wxFromNSRect( NSView* parent, const NSRect& rect );
+ WXDLLIMPEXP_CORE NSPoint wxToNSPoint( NSView* parent, const wxPoint& p );
+ WXDLLIMPEXP_CORE wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p );
NSRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size ,
bool adjustForOrigin = true );
- // common code snippets for cocoa implementations
- // later to be done using injection in method table
-
- #define WXCOCOAIMPL_COMMON_EVENTS_INTERFACE -(void)mouseDown:(NSEvent *)event ;\
- -(void)rightMouseDown:(NSEvent *)event ;\
- -(void)otherMouseDown:(NSEvent *)event ;\
- -(void)mouseUp:(NSEvent *)event ;\
- -(void)rightMouseUp:(NSEvent *)event ;\
- -(void)otherMouseUp:(NSEvent *)event ;\
- - (void)keyDown:(NSEvent *)event;\
- - (void)keyUp:(NSEvent *)event;\
- - (void)flagsChanged:(NSEvent *)event;\
- - (BOOL) becomeFirstResponder;\
- - (BOOL) resignFirstResponder;
-
- #define WXCOCOAIMPL_COMMON_EVENTS_IMPLEMENTATION -(void)mouseDown:(NSEvent *)event \
- {\
- if ( !impl->DoHandleMouseEvent(event) )\
- [super mouseDown:event];\
- }\
- -(void)rightMouseDown:(NSEvent *)event\
- {\
- if ( !impl->DoHandleMouseEvent(event) )\
- [super rightMouseDown:event];\
- }\
- -(void)otherMouseDown:(NSEvent *)event\
- {\
- if ( !impl->DoHandleMouseEvent(event) )\
- [super otherMouseDown:event];\
- }\
- -(void)mouseUp:(NSEvent *)event\
- {\
- if ( !impl->DoHandleMouseEvent(event) )\
- [super mouseUp:event];\
- }\
- -(void)rightMouseUp:(NSEvent *)event\
- {\
- if ( !impl->DoHandleMouseEvent(event) )\
- [super rightMouseUp:event];\
- }\
- -(void)otherMouseUp:(NSEvent *)event\
- {\
- if ( !impl->DoHandleMouseEvent(event) )\
- [super otherMouseUp:event];\
- }\
- -(void)keyDown:(NSEvent *)event\
- {\
- if ( !impl->DoHandleKeyEvent(event) )\
- [super keyDown:event];\
- }\
- -(void)keyUp:(NSEvent *)event\
- {\
- if ( !impl->DoHandleKeyEvent(event) )\
- [super keyUp:event];\
- }\
- -(void)flagsChanged:(NSEvent *)event\
- {\
- if ( !impl->DoHandleKeyEvent(event) )\
- [super flagsChanged:event];\
- }\
- - (BOOL) becomeFirstResponder\
- {\
- BOOL r = [super becomeFirstResponder];\
- if ( r )\
- impl->DoNotifyFocusEvent( true );\
- return r;\
- }\
- - (BOOL) resignFirstResponder\
- {\
- BOOL r = [super resignFirstResponder];\
- if ( r )\
- impl->DoNotifyFocusEvent( false );\
- return r;\
- }
-
- #define WXCOCOAIMPL_COMMON_MEMBERS wxWidgetCocoaImpl* impl;
-
- #define WXCOCOAIMPL_COMMON_INTERFACE \
- - (void)setImplementation: (wxWidgetCocoaImpl *) theImplementation;\
- - (wxWidgetCocoaImpl*) implementation;\
- - (BOOL) isFlipped;\
- WXCOCOAIMPL_COMMON_EVENTS_INTERFACE
-
- #define WXCOCOAIMPL_COMMON_IMPLEMENTATION WXCOCOAIMPL_COMMON_EVENTS_IMPLEMENTATION \
- - (void)setImplementation: (wxWidgetCocoaImpl *) theImplementation\
- {\
- impl = theImplementation;\
- }\
- - (wxWidgetCocoaImpl*) implementation\
- {\
- return impl;\
- }\
- - (BOOL) isFlipped\
- {\
- return YES;\
- }\
-
- #define WXCOCOAIMPL_COMMON_IMPLEMENTATION_NOT_FLIPPED WXCOCOAIMPL_COMMON_EVENTS_IMPLEMENTATION \
- - (void)setImplementation: (wxWidgetCocoaImpl *) theImplementation\
- {\
- impl = theImplementation;\
- }\
- - (wxWidgetCocoaImpl*) implementation\
- {\
- return impl;\
- }\
- - (BOOL) isFlipped\
- {\
- return NO;\
- }\
-
// used for many wxControls
@interface wxNSButton : NSButton
{
- WXCOCOAIMPL_COMMON_MEMBERS
}
-
- WXCOCOAIMPL_COMMON_INTERFACE
- - (void) clickedAction: (id) sender;
-
+
@end
@interface wxNSBox : NSBox
{
- WXCOCOAIMPL_COMMON_MEMBERS
}
- WXCOCOAIMPL_COMMON_INTERFACE
+ @end
+
+ @interface wxNSTextFieldEditor : NSTextView
+ {
+ NSEvent* lastKeyDownEvent;
+ }
@end
@interface wxNSTextField : NSTextField
{
- WXCOCOAIMPL_COMMON_MEMBERS
+ wxNSTextFieldEditor* fieldEditor;
}
- WXCOCOAIMPL_COMMON_INTERFACE
+ - (wxNSTextFieldEditor*) fieldEditor;
+ - (void) setFieldEditor:(wxNSTextFieldEditor*) fieldEditor;
+
+ @end
+
+ @interface wxNSSecureTextField : NSSecureTextField
+ {
+ }
+
+ @end
+
+
+ @interface wxNSTextView : NSTextView
+ {
+ }
@end
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem;
@end
+
+ void WXDLLIMPEXP_CORE wxOSXCocoaClassAddWXMethods(Class c);
+
+ /*
+ We need this for ShowModal, as the sheet just disables the parent window and
+ returns control to the app, whereas we don't want to return from ShowModal
+ until the sheet has been dismissed.
+ */
+ @interface ModalDialogDelegate : NSObject
+ {
+ BOOL sheetFinished;
+ int resultCode;
+ }
+
+ - (BOOL)finished;
+ - (int)code;
+ - (void)waitForSheetToFinish;
+ - (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo;
+ @end
+
#endif // __OBJC__
projects / wxWidgets.git / blobdiff