use correct scale when drawing

[wxWidgets.git] / include / wx / osx / cocoa / private.h

diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index d998d8950faec92b02ed0b99667c6a8a94af70cf..118bad21ac81b433f641c283c229fbffe046dec4 100644 (file)
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -6,7 +6,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01

-// RCS-ID:      $Id: private.h 53819 2008-05-29 14:11:45Z SC $
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -14,26 +14,23 @@
 #ifndef _WX_PRIVATE_COCOA_H_
 #define _WX_PRIVATE_COCOA_H_
 
 #ifndef _WX_PRIVATE_COCOA_H_
 #define _WX_PRIVATE_COCOA_H_
 

-#include "wx/osx/core/private.h"
-
-#include "wx/defs.h"
-

 #include <ApplicationServices/ApplicationServices.h>
 
 #include <ApplicationServices/ApplicationServices.h>
 

-#if wxOSX_USE_ATSU_TEXT
-    // we need theming and atsu
-    #include <Carbon/Carbon.h>
-#endif
-

 #ifdef __OBJC__
     #import <Cocoa/Cocoa.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
 //
 
 //
 // 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;
 
 #if wxUSE_GUI
 typedef SInt16 ThemeBrush;


@@ -42,35 +39,38 @@ OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage(
                                CGContextRef    inContext,
                                const CGRect *  inBounds,
                                CGImageRef      inImage) ;
                                CGContextRef    inContext,
                                const CGRect *  inBounds,
                                CGImageRef      inImage) ;

-WX_NSImage WXDLLIMPEXP_CORE wxOSXCreateNSImageFromCGImage( CGImageRef image );
-#endif
-
-long UMAGetSystemVersion() ;
-WXDLLIMPEXP_BASE void wxMacStringToPascal( const wxString&from , StringPtr to );
-WXDLLIMPEXP_BASE wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent = NULL );
-WXDLLIMPEXP_BASE OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef );
-WXDLLIMPEXP_BASE wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname );
+WX_NSImage WXDLLIMPEXP_CORE wxOSXGetNSImageFromCGImage( CGImageRef image );
+CGImageRef WXDLLIMPEXP_CORE wxOSXCreateCGImageFromNSImage( WX_NSImage nsimage );
+wxBitmap WXDLLIMPEXP_CORE wxOSXCreateSystemBitmap(const wxString& id, const wxString &client, const wxSize& size);
+WXWindow WXDLLIMPEXP_CORE wxOSXGetMainWindow();

 
 

-//
-//
-//
-
-#if wxUSE_GUI
+class WXDLLIMPEXP_FWD_CORE wxDialog;

 
 class WXDLLIMPEXP_CORE wxWidgetCocoaImpl : public wxWidgetImpl
 {
 public :
 
 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, bool isUserPane = false ) ;
+    wxWidgetCocoaImpl() ;
+    ~wxWidgetCocoaImpl();
+

     void Init();
     void Init();

-    
+

     virtual bool        IsVisible() const ;
     virtual void        SetVisibility(bool);
 
     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        Raise();

-    
+

     virtual void        Lower();
 
     virtual void        ScrollRect( const wxRect *rect, int dx, int dy );
     virtual void        Lower();
 
     virtual void        ScrollRect( const wxRect *rect, int dx, int dy );


@@ -78,6 +78,7 @@ public :
     virtual WXWidget    GetWXWidget() const { return m_osxView; }
 
     virtual void        SetBackgroundColour(const wxColour&);
     virtual WXWidget    GetWXWidget() const { return m_osxView; }
 
     virtual void        SetBackgroundColour(const wxColour&);

+    virtual bool        SetBackgroundStyle(wxBackgroundStyle style);

 
     virtual void        GetContentArea( int &left , int &top , int &width , int &height ) const;
     virtual void        Move(int x, int y, int width, int height);
 
     virtual void        GetContentArea( int &left , int &top , int &width , int &height ) const;
     virtual void        Move(int x, int y, int width, int height);


@@ -88,6 +89,8 @@ public :
     virtual void        SetNeedsDisplay( const wxRect* where = NULL );
     virtual bool        GetNeedsDisplay() const;
 
     virtual void        SetNeedsDisplay( const wxRect* where = NULL );
     virtual bool        GetNeedsDisplay() const;
 

+    virtual void        SetDrawingEnabled(bool enabled);
+

     virtual bool        CanFocus() const;
     // return true if successful
     virtual bool        SetFocus();
     virtual bool        CanFocus() const;
     // return true if successful
     virtual bool        SetFocus();


@@ -98,11 +101,19 @@ public :
 
     void                SetDefaultButton( bool isDefault );
     void                PerformClick();
 
     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();
+
+    void                SetDropTarget(wxDropTarget* target);
+    

     wxInt32             GetValue() const;
     void                SetValue( wxInt32 v );
     wxInt32             GetValue() const;
     void                SetValue( wxInt32 v );

+    wxBitmap            GetBitmap() const;

     void                SetBitmap( const wxBitmap& bitmap );
     void                SetBitmap( const wxBitmap& bitmap );

+    void                SetBitmapPosition( wxDirection dir );

     void                SetupTabs( const wxNotebook &notebook );
     void                GetBestRect( wxRect *r ) const;
     bool                IsEnabled() const;
     void                SetupTabs( const wxNotebook &notebook );
     void                GetBestRect( wxRect *r ) const;
     bool                IsEnabled() const;


@@ -110,19 +121,70 @@ public :
     bool                ButtonClickDidStateChange() { return true ;}
     void                SetMinimum( wxInt32 v );
     void                SetMaximum( 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                SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );
     void                PulseGauge();
     void                SetScrollThumb( wxInt32 value, wxInt32 thumbSize );
 
     void                SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );

+    void                SetToolTip( wxToolTip* tooltip );

 
     void                InstallEventHandler( WXWidget control = NULL );
 
     void                InstallEventHandler( WXWidget control = NULL );

+
+    virtual bool        DoHandleMouseEvent(NSEvent *event);
+    virtual bool        DoHandleKeyEvent(NSEvent *event);
+    virtual bool        DoHandleCharEvent(NSEvent *event, NSString *text);
+    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                SetupCoordinates(wxCoord &x, wxCoord &y, NSEvent *nsEvent);
+    virtual bool        SetupCursor(NSEvent* event);
+
+
+#if !wxOSX_USE_NATIVE_FLIPPED
+    void                SetFlipped(bool flipped);
+    virtual bool        IsFlipped() const { return m_isFlipped; }
+#endif
+
+    virtual double      GetContentScaleFactor() const;

     
     

-    virtual bool        DoHandleMouseEvent(NSEvent *event); 
-    virtual bool        DoHandleKeyEvent(NSEvent *event); 
-    virtual void        DoNotifyFocusEvent(bool receivedFocus); 
+    // 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                cursorUpdate(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);
+#if !wxOSX_USE_NATIVE_FLIPPED
+    virtual bool                isFlipped(WXWidget slf, void* _cmd);
+#endif
+    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;
 
 protected:
     WXWidget m_osxView;

+    NSEvent* m_lastKeyDownEvent;
+#if !wxOSX_USE_NATIVE_FLIPPED
+    bool m_isFlipped;
+#endif
+    // 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)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl)
 };
 


@@ -133,211 +195,175 @@ class wxNonOwnedWindowCocoaImpl : public wxNonOwnedWindowImpl
 public :
     wxNonOwnedWindowCocoaImpl( wxNonOwnedWindow* nonownedwnd) ;
     wxNonOwnedWindowCocoaImpl();
 public :
     wxNonOwnedWindowCocoaImpl( wxNonOwnedWindow* nonownedwnd) ;
     wxNonOwnedWindowCocoaImpl();

-    
+

     virtual ~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 ) ;
     void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
     long style, long extraStyle, const wxString& name ) ;

-    
+    void Create( wxWindow* parent, WXWindow nativeWindow );
+

     WXWindow GetWXWindow() const;
     WXWindow GetWXWindow() const;

-    void Raise();    
+    void Raise();

     void Lower();
     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 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;
 
     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);
     bool SetShape(const wxRegion& region);

-    
+

     virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) ;
     virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) ;

-    
+

     virtual bool IsMaximized() const;
     virtual bool IsMaximized() const;

-    
+

     virtual bool IsIconized() const;
     virtual bool IsIconized() const;

-    
+

     virtual void Iconize( bool iconize );
     virtual void Iconize( bool iconize );

-    
+

     virtual void Maximize(bool maximize);
     virtual void Maximize(bool maximize);

-    
+

     virtual bool IsFullScreen() const;
     virtual bool IsFullScreen() const;

-    
+

     virtual bool ShowFullScreen(bool show, long style);
 
     virtual bool ShowFullScreen(bool show, long style);
 

+    virtual void ShowWithoutActivating();
+

     virtual void RequestUserAttention(int flags);
     virtual void RequestUserAttention(int flags);

-    
+

     virtual void ScreenToWindow( int *x, int *y );
     virtual void ScreenToWindow( int *x, int *y );

-    
+

     virtual void WindowToScreen( int *x, int *y );
     virtual void WindowToScreen( int *x, int *y );

-    
+
+    virtual bool IsActive();
+
+    virtual void SetModified(bool modified);
+    virtual bool IsModified() const;
+
+    virtual void SetRepresentedFilename(const wxString& filename);
+

     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }

+    
+    CGWindowLevel   GetWindowLevel() const { return m_macWindowLevel; }
+    void            RestoreWindowLevel();
+    
+    static WX_NSResponder GetNextFirstResponder() ;

 protected :
 protected :

-    WX_wxNSWindow         m_macWindow;
-    void *              m_macFullScreenData ;
+    CGWindowLevel   m_macWindowLevel;
+    WXWindow        m_macWindow;
+    void *          m_macFullScreenData ;

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl)
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl)

-};    
+};

 
 

-#ifdef __OBJC__
+DECLARE_WXCOCOA_OBJC_CLASS( wxNSButton );

 
 

-    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 );
+class wxButtonCocoaImpl : public wxWidgetCocoaImpl, public wxButtonImpl
+{
+public:
+    wxButtonCocoaImpl(wxWindowMac *wxpeer, wxNSButton *v);
+    virtual void SetBitmap(const wxBitmap& bitmap);
+#if wxUSE_MARKUP
+    virtual void SetLabelMarkup(const wxString& markup);
+#endif // wxUSE_MARKUP

     
     

-    NSRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , 
+    void SetPressedBitmap( const wxBitmap& bitmap );
+    void GetLayoutInset(int &left , int &top , int &right, int &bottom) const;
+    void SetAcceleratorFromLabel(const wxString& label);
+
+    NSButton *GetNSButton() const;
+};
+
+#ifdef __OBJC__
+    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);
+
+
+    WXDLLIMPEXP_CORE NSScreen* wxOSXGetMenuScreen();
+    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 );
         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;\
-        }\
+
+    WXDLLIMPEXP_CORE NSView* wxOSXGetViewFromResponder( NSResponder* responder );

 
     // used for many wxControls
 
     // used for many wxControls

-    
+

     @interface wxNSButton : NSButton
     {
     @interface wxNSButton : NSButton
     {

-        WXCOCOAIMPL_COMMON_MEMBERS
+        NSTrackingRectTag rectTag;

     }
 
     }
 

-    WXCOCOAIMPL_COMMON_INTERFACE
-    - (void) clickedAction: (id) sender;
-

     @end
 
     @interface wxNSBox : NSBox
     {
     @end
 
     @interface wxNSBox : NSBox
     {

-        WXCOCOAIMPL_COMMON_MEMBERS

     }
 
     }
 

-    WXCOCOAIMPL_COMMON_INTERFACE
+    @end
+
+    @interface wxNSTextFieldEditor : NSTextView
+    {
+        NSEvent* lastKeyDownEvent;
+    }

 
     @end
 
 
     @end
 

-    @interface wxNSTextField : NSTextField
+    @interface wxNSTextField : NSTextField wxOSX_10_6_AND_LATER(<NSTextFieldDelegate>)

     {
     {

-       WXCOCOAIMPL_COMMON_MEMBERS
+        wxNSTextFieldEditor* fieldEditor;

     }
 
     }
 

-    WXCOCOAIMPL_COMMON_INTERFACE
-    
+    - (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>)
+    {
+    }
+
+    - (void)textDidChange:(NSNotification *)aNotification;
+
+    @end
+
+    @interface wxNSComboBox : NSComboBox
+    {
+        wxNSTextFieldEditor* fieldEditor;
+    }
+
+    - (wxNSTextFieldEditor*) fieldEditor;
+    - (void) setFieldEditor:(wxNSTextFieldEditor*) fieldEditor;
+

     @end
 
     @end
 

+
+

     @interface wxNSMenu : NSMenu
     {
        wxMenuImpl* impl;
     @interface wxNSMenu : NSMenu
     {
        wxMenuImpl* impl;


@@ -346,7 +372,7 @@ protected :
     - (void) setImplementation:(wxMenuImpl*) item;
     - (wxMenuImpl*) implementation;
 
     - (void) setImplementation:(wxMenuImpl*) item;
     - (wxMenuImpl*) implementation;
 

-    @end 
+    @end

 
     @interface wxNSMenuItem : NSMenuItem
     {
 
     @interface wxNSMenuItem : NSMenuItem
     {


@@ -359,7 +385,49 @@ protected :
     - (void)clickedAction:(id)sender;
     - (BOOL)validateMenuItem:(NSMenuItem *)menuItem;
 
     - (void)clickedAction:(id)sender;
     - (BOOL)validateMenuItem:(NSMenuItem *)menuItem;
 

-    @end 
+    @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;
+        wxDialog* impl;
+    }
+
+    - (void)setImplementation: (wxDialog *)dialog;
+    - (BOOL)finished;
+    - (int)code;
+    - (void)waitForSheetToFinish;
+    - (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo;
+    @end
+
+    // This interface must be exported in shared 64 bit multilib build but
+    // using WXEXPORT with Objective C interfaces doesn't work with old (4.0.1)
+    // gcc when using 10.4 SDK. It does work with newer gcc even in 32 bit
+    // builds but seems to be unnecessary there so to avoid the expense of a
+    // configure check verifying if this does work or not with the current
+    // compiler we just only use it for 64 bit builds where this is always
+    // supported.
+    //
+    // NB: Currently this is the only place where we need to export an
+    //     interface but if we need to do it elsewhere we should define a
+    //     WXEXPORT_OBJC macro once and reuse it in all places it's needed
+    //     instead of duplicating this preprocessor check.
+#ifdef __LP64__
+    WXEXPORT
+#endif // 64 bit builds
+    @interface wxNSAppController : NSObject wxOSX_10_6_AND_LATER(<NSApplicationDelegate>)
+    {
+    }
+
+    @end

 
 #endif // __OBJC__
 
 
 #endif // __OBJC__
 


@@ -393,12 +461,15 @@ const short kwxCursorSize = 11;
 const short kwxCursorSizeNESW = 12;
 const short kwxCursorSizeNWSE = 13;
 const short kwxCursorRoller = 14;
 const short kwxCursorSizeNESW = 12;
 const short kwxCursorSizeNWSE = 13;
 const short kwxCursorRoller = 14;

-const short kwxCursorLast = kwxCursorRoller;
+const short kwxCursorWatch = 15;
+const short kwxCursorLast = kwxCursorWatch;

 
 // exposing our fallback cursor map
 
 extern ClassicCursor gMacCursors[];
 
 
 // exposing our fallback cursor map
 
 extern ClassicCursor gMacCursors[];
 

+extern NSLayoutManager* gNSLayoutManager;
+

 #endif
 
 #endif
 #endif
 
 #endif