check for self assignment in operator=

[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 ab8ba6b158e049fff758f3dd83df427d8df2374a..caf331cf2a6514927f1d0be38f5c5c55a5d7e5aa 100644 (file)
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -23,6 +23,9 @@
 #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__
@@ -43,6 +46,7 @@ OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage(
                                const CGRect *  inBounds,
                                CGImageRef      inImage) ;
 WX_NSImage WXDLLIMPEXP_CORE wxOSXCreateNSImageFromCGImage( CGImageRef image );
+CGImageRef WXDLLIMPEXP_CORE wxOSXCreateCGImageFromNSImage( WX_NSImage nsimage );
 #endif
 
 long UMAGetSystemVersion() ;
@@ -69,6 +73,17 @@ public :
     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();
@@ -130,6 +145,10 @@ public :
     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                SetFlipped(bool flipped);
     virtual bool        IsFlipped() const { return m_isFlipped; }
 
@@ -182,12 +201,16 @@ public :
     void Raise();
     void Lower();
     bool Show(bool show);
-    bool ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout);
+
+    virtual bool ShowWithEffect(bool show,
+                                wxShowEffect effect,
+                                unsigned timeout);
 
     void Update();
     bool SetTransparent(wxByte alpha);
     bool SetBackgroundColour(const wxColour& col );
     void SetExtraStyle( long exStyle );
+    void SetWindowStyleFlag( long style );
     bool SetBackgroundStyle(wxBackgroundStyle style);
     bool CanSetTransparent();
 
@@ -212,12 +235,16 @@ public :
 
     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();
+
     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
 protected :
     WX_wxNSWindow         m_macWindow;
@@ -239,6 +266,7 @@ protected :
 
     @interface wxNSButton : NSButton
     {
+        NSTrackingRectTag rectTag;
     }
 
     @end
@@ -273,10 +301,12 @@ protected :
     @end
 
 
-    @interface wxNSTextView : NSTextView
+    @interface wxNSTextView : NSTextView wxOSX_10_6_AND_LATER(<NSTextViewDelegate>)
     {
     }
 
+    - (void)textDidChange:(NSNotification *)aNotification;
+
     @end
 
     @interface wxNSMenu : NSMenu