menu fixes, also fixes #10479

[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 cccac824e9ad556dce55823cb195c71a20d77c9b..c9cea5f018dc8bd6c709e7ff611466bdff09c8c8 100644 (file)
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -16,55 +16,18 @@
 
 #include "wx/osx/core/private.h"
 
 
 #include "wx/osx/core/private.h"
 

-#ifdef __OBJC__
-
-    #import <Cocoa/Cocoa.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;
-    }
-
-    - (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;
+#include "wx/defs.h"

 
 

-    @end
+#include <ApplicationServices/ApplicationServices.h>

 
 

-    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
 
 //
 // shared between Cocoa and Carbon


@@ -72,15 +35,17 @@
 
 // bring in themeing types without pulling in the headers
 
 
 // bring in themeing types without pulling in the headers
 

+#if wxUSE_GUI

 typedef SInt16 ThemeBrush;
 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) ;
 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 );
 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                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 );
     wxInt32             GetValue() const;
     void                SetValue( wxInt32 v );
     void                SetBitmap( const wxBitmap& bitmap );


@@ -145,16 +114,46 @@ public :
     bool                ButtonClickDidStateChange() { return true ;}
     void                SetMinimum( wxInt32 v );
     void                SetMaximum( wxInt32 v );
     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                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); 
+
+    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;
 protected:
     WXWidget m_osxView;

+    bool m_isFlipped;
+    

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl)
 };
 

+DECLARE_WXCOCOA_OBJC_CLASS( wxNSWindow );
+

 class wxNonOwnedWindowCocoaImpl : public wxNonOwnedWindowImpl
 {
 public :
 class wxNonOwnedWindowCocoaImpl : public wxNonOwnedWindowImpl
 {
 public :


@@ -209,11 +208,68 @@ public :
     
     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
 protected :
     
     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
 protected :

-    WX_NSWindow          m_macWindow;
+    WX_wxNSWindow         m_macWindow;

     void *              m_macFullScreenData ;
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl)
 };    
 
     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 );
+        
+    // used for many wxControls
+    
+    @interface wxNSButton : NSButton
+    {
+    }
+    
+    @end
+
+    @interface wxNSBox : NSBox
+    {
+    }
+
+    @end
+
+    @interface wxNSTextField : NSTextField
+    {
+    }
+
+    @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__
+

 // NSCursor
 
 WX_NSCursor wxMacCocoaCreateStockCursor( int cursor_type );
 // NSCursor
 
 WX_NSCursor wxMacCocoaCreateStockCursor( int cursor_type );