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 507816b18217b0b1c723116bba4591fcff5d44ce..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                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();
 
     void                SetCursor( const wxCursor & cursor );
     void                CaptureMouse();


@@ -124,10 +124,14 @@ public :
     void                InstallEventHandler( WXWidget control = NULL );
     
     virtual bool        DoHandleMouseEvent(NSEvent *event); 
     void                InstallEventHandler( WXWidget control = NULL );
     
     virtual bool        DoHandleMouseEvent(NSEvent *event); 

-    virtual bool        DoHandleKeyEvent(NSEvent *event); 
-    virtual void        DoNotifyFocusEvent(bool receivedFocus); 
+    virtual bool        DoHandleKeyEvent(NSEvent *event);
+    virtual bool        DoHandleCharEvent(NSEvent *event, NSString *text);
+    virtual void        DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow); 

 
     void                SetFlipped(bool flipped);
 
     void                SetFlipped(bool flipped);

+    virtual bool        IsFlipped() const { return m_isFlipped; }
+
+    // cocoa thunk connected calls

 
     virtual unsigned int        draggingEntered(void* sender, WXWidget slf, void* _cmd);
     virtual void                draggingExited(void* sender, WXWidget slf, void* _cmd);
 
     virtual unsigned int        draggingEntered(void* sender, WXWidget slf, void* _cmd);
     virtual void                draggingExited(void* sender, WXWidget slf, void* _cmd);


@@ -135,18 +139,21 @@ public :
     virtual bool                performDragOperation(void* sender, WXWidget slf, void* _cmd);
     virtual void                mouseEvent(WX_NSEvent event, WXWidget slf, void* _cmd);
     virtual void                keyEvent(WX_NSEvent event, WXWidget slf, void* _cmd);
     virtual bool                performDragOperation(void* sender, WXWidget slf, void* _cmd);
     virtual void                mouseEvent(WX_NSEvent event, WXWidget slf, void* _cmd);
     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                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);
     virtual bool                isFlipped(WXWidget slf, void* _cmd);
     virtual void                drawRect(void* rect, 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);
     virtual bool                isFlipped(WXWidget slf, void* _cmd);
     virtual void                drawRect(void* rect, WXWidget slf, void* _cmd);
     

-    virtual void                clickedAction(WXWidget slf, void* _cmd, void* sender);
-    virtual void                doubleClickedAction(WXWidget slf, void* _cmd, void *sender);
+    virtual void                controlAction(WXWidget slf, void* _cmd, void* sender);
+    virtual void                controlDoubleAction(WXWidget slf, void* _cmd, void *sender);

 
 protected:
     WXWidget m_osxView;
 
 protected:
     WXWidget m_osxView;

+    NSEvent* m_lastKeyDownEvent;

     bool m_isFlipped;
     
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl)
     bool m_isFlipped;
     
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl)


@@ -240,7 +247,6 @@ protected :
     @interface wxNSTextField : NSTextField
     {
     }
     @interface wxNSTextField : NSTextField
     {
     }

-

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


@@ -266,7 +272,25 @@ protected :
 
     @end 
     
 
     @end 
     

-    void wxOSXCocoaClassAddWXMethods(Class c);
+    void WXDLLIMPEXP_CORE wxOSXCocoaClassAddWXMethods(Class c);
+
+    /*
+    We need this for ShowModal, as the sheet just disables the parent window and
+    returns control to the app, whereas we don't want to return from ShowModal
+    until the sheet has been dismissed.
+    */
+    @interface ModalDialogDelegate : NSObject
+    {
+        BOOL sheetFinished;
+        int resultCode;
+    }
+
+    - (BOOL)finished;
+    - (int)code;
+    - (void)waitForSheetToFinish;
+    - (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo;
+    @end
+

 
 #endif // __OBJC__
 
 
 #endif // __OBJC__