X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/724999ee872d741f182af4eac6c137c5120fdd79..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/osx/cocoa/private.h

diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index 2e7de760b9..fb8f330b3d 100644
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -98,7 +98,7 @@ public :
 
     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();
@@ -126,10 +126,10 @@ public :
     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); 
 
     void                SetFlipped(bool flipped);
-    bool                IsFlipped() const { return m_isFlipped; }
+    virtual bool        IsFlipped() const { return m_isFlipped; }
 
     // cocoa thunk connected calls
 
@@ -141,6 +141,7 @@ public :
     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);
@@ -154,6 +155,9 @@ 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)
 };
@@ -221,10 +225,10 @@ protected :
 
 #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 );
@@ -243,13 +247,34 @@ protected :
 
     @end
 
+    @interface wxNSTextFieldEditor : NSTextView
+    {
+        NSEvent* lastKeyDownEvent;
+    }
+
+    @end
+
     @interface wxNSTextField : NSTextField
     {
-        wxWidgetCocoaImpl* impl;
+        wxNSTextFieldEditor* fieldEditor;
     }
 
-    - (void) setImplementation:(wxWidgetCocoaImpl*) item;
-    - (wxWidgetCocoaImpl*) implementation;
+    - (wxNSTextFieldEditor*) fieldEditor;
+    - (void) setFieldEditor:(wxNSTextFieldEditor*) fieldEditor;
+
+    @end
+
+    @interface wxNSSecureTextField : NSSecureTextField
+    {
+    }
+
+    @end
+
+
+    @interface wxNSTextView : NSTextView
+    {
+    }
+    
     @end
 
     @interface wxNSMenu : NSMenu