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 d9bf8338d126c65e9be18a5a65940a17d5ad8040..caf331cf2a6514927f1d0be38f5c5c55a5d7e5aa 100644 (file)
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -144,7 +144,7 @@ public :
     virtual bool        DoHandleKeyEvent(NSEvent *event);
     virtual bool        DoHandleCharEvent(NSEvent *event, NSString *text);
     virtual void        DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow);
     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);
 
     virtual void        SetupKeyEvent(wxKeyEvent &wxevent, NSEvent * nsEvent, NSString* charString = NULL);
     virtual void        SetupMouseEvent(wxMouseEvent &wxevent, NSEvent * nsEvent);
 


@@ -210,6 +210,7 @@ public :
     bool SetTransparent(wxByte alpha);
     bool SetBackgroundColour(const wxColour& col );
     void SetExtraStyle( long exStyle );
     bool SetTransparent(wxByte alpha);
     bool SetBackgroundColour(const wxColour& col );
     void SetExtraStyle( long exStyle );

+    void SetWindowStyleFlag( long style );

     bool SetBackgroundStyle(wxBackgroundStyle style);
     bool CanSetTransparent();
 
     bool SetBackgroundStyle(wxBackgroundStyle style);
     bool CanSetTransparent();
 


@@ -234,12 +235,16 @@ public :
 
     virtual bool ShowFullScreen(bool show, long style);
 
 
     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 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;
     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
 protected :
     WX_wxNSWindow         m_macWindow;


@@ -296,10 +301,12 @@ protected :
     @end
 
 
     @end
 
 

-    @interface wxNSTextView : NSTextView
+    @interface wxNSTextView : NSTextView wxOSX_10_6_AND_LATER(<NSTextViewDelegate>)

     {
     }
 
     {
     }
 

+    - (void)textDidChange:(NSNotification *)aNotification;
+

     @end
 
     @interface wxNSMenu : NSMenu
     @end
 
     @interface wxNSMenu : NSMenu