X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4e3249255361245b5a4bc746e40374f2186439e..545cb3fcf2460919deb52cf47f6cb0bdf494fae7:/include/wx/osx/cocoa/private.h?ds=sidebyside

diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index 3fa6846c61..ec69ce31d0 100644
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -106,7 +106,9 @@ public :
 
     wxInt32             GetValue() const;
     void                SetValue( wxInt32 v );
+    wxBitmap            GetBitmap() const;
     void                SetBitmap( const wxBitmap& bitmap );
+    void                SetBitmapPosition( wxDirection dir );
     void                SetupTabs( const wxNotebook &notebook );
     void                GetBestRect( wxRect *r ) const;
     bool                IsEnabled() const;
@@ -129,7 +131,7 @@ public :
     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
 
@@ -155,6 +157,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)
 };
@@ -222,10 +227,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 );
@@ -244,13 +249,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