removing NSWindow based mouse tracking in favour of 10.5+ trackingArea implementation

[wxWidgets.git] / include / wx / osx / core / private.h

diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h
index 741306805a2c0930ae8e724c4c5cf8de23d037a0..e1b64182edeb282430fc4c9cbde0524cd3261835 100644 (file)
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/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
 /////////////////////////////////////////////////////////////////////////////


@@ -32,7 +32,7 @@
     #define wxOSX_10_6_AND_LATER(x)
 #endif
 
     #define wxOSX_10_6_AND_LATER(x)
 #endif
 

-#if !wxUSE_GUI || wxOSX_USE_COCOA_OR_CARBON
+#if ( !wxUSE_GUI && !wxOSX_USE_IPHONE ) || wxOSX_USE_COCOA_OR_CARBON

 
 // Carbon functions are currently still used in wxOSX/Cocoa too (including
 // wxBase part of it).
 
 // Carbon functions are currently still used in wxOSX/Cocoa too (including
 // wxBase part of it).


@@ -47,6 +47,11 @@ 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 );
 

+// keycode utils from app.cpp
+
+WXDLLIMPEXP_BASE CGKeyCode wxCharCodeWXToOSX(wxKeyCode code);
+WXDLLIMPEXP_BASE long wxMacTranslateKey(unsigned char key, unsigned char code);
+

 #endif
 
 #if wxUSE_GUI
 #endif
 
 #if wxUSE_GUI


@@ -114,6 +119,7 @@ class wxWidgetImpl;
 class wxComboBox;
 class wxNotebook;
 class wxTextCtrl;
 class wxComboBox;
 class wxNotebook;
 class wxTextCtrl;

+class wxSearchCtrl;

 
 WXDLLIMPEXP_CORE wxWindowMac * wxFindWindowFromWXWidget(WXWidget inControl );
 
 
 WXDLLIMPEXP_CORE wxWindowMac * wxFindWindowFromWXWidget(WXWidget inControl );
 


@@ -192,13 +198,15 @@ protected :
 class WXDLLIMPEXP_CORE wxWidgetImpl : public wxObject
 {
 public :
 class WXDLLIMPEXP_CORE wxWidgetImpl : public wxObject
 {
 public :

-    wxWidgetImpl( wxWindowMac* peer , bool isRootControl = false );
+    wxWidgetImpl( wxWindowMac* peer , bool isRootControl = false, bool isUserPane = false );

     wxWidgetImpl();
     virtual ~wxWidgetImpl();
 
     void Init();
 
     bool                IsRootControl() const { return m_isRootControl; }
     wxWidgetImpl();
     virtual ~wxWidgetImpl();
 
     void Init();
 
     bool                IsRootControl() const { return m_isRootControl; }

+    
+    bool                IsUserPane() const { return m_isUserPane; }

 
     wxWindowMac*        GetWXPeer() const { return m_wxPeer; }
 
 
     wxWindowMac*        GetWXPeer() const { return m_wxPeer; }
 


@@ -234,6 +242,10 @@ public :
     virtual void        GetPosition( int &x, int &y ) const = 0;
     virtual void        GetSize( int &width, int &height ) const = 0;
     virtual void        SetControlSize( wxWindowVariant variant ) = 0;
     virtual void        GetPosition( int &x, int &y ) const = 0;
     virtual void        GetSize( int &width, int &height ) const = 0;
     virtual void        SetControlSize( wxWindowVariant variant ) = 0;

+    virtual float       GetContentScaleFactor() const 
+    {
+        return 1.0;
+    }

     
     // the native coordinates may have an 'aura' for shadows etc, if this is the case the layout
     // inset indicates on which insets the real control is drawn
     
     // the native coordinates may have an 'aura' for shadows etc, if this is the case the layout
     // inset indicates on which insets the real control is drawn


@@ -265,6 +277,9 @@ public :
     virtual void        SetDefaultButton( bool isDefault ) = 0;
     virtual void        PerformClick() = 0;
     virtual void        SetLabel( const wxString& title, wxFontEncoding encoding ) = 0;
     virtual void        SetDefaultButton( bool isDefault ) = 0;
     virtual void        PerformClick() = 0;
     virtual void        SetLabel( const wxString& title, wxFontEncoding encoding ) = 0;

+#if wxUSE_MARKUP && wxOSX_USE_COCOA
+    virtual void        SetLabelMarkup( const wxString& WXUNUSED(markup) ) { }
+#endif

 
     virtual void        SetCursor( const wxCursor & cursor ) = 0;
     virtual void        CaptureMouse() = 0;
 
     virtual void        SetCursor( const wxCursor & cursor ) = 0;
     virtual void        CaptureMouse() = 0;


@@ -377,7 +392,7 @@ public :
                                     long style,
                                     long extraStyle) ;
 
                                     long style,
                                     long extraStyle) ;
 

-    static wxWidgetImplType*    CreateSearchControl( wxTextCtrl* wxpeer,
+    static wxWidgetImplType*    CreateSearchControl( wxSearchCtrl* wxpeer,

                                     wxWindowMac* parent,
                                     wxWindowID id,
                                     const wxString& content,
                                     wxWindowMac* parent,
                                     wxWindowID id,
                                     const wxString& content,


@@ -512,6 +527,7 @@ public :
     static void Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to );
 protected :
     bool                m_isRootControl;
     static void Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to );
 protected :
     bool                m_isRootControl;

+    bool                m_isUserPane;

     wxWindowMac*        m_wxPeer;
     bool                m_needsFocusRect;
     bool                m_needsFrame;
     wxWindowMac*        m_wxPeer;
     bool                m_needsFocusRect;
     bool                m_needsFrame;


@@ -615,6 +631,9 @@ public :
     virtual void GetSelection( long* from, long* to ) const = 0 ;
     virtual void WriteText( const wxString& str ) = 0 ;
 
     virtual void GetSelection( long* from, long* to ) const = 0 ;
     virtual void WriteText( const wxString& str ) = 0 ;
 

+    virtual bool CanClipMaxLength() const { return false; }
+    virtual void SetMaxLength(unsigned long WXUNUSED(len)) {}
+    

     virtual bool GetStyle( long position, wxTextAttr& style);
     virtual void SetStyle( long start, long end, const wxTextAttr& style ) ;
     virtual void Copy() ;
     virtual bool GetStyle( long position, wxTextAttr& style);
     virtual void SetStyle( long start, long end, const wxTextAttr& style ) ;
     virtual void Copy() ;


@@ -664,16 +683,18 @@ public :
 
     virtual ~wxComboWidgetImpl() {}
 
 
     virtual ~wxComboWidgetImpl() {}
 

-    virtual int GetSelectedItem() const { return -1; };
-    virtual void SetSelectedItem(int WXUNUSED(item)) {};
+    virtual int GetSelectedItem() const { return -1; }
+    virtual void SetSelectedItem(int WXUNUSED(item)) {}

 
 

-    virtual int GetNumberOfItems() const { return -1; };
+    virtual int GetNumberOfItems() const { return -1; }

 
     virtual void InsertItem(int WXUNUSED(pos), const wxString& WXUNUSED(item)) {}
 
     virtual void RemoveItem(int WXUNUSED(pos)) {}
 
     virtual void Clear() {}
 
     virtual void InsertItem(int WXUNUSED(pos), const wxString& WXUNUSED(item)) {}
 
     virtual void RemoveItem(int WXUNUSED(pos)) {}
 
     virtual void Clear() {}

+    virtual void Popup() {}
+    virtual void Dismiss() {}

 
     virtual wxString GetStringAtIndex(int WXUNUSED(pos)) const { return wxEmptyString; }
 
 
     virtual wxString GetStringAtIndex(int WXUNUSED(pos)) const { return wxEmptyString; }
 


@@ -845,6 +866,14 @@ public :
     virtual void SetModified(bool WXUNUSED(modified)) { }
     virtual bool IsModified() const { return false; }
 
     virtual void SetModified(bool WXUNUSED(modified)) { }
     virtual bool IsModified() const { return false; }
 

+    virtual void SetRepresentedFilename(const wxString& WXUNUSED(filename)) { }
+
+#if wxOSX_USE_IPHONE
+    virtual CGFloat GetWindowLevel() const { return 0.0; }
+#else
+    virtual CGWindowLevel GetWindowLevel() const { return kCGNormalWindowLevel; }
+#endif
+    virtual void RestoreWindowLevel() {}

 protected :
     wxNonOwnedWindow*   m_wxPeer;
     DECLARE_ABSTRACT_CLASS(wxNonOwnedWindowImpl)
 protected :
     wxNonOwnedWindow*   m_wxPeer;
     DECLARE_ABSTRACT_CLASS(wxNonOwnedWindowImpl)