X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/524c47aa3adf2af11a3069fd5da035a604f08f66..b2238cc3156f4e15e567d2218c88301bc2af9adb:/include/wx/osx/cocoa/private.h?ds=sidebyside

diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index 51f7015479..d1c7059d7e 100644
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -16,55 +16,18 @@
 
 #include "wx/osx/core/private.h"
 
-#ifdef __OBJC__
-
-    #import <Cocoa/Cocoa.h>
+#include "wx/defs.h"
 
-    extern NSRect wxToNSRect( NSView* parent, const wxRect& r );
-    extern wxRect wxFromNSRect( NSView* parent, const NSRect& rect );
-    extern NSPoint wxToNSPoint( NSView* parent, const wxPoint& p );
-    extern wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p );
-    
-    // used for many wxControls
-    
-    @interface wxNSButton : NSButton
-    {
-        wxWidgetImpl* impl;
-    }
+#include <ApplicationServices/ApplicationServices.h>
 
-    - (void)setImplementation: (wxWidgetImpl *) theImplementation;
-    - (wxWidgetImpl*) implementation;
-    - (BOOL) isFlipped;
-    - (void) clickedAction: (id) sender;
-
-    @end
-
-    @interface wxNSBox : NSBox
-    {
-        wxWidgetImpl* impl;
-    }
-
-    - (void)setImplementation: (wxWidgetImpl *) theImplementation;
-    - (wxWidgetImpl*) implementation;
-    - (BOOL) isFlipped;
-
-    @end
-
-    @interface wxNSTextField : NSTextField
-    {
-        wxWidgetImpl* impl;
-    }
-
-    - (void)setImplementation: (wxWidgetImpl *) theImplementation;
-    - (wxWidgetImpl*) implementation;
-    - (BOOL) isFlipped;
-
-    @end
-
-    NSRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , 
-        bool adjustForOrigin = true );
+#if wxOSX_USE_ATSU_TEXT
+    // we need theming and atsu
+    #include <Carbon/Carbon.h>
+#endif
 
-#endif // __OBJC__
+#ifdef __OBJC__
+    #import <Cocoa/Cocoa.h>
+#endif
 
 //
 // shared between Cocoa and Carbon
@@ -72,15 +35,17 @@
 
 // bring in themeing types without pulling in the headers
 
+#if wxUSE_GUI
 typedef SInt16 ThemeBrush;
-long UMAGetSystemVersion() ;
-CGColorRef wxMacCreateCGColorFromHITheme( ThemeBrush brush ) ;
+CGColorRef WXDLLIMPEXP_CORE wxMacCreateCGColorFromHITheme( ThemeBrush brush ) ;
 OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage(
                                CGContextRef    inContext,
                                const CGRect *  inBounds,
                                CGImageRef      inImage) ;
-WX_NSImage  wxOSXCreateNSImageFromCGImage( CGImageRef image );
+WX_NSImage WXDLLIMPEXP_CORE wxOSXCreateNSImageFromCGImage( CGImageRef image );
+#endif
 
+long UMAGetSystemVersion() ;
 WXDLLIMPEXP_BASE void wxMacStringToPascal( const wxString&from , StringPtr to );
 WXDLLIMPEXP_BASE wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent = NULL );
 WXDLLIMPEXP_BASE OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef );
@@ -135,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 );
@@ -145,14 +114,26 @@ 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 );
 
+    void                SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );
+
+    void                InstallEventHandler( WXWidget control = NULL );
+    
+    virtual bool        DoHandleMouseEvent(NSEvent *event); 
+    virtual bool        DoHandleKeyEvent(NSEvent *event); 
+    virtual void        DoNotifyFocusEvent(bool receivedFocus); 
+
 protected:
     WXWidget m_osxView;
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl)
 };
 
+DECLARE_WXCOCOA_OBJC_CLASS( wxNSWindow );
+
 class wxNonOwnedWindowCocoaImpl : public wxNonOwnedWindowImpl
 {
 public :
@@ -207,11 +188,259 @@ public :
     
     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
 protected :
-    WX_NSWindow          m_macWindow;
+    WX_wxNSWindow         m_macWindow;
     void *              m_macFullScreenData ;
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl)
 };    
 
+#ifdef __OBJC__
+
+    extern NSRect wxToNSRect( NSView* parent, const wxRect& r );
+    extern wxRect wxFromNSRect( NSView* parent, const NSRect& rect );
+    extern NSPoint wxToNSPoint( NSView* parent, const wxPoint& p );
+    extern wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p );
+    
+    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_EVENTS_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 ;\
+        - (void)mouseMoved:(NSEvent *)event;\
+        - (void)mouseDragged:(NSEvent *)event;\
+        - (void)rightMouseDragged:(NSEvent *)event;\
+        - (void)otherMouseDragged:(NSEvent *)event;\
+        - (void)scrollWheel:(NSEvent *)theEvent;\
+        - (void)mouseEntered:(NSEvent *)event;\
+        - (void)mouseExited:(NSEvent *)event;\
+        - (void)keyDown:(NSEvent *)event;\
+        - (void)keyUp:(NSEvent *)event;\
+        - (BOOL)performKeyEquivalent:(NSEvent *)event;\
+        - (void)flagsChanged:(NSEvent *)event;\
+        - (BOOL)becomeFirstResponder;\
+        - (BOOL)resignFirstResponder;\
+        - (void)resetCursorRects;
+
+
+    #define WXCOCOAIMPL_COMMON_EVENTS_IMPLEMENTATION_NO_MOUSEDOWN        -(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];\
+        }\
+        -(void)mouseMoved:(NSEvent *)event\
+        {\
+            if ( !impl->DoHandleMouseEvent(event) )\
+                [super mouseMoved:event];\
+        }\
+        -(void)mouseDragged:(NSEvent *)event\
+        {\
+            if ( !impl->DoHandleMouseEvent(event) )\
+                [super mouseDragged:event];\
+        }\
+        -(void)rightMouseDragged:(NSEvent *)event\
+        {\
+            if ( !impl->DoHandleMouseEvent(event) )\
+                [super rightMouseDragged:event];\
+        }\
+        -(void)otherMouseDragged:(NSEvent *)event\
+        {\
+            if ( !impl->DoHandleMouseEvent(event) )\
+                [super otherMouseDragged:event];\
+        }\
+        -(void)scrollWheel:(NSEvent *)event\
+        {\
+            if ( !impl->DoHandleMouseEvent(event) )\
+                [super scrollWheel:event];\
+        }\
+        -(void)mouseEntered:(NSEvent *)event\
+        {\
+            if ( !impl->DoHandleMouseEvent(event) )\
+                [super mouseEntered:event];\
+        }\
+        -(void)mouseExited:(NSEvent *)event\
+        {\
+            if ( !impl->DoHandleMouseEvent(event) )\
+                [super mouseExited:event];\
+        }\
+        -(BOOL)performKeyEquivalent:(NSEvent *)event\
+        {\
+            if ( !impl->DoHandleKeyEvent(event) )\
+                return [super performKeyEquivalent:event];\
+            return YES;\
+        }\
+        -(void)keyDown:(NSEvent *)event\
+        {\
+            if ( !impl->DoHandleKeyEvent(event) )\
+                [super keyDown:event];\
+        }\
+        -(void)keyUp:(NSEvent *)event\
+        {\
+            if ( !impl->DoHandleKeyEvent(event) )\
+                [super keyUp:event];\
+        }\
+        -(void)flagsChanged:(NSEvent *)event\
+        {\
+            if ( !impl->DoHandleKeyEvent(event) )\
+                [super flagsChanged:event];\
+        }\
+        - (BOOL) becomeFirstResponder\
+        {\
+            BOOL r = [super becomeFirstResponder];\
+            if ( r )\
+                impl->DoNotifyFocusEvent( true );\
+            return r;\
+        }\
+        - (BOOL) resignFirstResponder\
+        {\
+            BOOL r = [super resignFirstResponder];\
+            if ( r )\
+                impl->DoNotifyFocusEvent( false );\
+            return r;\
+        }\
+        - (void) resetCursorRects\
+        {\
+            if ( impl )\
+            {\
+                wxWindow* wxpeer = impl->GetWXPeer();\
+                if ( wxpeer )\
+                {\
+                    NSCursor *cursor = (NSCursor*)wxpeer->GetCursor().GetHCURSOR();\
+                    if (cursor == NULL)\
+                        [super resetCursorRects];\
+                    else\
+                        [self addCursorRect: [self bounds]\
+                            cursor: cursor];\
+                }\
+            }\
+        }
+
+    #define WXCOCOAIMPL_COMMON_EVENTS_IMPLEMENTATION -(void)mouseDown:(NSEvent *)event \
+        {\
+            if ( !impl->DoHandleMouseEvent(event) )\
+                [super mouseDown:event];\
+        }\
+        WXCOCOAIMPL_COMMON_EVENTS_IMPLEMENTATION_NO_MOUSEDOWN
+
+    #define WXCOCOAIMPL_COMMON_MEMBERS wxWidgetCocoaImpl* impl;
+    
+    #define WXCOCOAIMPL_COMMON_INTERFACE \
+        - (void)setImplementation: (wxWidgetCocoaImpl *) theImplementation;\
+        - (wxWidgetCocoaImpl*) implementation;\
+        - (BOOL) isFlipped;\
+        WXCOCOAIMPL_COMMON_EVENTS_INTERFACE
+
+    #define WXCOCOAIMPL_COMMON_IMPLEMENTATION_BASE - (void)setImplementation: (wxWidgetCocoaImpl *) theImplementation\
+        {\
+            impl = theImplementation;\
+        }\
+        - (wxWidgetCocoaImpl*) implementation\
+        {\
+            return impl;\
+        }\
+
+    #define WXCOCOAIMPL_COMMON_IMPLEMENTATION WXCOCOAIMPL_COMMON_EVENTS_IMPLEMENTATION \
+        WXCOCOAIMPL_COMMON_IMPLEMENTATION_BASE \
+        - (BOOL) isFlipped\
+        {\
+            return YES;\
+        }
+
+    #define WXCOCOAIMPL_COMMON_IMPLEMENTATION_NO_MOUSEDOWN WXCOCOAIMPL_COMMON_EVENTS_IMPLEMENTATION_NO_MOUSEDOWN \
+        WXCOCOAIMPL_COMMON_IMPLEMENTATION_BASE \
+        - (BOOL) isFlipped\
+        {\
+            return YES;\
+        }
+
+
+     #define WXCOCOAIMPL_COMMON_IMPLEMENTATION_NOT_FLIPPED WXCOCOAIMPL_COMMON_EVENTS_IMPLEMENTATION \
+        WXCOCOAIMPL_COMMON_IMPLEMENTATION_BASE \
+        - (BOOL) isFlipped\
+        {\
+            return NO;\
+        }
+
+    // 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 
+
+#endif // __OBJC__
+
 // NSCursor
 
 WX_NSCursor wxMacCocoaCreateStockCursor( int cursor_type );