X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b466e85a7e81db84545bc44c83cbe4ccacd4fe8e..1ea5ef0190b1b2f4d248af6b06d718a9adef2d41:/include/wx/osx/cocoa/private.h

diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index 26f1a90a50..c9cea5f018 100644
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -100,6 +100,10 @@ public :
     void                PerformClick();
     void                SetLabel(const wxString& title, wxFontEncoding encoding);
 
+    void                SetCursor( const wxCursor & cursor );
+    void                CaptureMouse();
+    void                ReleaseMouse();
+
     wxInt32             GetValue() const;
     void                SetValue( wxInt32 v );
     void                SetBitmap( const wxBitmap& bitmap );
@@ -110,6 +114,8 @@ public :
     bool                ButtonClickDidStateChange() { return true ;}
     void                SetMinimum( wxInt32 v );
     void                SetMaximum( wxInt32 v );
+    wxInt32             GetMinimum() const;
+    wxInt32             GetMaximum() const;
     void                PulseGauge();
     void                SetScrollThumb( wxInt32 value, wxInt32 thumbSize );
 
@@ -118,12 +124,36 @@ public :
     void                InstallEventHandler( WXWidget control = NULL );
     
     virtual bool        DoHandleMouseEvent(NSEvent *event); 
+    virtual bool        DoHandleKeyEvent(NSEvent *event); 
+    virtual void        DoNotifyFocusEvent(bool receivedFocus); 
+
+    void                SetFlipped(bool flipped);
+
+    virtual unsigned int        draggingEntered(void* sender, WXWidget slf, void* _cmd);
+    virtual void                draggingExited(void* sender, WXWidget slf, void* _cmd);
+    virtual unsigned int        draggingUpdated(void* sender, 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 bool                performKeyEquivalent(WX_NSEvent event, 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);
 
 protected:
     WXWidget m_osxView;
+    bool m_isFlipped;
+    
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl)
 };
 
+DECLARE_WXCOCOA_OBJC_CLASS( wxNSWindow );
+
 class wxNonOwnedWindowCocoaImpl : public wxNonOwnedWindowImpl
 {
 public :
@@ -178,7 +208,7 @@ public :
     
     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
 protected :
-    WX_NSWindow          m_macWindow;
+    WX_wxNSWindow         m_macWindow;
     void *              m_macFullScreenData ;
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl)
 };    
@@ -193,99 +223,50 @@ protected :
     NSRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , 
         bool adjustForOrigin = true );
         
-    // common code snippets for cocoa implementations
-    // later to be done using injection in method table
-        
-    #define WXCOCOAIMPL_COMMON_MOUSE_INTERFACE -(void)mouseDown:(NSEvent *)event ;\
-        -(void)rightMouseDown:(NSEvent *)event ;\
-        -(void)otherMouseDown:(NSEvent *)event ;\
-        -(void)mouseUp:(NSEvent *)event ;\
-        -(void)rightMouseUp:(NSEvent *)event ;\
-        -(void)otherMouseUp:(NSEvent *)event ;\
-
-    #define WXCOCOAIMPL_COMMON_MOUSE_IMPLEMENTATION -(void)mouseDown:(NSEvent *)event \
-        {\
-            if ( !impl->DoHandleMouseEvent(event) )\
-                [super mouseDown:event];\
-        }\
-        -(void)rightMouseDown:(NSEvent *)event\
-        {\
-            if ( !impl->DoHandleMouseEvent(event) )\
-                [super rightMouseDown:event];\
-        }\
-        -(void)otherMouseDown:(NSEvent *)event\
-        {\
-            if ( !impl->DoHandleMouseEvent(event) )\
-                [super otherMouseDown:event];\
-        }\
-        -(void)mouseUp:(NSEvent *)event\
-        {\
-            if ( !impl->DoHandleMouseEvent(event) )\
-                [super mouseUp:event];\
-        }\
-        -(void)rightMouseUp:(NSEvent *)event\
-        {\
-            if ( !impl->DoHandleMouseEvent(event) )\
-                [super rightMouseUp:event];\
-        }\
-        -(void)otherMouseUp:(NSEvent *)event\
-        {\
-            if ( !impl->DoHandleMouseEvent(event) )\
-                [super otherMouseUp:event];\
-        }
-        
-    #define WXCOCOAIMPL_COMMON_MEMBERS wxWidgetCocoaImpl* impl;
-    
-    #define WXCOCOAIMPL_COMMON_INTERFACE \
-        - (void)setImplementation: (wxWidgetCocoaImpl *) theImplementation;\
-        - (wxWidgetCocoaImpl*) implementation;\
-        - (BOOL) isFlipped;\
-        WXCOCOAIMPL_COMMON_MOUSE_INTERFACE
-
-    #define WXCOCOAIMPL_COMMON_IMPLEMENTATION WXCOCOAIMPL_COMMON_MOUSE_IMPLEMENTATION \
-        - (void)setImplementation: (wxWidgetCocoaImpl *) theImplementation\
-        {\
-            impl = theImplementation;\
-        }\
-        - (wxWidgetCocoaImpl*) implementation\
-        {\
-            return impl;\
-        }\
-        - (BOOL) isFlipped\
-        {\
-            return YES;\
-        }\
-
     // used for many wxControls
     
     @interface wxNSButton : NSButton
     {
-        WXCOCOAIMPL_COMMON_MEMBERS
     }
-
-    WXCOCOAIMPL_COMMON_INTERFACE
-    - (void) clickedAction: (id) sender;
-
+    
     @end
 
     @interface wxNSBox : NSBox
     {
-        WXCOCOAIMPL_COMMON_MEMBERS
     }
 
-    WXCOCOAIMPL_COMMON_INTERFACE
-
     @end
 
     @interface wxNSTextField : NSTextField
     {
-       WXCOCOAIMPL_COMMON_MEMBERS
     }
 
-    WXCOCOAIMPL_COMMON_INTERFACE
-    
     @end
 
+    @interface wxNSMenu : NSMenu
+    {
+       wxMenuImpl* impl;
+    }
+
+    - (void) setImplementation:(wxMenuImpl*) item;
+    - (wxMenuImpl*) implementation;
+
+    @end 
+
+    @interface wxNSMenuItem : NSMenuItem
+    {
+       wxMenuItemImpl* impl;
+    }
+
+    - (void) setImplementation:(wxMenuItemImpl*) item;
+    - (wxMenuItemImpl*) implementation;
+
+    - (void)clickedAction:(id)sender;
+    - (BOOL)validateMenuItem:(NSMenuItem *)menuItem;
+
+    @end 
+    
+    void WXDLLIMPEXP_CORE wxOSXCocoaClassAddWXMethods(Class c);
 
 #endif // __OBJC__