Added functionality for disabling the vertical scrollbar.

[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 e7ce32fa9a007161db05850fe5a80100eb394aa5..0e3819505b9999921edd088a0dea582c07ccea60 100644 (file)
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -6,7 +6,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01

-// RCS-ID:      $Id: private.h 53819 2008-05-29 14:11:45Z SC $
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -14,24 +14,18 @@
 #ifndef _WX_PRIVATE_COCOA_H_
 #define _WX_PRIVATE_COCOA_H_
 
 #ifndef _WX_PRIVATE_COCOA_H_
 #define _WX_PRIVATE_COCOA_H_
 

-#include "wx/osx/core/private.h"
-
-#include "wx/defs.h"
-

 #include <ApplicationServices/ApplicationServices.h>
 
 #include <ApplicationServices/ApplicationServices.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
 
 #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
 //


@@ -45,26 +39,16 @@ 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 );
 CGImageRef WXDLLIMPEXP_CORE wxOSXCreateCGImageFromNSImage( WX_NSImage nsimage );

-#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 wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname );
-
-//
-//
-//
+wxBitmap WXDLLIMPEXP_CORE wxOSXCreateSystemBitmap(const wxString& id, const wxString &client, const wxSize& size);

 
 

-#if wxUSE_GUI
+class WXDLLIMPEXP_FWD_CORE wxDialog;

 
 class WXDLLIMPEXP_CORE wxWidgetCocoaImpl : public wxWidgetImpl
 {
 public :
 
 class WXDLLIMPEXP_CORE wxWidgetCocoaImpl : public wxWidgetImpl
 {
 public :

-    wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false ) ;
+    wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false, bool isUserPane = false ) ;

     wxWidgetCocoaImpl() ;
     ~wxWidgetCocoaImpl();
 
     wxWidgetCocoaImpl() ;
     ~wxWidgetCocoaImpl();
 


@@ -93,6 +77,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);


@@ -137,6 +122,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 );
 


@@ -172,6 +158,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;
     NSEvent* m_lastKeyDownEvent;
 protected:
     WXWidget m_osxView;
     NSEvent* m_lastKeyDownEvent;


@@ -196,6 +186,7 @@ public :
     virtual void WillBeDestroyed() ;
     void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
     long style, long extraStyle, const wxString& name ) ;
     virtual void WillBeDestroyed() ;
     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();
 
     WXWindow GetWXWindow() const;
     void Raise();


@@ -244,19 +235,26 @@ public :
     virtual void WindowToScreen( int *x, int *y );
 
     virtual bool IsActive();
     virtual void WindowToScreen( int *x, int *y );
 
     virtual bool IsActive();

-    
+

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

+    virtual void SetRepresentedFilename(const wxString& filename);
+

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

+    
+    CGWindowLevel   GetWindowLevel() const { return m_macWindowLevel; }
+    void            RestoreWindowLevel();

 protected :
 protected :

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

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl)
 };
 
 #ifdef __OBJC__
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl)
 };
 
 #ifdef __OBJC__
 

+    WXDLLIMPEXP_CORE NSScreen* wxOSXGetMenuScreen();

     WXDLLIMPEXP_CORE NSRect wxToNSRect( NSView* parent, const wxRect& r );
     WXDLLIMPEXP_CORE wxRect wxFromNSRect( NSView* parent, const NSRect& rect );
     WXDLLIMPEXP_CORE NSPoint wxToNSPoint( NSView* parent, const wxPoint& p );
     WXDLLIMPEXP_CORE NSRect wxToNSRect( NSView* parent, const wxRect& r );
     WXDLLIMPEXP_CORE wxRect wxFromNSRect( NSView* parent, const NSRect& rect );
     WXDLLIMPEXP_CORE NSPoint wxToNSPoint( NSView* parent, const wxPoint& p );


@@ -346,14 +344,36 @@ protected :
     {
         BOOL sheetFinished;
         int resultCode;
     {
         BOOL sheetFinished;
         int resultCode;

+        wxDialog* impl;

     }
 
     }
 

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

     - (BOOL)finished;
     - (int)code;
     - (void)waitForSheetToFinish;
     - (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo;
     @end
 
     - (BOOL)finished;
     - (int)code;
     - (void)waitForSheetToFinish;
     - (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo;
     @end
 

+    // This interface must be exported in shared 64 bit multilib build but
+    // using WXEXPORT with Objective C interfaces doesn't work with old (4.0.1)
+    // gcc when using 10.4 SDK. It does work with newer gcc even in 32 bit
+    // builds but seems to be unnecessary there so to avoid the expense of a
+    // configure check verifying if this does work or not with the current
+    // compiler we just only use it for 64 bit builds where this is always
+    // supported.
+    //
+    // NB: Currently this is the only place where we need to export an
+    //     interface but if we need to do it elsewhere we should define a
+    //     WXEXPORT_OBJC macro once and reuse it in all places it's needed
+    //     instead of duplicating this preprocessor check.
+#ifdef __LP64__
+    WXEXPORT
+#endif // 64 bit builds
+    @interface wxNSAppController : NSObject wxOSX_10_6_AND_LATER(<NSApplicationDelegate>)
+    {
+    }
+
+    @end

 
 #endif // __OBJC__
 
 
 #endif // __OBJC__
 


@@ -387,7 +407,8 @@ const short kwxCursorSize = 11;
 const short kwxCursorSizeNESW = 12;
 const short kwxCursorSizeNWSE = 13;
 const short kwxCursorRoller = 14;
 const short kwxCursorSizeNESW = 12;
 const short kwxCursorSizeNWSE = 13;
 const short kwxCursorRoller = 14;

-const short kwxCursorLast = kwxCursorRoller;
+const short kwxCursorWatch = 15;
+const short kwxCursorLast = kwxCursorWatch;

 
 // exposing our fallback cursor map
 
 
 // exposing our fallback cursor map