#if wxOSX_USE_ATSU_TEXT
// we need theming and atsu
#include <Carbon/Carbon.h>
+#else
+ // we only need theming, if we find a better include replace the following
+ #include <Carbon/Carbon.h>
#endif
#ifdef __OBJC__
#import <Cocoa/Cocoa.h>
#endif
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
+// available in 10.4 but not in the headers
+enum {
+ kEventMouseScroll = 11
+};
+#endif
//
// shared between Cocoa and Carbon
//
-// bring in themeing types without pulling in the headers
+// bring in theming types without pulling in the headers
#if wxUSE_GUI
typedef SInt16 ThemeBrush;
const CGRect * inBounds,
CGImageRef inImage) ;
WX_NSImage WXDLLIMPEXP_CORE wxOSXCreateNSImageFromCGImage( CGImageRef image );
+CGImageRef WXDLLIMPEXP_CORE wxOSXCreateCGImageFromNSImage( WX_NSImage nsimage );
#endif
long UMAGetSystemVersion() ;
WXDLLIMPEXP_BASE OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef );
WXDLLIMPEXP_BASE wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname );
+class WXDLLIMPEXP_FWD_CORE wxDialog;
+
//
//
//
class WXDLLIMPEXP_CORE wxWidgetCocoaImpl : public wxWidgetImpl
{
public :
- wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false ) ;
- wxWidgetCocoaImpl() ;
- ~wxWidgetCocoaImpl();
-
+ wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false ) ;
+ wxWidgetCocoaImpl() ;
+ ~wxWidgetCocoaImpl();
+
void Init();
-
+
virtual bool IsVisible() const ;
virtual void SetVisibility(bool);
+ // we provide a static function which can be reused from
+ // wxNonOwnedWindowCocoaImpl too
+ static bool ShowViewOrWindowWithEffect(wxWindow *win,
+ bool show,
+ wxShowEffect effect,
+ unsigned timeout);
+
+ virtual bool ShowWithEffect(bool show,
+ wxShowEffect effect,
+ unsigned timeout);
+
virtual void Raise();
-
+
virtual void Lower();
virtual void ScrollRect( const wxRect *rect, int dx, int dy );
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();
wxInt32 GetValue() const;
void SetValue( wxInt32 v );
+ wxBitmap GetBitmap() const;
void SetBitmap( const wxBitmap& bitmap );
+ void SetBitmapPosition( wxDirection dir );
void SetupTabs( const wxNotebook ¬ebook );
void GetBestRect( wxRect *r ) const;
bool IsEnabled() const;
void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );
void InstallEventHandler( WXWidget control = NULL );
-
- virtual bool DoHandleMouseEvent(NSEvent *event);
+
+ virtual bool DoHandleMouseEvent(NSEvent *event);
virtual bool DoHandleKeyEvent(NSEvent *event);
virtual bool DoHandleCharEvent(NSEvent *event, NSString *text);
- virtual void DoNotifyFocusEvent(bool receivedFocus);
+ virtual void DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow);
+
+ virtual void SetupKeyEvent(wxKeyEvent &wxevent, NSEvent * nsEvent, NSString* charString = NULL);
+ virtual void SetupMouseEvent(wxMouseEvent &wxevent, NSEvent * nsEvent);
+
void SetFlipped(bool flipped);
- bool IsFlipped() const { return m_isFlipped; }
+ virtual bool IsFlipped() const { return m_isFlipped; }
// cocoa thunk connected calls
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);
+
+ // for wxTextCtrl-derived classes, put here since they don't all derive
+ // from the same pimpl class.
+ virtual void controlTextDidChange();
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)
};
public :
wxNonOwnedWindowCocoaImpl( wxNonOwnedWindow* nonownedwnd) ;
wxNonOwnedWindowCocoaImpl();
-
+
virtual ~wxNonOwnedWindowCocoaImpl();
-
- virtual void Destroy() ;
+
+ virtual void WillBeDestroyed() ;
void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
long style, long extraStyle, const wxString& name ) ;
-
+
WXWindow GetWXWindow() const;
- void Raise();
+ void Raise();
void Lower();
- bool Show(bool show);
- bool ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout);
-
+ bool Show(bool show);
+
+ virtual bool ShowWithEffect(bool show,
+ wxShowEffect effect,
+ unsigned timeout);
+
void Update();
bool SetTransparent(wxByte alpha);
bool SetBackgroundColour(const wxColour& col );
- void SetExtraStyle( long exStyle );
- bool SetBackgroundStyle(wxBackgroundStyle style);
+ void SetExtraStyle( long exStyle );
+ void SetWindowStyleFlag( long style );
+ bool SetBackgroundStyle(wxBackgroundStyle style);
bool CanSetTransparent();
void MoveWindow(int x, int y, int width, int height);
void GetPosition( int &x, int &y ) const;
void GetSize( int &width, int &height ) const;
- void GetContentArea( int &left , int &top , int &width , int &height ) const;
+ void GetContentArea( int &left , int &top , int &width , int &height ) const;
bool SetShape(const wxRegion& region);
-
+
virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) ;
-
+
virtual bool IsMaximized() const;
-
+
virtual bool IsIconized() const;
-
+
virtual void Iconize( bool iconize );
-
+
virtual void Maximize(bool maximize);
-
+
virtual bool IsFullScreen() const;
-
+
virtual bool ShowFullScreen(bool show, long style);
+ virtual void ShowWithoutActivating();
+
virtual void RequestUserAttention(int flags);
-
+
virtual void ScreenToWindow( int *x, int *y );
-
+
virtual void WindowToScreen( int *x, int *y );
+
+ virtual bool IsActive();
+ virtual void SetModified(bool modified);
+ virtual bool IsModified() const;
+
wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; }
protected :
WX_wxNSWindow m_macWindow;
void * m_macFullScreenData ;
DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl)
-};
+};
#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 );
-
- NSRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size ,
+ 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 );
-
+
// used for many wxControls
-
+
@interface wxNSButton : NSButton
{
+ NSTrackingRectTag rectTag;
}
-
+
@end
@interface wxNSBox : NSBox
@end
- @interface wxNSTextField : NSTextField
+ @interface wxNSTextFieldEditor : NSTextView
+ {
+ NSEvent* lastKeyDownEvent;
+ }
+
+ @end
+
+ @interface wxNSTextField : NSTextField wxOSX_10_6_AND_LATER(<NSTextFieldDelegate>)
+ {
+ wxNSTextFieldEditor* fieldEditor;
+ }
+
+ - (wxNSTextFieldEditor*) fieldEditor;
+ - (void) setFieldEditor:(wxNSTextFieldEditor*) fieldEditor;
+
+ @end
+
+ @interface wxNSSecureTextField : NSSecureTextField wxOSX_10_6_AND_LATER(<NSTextFieldDelegate>)
+ {
+ }
+
+ @end
+
+
+ @interface wxNSTextView : NSTextView wxOSX_10_6_AND_LATER(<NSTextViewDelegate>)
{
- wxWidgetCocoaImpl* impl;
}
- - (void) setImplementation:(wxWidgetCocoaImpl*) item;
- - (wxWidgetCocoaImpl*) implementation;
+ - (void)textDidChange:(NSNotification *)aNotification;
+
@end
@interface wxNSMenu : NSMenu
- (void) setImplementation:(wxMenuImpl*) item;
- (wxMenuImpl*) implementation;
- @end
+ @end
@interface wxNSMenuItem : NSMenuItem
{
- (void)clickedAction:(id)sender;
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem;
- @end
-
+ @end
+
void WXDLLIMPEXP_CORE wxOSXCocoaClassAddWXMethods(Class c);
/*
{
BOOL sheetFinished;
int resultCode;
+ wxDialog* impl;
}
+ - (void)setImplementation: (wxDialog *)dialog;
- (BOOL)finished;
- (int)code;
- (void)waitForSheetToFinish;
projects / wxWidgets.git / blobdiff