no changes, just remove #if'd out code

[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 2e7de760b982026526c8233163fdb64a0089dbc7..82fa07ce1723be9735d21ea6d88c72688f70287a 100644 (file)
--- 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);
@@ -245,11 +246,7 @@ protected :
 
     @interface wxNSTextField : NSTextField
     {
-        wxWidgetCocoaImpl* impl;
     }
-
-    - (void) setImplementation:(wxWidgetCocoaImpl*) item;
-    - (wxWidgetCocoaImpl*) implementation;
     @end
 
     @interface wxNSMenu : NSMenu