Refactor listbox event sending code to avoid duplication.

[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 c8adede96941b2c8d78b7a4f9dbad32f55cb5570..857e98908f5fa1ec1885c32e584370827da463f5 100644 (file)
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -23,17 +23,26 @@
 #if wxOSX_USE_ATSU_TEXT
     // we need theming and atsu
     #include <Carbon/Carbon.h>
 #if wxOSX_USE_ATSU_TEXT
     // we need theming and atsu
     #include <Carbon/Carbon.h>

+#else
+    // we only need theming, if we find a better include replace the following
+    #include <Carbon/Carbon.h>

 #endif
 
 #ifdef __OBJC__
     #import <Cocoa/Cocoa.h>
 #endif
 
 #endif
 
 #ifdef __OBJC__
     #import <Cocoa/Cocoa.h>
 #endif
 

+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
+// available in 10.4 but not in the headers
+enum {
+    kEventMouseScroll             = 11
+};
+#endif

 //
 // shared between Cocoa and Carbon
 //
 
 //
 // shared between Cocoa and Carbon
 //
 

-// bring in themeing types without pulling in the headers
+// bring in theming types without pulling in the headers

 
 #if wxUSE_GUI
 typedef SInt16 ThemeBrush;
 
 #if wxUSE_GUI
 typedef SInt16 ThemeBrush;


@@ -42,7 +51,8 @@ OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage(
                                CGContextRef    inContext,
                                const CGRect *  inBounds,
                                CGImageRef      inImage) ;
                                CGContextRef    inContext,
                                const CGRect *  inBounds,
                                CGImageRef      inImage) ;

-WX_NSImage WXDLLIMPEXP_CORE wxOSXCreateNSImageFromCGImage( CGImageRef image );
+WX_NSImage WXDLLIMPEXP_CORE wxOSXGetNSImageFromCGImage( CGImageRef image );
+CGImageRef WXDLLIMPEXP_CORE wxOSXCreateCGImageFromNSImage( WX_NSImage nsimage );

 #endif
 
 long UMAGetSystemVersion() ;
 #endif
 
 long UMAGetSystemVersion() ;


@@ -51,6 +61,8 @@ WXDLLIMPEXP_BASE wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef add
 WXDLLIMPEXP_BASE OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef );
 WXDLLIMPEXP_BASE wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname );
 
 WXDLLIMPEXP_BASE OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef );
 WXDLLIMPEXP_BASE wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname );
 

+class WXDLLIMPEXP_FWD_CORE wxDialog;
+

 //
 //
 //
 //
 //
 //


@@ -69,6 +81,17 @@ public :
     virtual bool        IsVisible() const ;
     virtual void        SetVisibility(bool);
 
     virtual bool        IsVisible() const ;
     virtual void        SetVisibility(bool);
 

+    // we provide a static function which can be reused from
+    // wxNonOwnedWindowCocoaImpl too
+    static bool ShowViewOrWindowWithEffect(wxWindow *win,
+                                           bool show,
+                                           wxShowEffect effect,
+                                           unsigned timeout);
+
+    virtual bool ShowWithEffect(bool show,
+                                wxShowEffect effect,
+                                unsigned timeout);
+

     virtual void        Raise();
 
     virtual void        Lower();
     virtual void        Raise();
 
     virtual void        Lower();


@@ -78,6 +101,7 @@ public :
     virtual WXWidget    GetWXWidget() const { return m_osxView; }
 
     virtual void        SetBackgroundColour(const wxColour&);
     virtual WXWidget    GetWXWidget() const { return m_osxView; }
 
     virtual void        SetBackgroundColour(const wxColour&);

+    virtual bool        SetBackgroundStyle(wxBackgroundStyle style);

 
     virtual void        GetContentArea( int &left , int &top , int &width , int &height ) const;
     virtual void        Move(int x, int y, int width, int height);
 
     virtual void        GetContentArea( int &left , int &top , int &width , int &height ) const;
     virtual void        Move(int x, int y, int width, int height);


@@ -122,6 +146,7 @@ public :
     void                SetScrollThumb( wxInt32 value, wxInt32 thumbSize );
 
     void                SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );
     void                SetScrollThumb( wxInt32 value, wxInt32 thumbSize );
 
     void                SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );

+    void                SetToolTip( wxToolTip* tooltip );

 
     void                InstallEventHandler( WXWidget control = NULL );
 
 
     void                InstallEventHandler( WXWidget control = NULL );
 


@@ -130,6 +155,10 @@ public :
     virtual bool        DoHandleCharEvent(NSEvent *event, NSString *text);
     virtual void        DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow);
 
     virtual bool        DoHandleCharEvent(NSEvent *event, NSString *text);
     virtual void        DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow);
 

+    virtual void        SetupKeyEvent(wxKeyEvent &wxevent, NSEvent * nsEvent, NSString* charString = NULL);
+    virtual void        SetupMouseEvent(wxMouseEvent &wxevent, NSEvent * nsEvent);
+
+

     void                SetFlipped(bool flipped);
     virtual bool        IsFlipped() const { return m_isFlipped; }
 
     void                SetFlipped(bool flipped);
     virtual bool        IsFlipped() const { return m_isFlipped; }
 


@@ -152,6 +181,10 @@ public :
 
     virtual void                controlAction(WXWidget slf, void* _cmd, void* sender);
     virtual void                controlDoubleAction(WXWidget slf, void* _cmd, void *sender);
 
     virtual void                controlAction(WXWidget slf, void* _cmd, void* sender);
     virtual void                controlDoubleAction(WXWidget slf, void* _cmd, void *sender);

+    
+    // for wxTextCtrl-derived classes, put here since they don't all derive
+    // from the same pimpl class.
+    virtual void                controlTextDidChange();

 
 protected:
     WXWidget m_osxView;
 
 protected:
     WXWidget m_osxView;


@@ -174,20 +207,25 @@ public :
 
     virtual ~wxNonOwnedWindowCocoaImpl();
 
 
     virtual ~wxNonOwnedWindowCocoaImpl();
 

-    virtual void Destroy() ;
+    virtual void WillBeDestroyed() ;

     void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
     long style, long extraStyle, const wxString& name ) ;
     void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
     long style, long extraStyle, const wxString& name ) ;

+    void Create( wxWindow* parent, WXWindow nativeWindow );

 
     WXWindow GetWXWindow() const;
     void Raise();
     void Lower();
     bool Show(bool show);
 
     WXWindow GetWXWindow() const;
     void Raise();
     void Lower();
     bool Show(bool show);

-    bool ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout);
+
+    virtual bool ShowWithEffect(bool show,
+                                wxShowEffect effect,
+                                unsigned timeout);

 
     void Update();
     bool SetTransparent(wxByte alpha);
     bool SetBackgroundColour(const wxColour& col );
     void SetExtraStyle( long exStyle );
 
     void Update();
     bool SetTransparent(wxByte alpha);
     bool SetBackgroundColour(const wxColour& col );
     void SetExtraStyle( long exStyle );

+    void SetWindowStyleFlag( long style );

     bool SetBackgroundStyle(wxBackgroundStyle style);
     bool CanSetTransparent();
 
     bool SetBackgroundStyle(wxBackgroundStyle style);
     bool CanSetTransparent();
 


@@ -212,16 +250,23 @@ public :
 
     virtual bool ShowFullScreen(bool show, long style);
 
 
     virtual bool ShowFullScreen(bool show, long style);
 

+    virtual void ShowWithoutActivating();
+

     virtual void RequestUserAttention(int flags);
 
     virtual void ScreenToWindow( int *x, int *y );
 
     virtual void WindowToScreen( int *x, int *y );
 
     virtual void RequestUserAttention(int flags);
 
     virtual void ScreenToWindow( int *x, int *y );
 
     virtual void WindowToScreen( int *x, int *y );
 

+    virtual bool IsActive();
+    
+    virtual void SetModified(bool modified);
+    virtual bool IsModified() const;
+

     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
 protected :
     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
 protected :

-    WX_wxNSWindow         m_macWindow;
-    void *              m_macFullScreenData ;
+    WXWindow        m_macWindow;
+    void *          m_macFullScreenData ;

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl)
 };
 


@@ -239,6 +284,7 @@ protected :
 
     @interface wxNSButton : NSButton
     {
 
     @interface wxNSButton : NSButton
     {

+        NSTrackingRectTag rectTag;

     }
 
     @end
     }
 
     @end


@@ -256,7 +302,7 @@ protected :
 
     @end
 
 
     @end
 

-    @interface wxNSTextField : NSTextField
+    @interface wxNSTextField : NSTextField wxOSX_10_6_AND_LATER(<NSTextFieldDelegate>)

     {
         wxNSTextFieldEditor* fieldEditor;
     }
     {
         wxNSTextFieldEditor* fieldEditor;
     }


@@ -266,17 +312,19 @@ protected :
 
     @end
 
 
     @end
 

-    @interface wxNSSecureTextField : NSSecureTextField
+    @interface wxNSSecureTextField : NSSecureTextField wxOSX_10_6_AND_LATER(<NSTextFieldDelegate>)

     {
     }
 
     @end
 
 
     {
     }
 
     @end
 
 

-    @interface wxNSTextView : NSTextView
+    @interface wxNSTextView : NSTextView wxOSX_10_6_AND_LATER(<NSTextViewDelegate>)

     {
     }
 
     {
     }
 

+    - (void)textDidChange:(NSNotification *)aNotification;
+

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


@@ -313,8 +361,10 @@ protected :
     {
         BOOL sheetFinished;
         int resultCode;
     {
         BOOL sheetFinished;
         int resultCode;

+        wxDialog* impl;

     }
 
     }
 

+    - (void)setImplementation: (wxDialog *)dialog;

     - (BOOL)finished;
     - (int)code;
     - (void)waitForSheetToFinish;
     - (BOOL)finished;
     - (int)code;
     - (void)waitForSheetToFinish;