bracket unused function

[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 cc2193377b53a4e2b3dd9ba533a07aed660f74b6..6da5f8c7b0b9b2aaa569627d5650f32ee3a08da3 100644 (file)
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -21,13 +21,32 @@
 #include "wx/osx/core/cfstring.h"
 #include "wx/osx/core/cfdataref.h"
 
 #include "wx/osx/core/cfstring.h"
 #include "wx/osx/core/cfdataref.h"
 

-#if wxOSX_USE_COCOA_OR_CARBON
+// Define helper macros allowing to insert small snippets of code to be
+// compiled for high enough OS X version only: this shouldn't be abused for
+// anything big but it's handy for e.g. specifying OS X 10.6-only protocols in
+// the Objective C classes declarations when they're not supported under the
+// previous versions
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
+    #define wxOSX_10_6_AND_LATER(x) x
+#else
+    #define wxOSX_10_6_AND_LATER(x)
+#endif
+
+#if !wxUSE_GUI || wxOSX_USE_COCOA_OR_CARBON
+
+// Carbon functions are currently still used in wxOSX/Cocoa too (including
+// wxBase part of it).
+#include <Carbon/Carbon.h>

 
 WXDLLIMPEXP_BASE long UMAGetSystemVersion() ;
 
 void WXDLLIMPEXP_CORE wxMacStringToPascal( const wxString&from , unsigned char * to );
 wxString WXDLLIMPEXP_CORE wxMacMakeStringFromPascal( const unsigned char * from );
 
 
 WXDLLIMPEXP_BASE long UMAGetSystemVersion() ;
 
 void WXDLLIMPEXP_CORE wxMacStringToPascal( const wxString&from , unsigned char * to );
 wxString WXDLLIMPEXP_CORE wxMacMakeStringFromPascal( const unsigned char * from );
 

+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 );
+

 #endif
 
 #if wxUSE_GUI
 #endif
 
 #if wxUSE_GUI


@@ -62,7 +81,7 @@ private:
 class WXDLLIMPEXP_CORE wxDeferredObjectDeleter : public wxObject
 {
 public :
 class WXDLLIMPEXP_CORE wxDeferredObjectDeleter : public wxObject
 {
 public :

-    wxDeferredObjectDeleter( wxObject* obj ) : m_obj(obj) 
+    wxDeferredObjectDeleter( wxObject* obj ) : m_obj(obj)

     {
     }
     virtual ~wxDeferredObjectDeleter()
     {
     }
     virtual ~wxDeferredObjectDeleter()


@@ -92,8 +111,10 @@ class wxNonOwnedWindow;
 
 class wxMacControl;
 class wxWidgetImpl;
 
 class wxMacControl;
 class wxWidgetImpl;

+class wxComboBox;

 class wxNotebook;
 class wxTextCtrl;
 class wxNotebook;
 class wxTextCtrl;

+class wxSearchCtrl;

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


@@ -104,20 +125,20 @@ typedef wxWidgetImpl wxWidgetImplType;
 #endif
 
 #if wxUSE_MENUS
 #endif
 
 #if wxUSE_MENUS

-class wxMenuItemImpl : public wxObject 
+class wxMenuItemImpl : public wxObject

 {
 public :
     wxMenuItemImpl( wxMenuItem* peer ) : m_peer(peer)
     {
     }
 {
 public :
     wxMenuItemImpl( wxMenuItem* peer ) : m_peer(peer)
     {
     }

-    
+

     virtual ~wxMenuItemImpl() ;
     virtual void SetBitmap( const wxBitmap& bitmap ) = 0;
     virtual void Enable( bool enable ) = 0;
     virtual void Check( bool check ) = 0;
     virtual void SetLabel( const wxString& text, wxAcceleratorEntry *entry ) = 0;
     virtual void Hide( bool hide = true ) = 0;
     virtual ~wxMenuItemImpl() ;
     virtual void SetBitmap( const wxBitmap& bitmap ) = 0;
     virtual void Enable( bool enable ) = 0;
     virtual void Check( bool check ) = 0;
     virtual void SetLabel( const wxString& text, wxAcceleratorEntry *entry ) = 0;
     virtual void Hide( bool hide = true ) = 0;

-    
+

     virtual void * GetHMenuItem() = 0;
 
     wxMenuItem* GetWXPeer() { return m_peer ; }
     virtual void * GetHMenuItem() = 0;
 
     wxMenuItem* GetWXPeer() { return m_peer ; }


@@ -129,30 +150,32 @@ public :
                        const wxString& strHelp,
                        wxItemKind kind,
                        wxMenu *pSubMenu );
                        const wxString& strHelp,
                        wxItemKind kind,
                        wxMenu *pSubMenu );

-
+    
+    // handle OS specific menu items if they weren't handled during normal processing
+    virtual bool DoDefault() { return false; }

 protected :
     wxMenuItem* m_peer;
 protected :
     wxMenuItem* m_peer;

-    
+

     DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)
 } ;
 
     DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)
 } ;
 

-class wxMenuImpl : public wxObject 
+class wxMenuImpl : public wxObject

 {
 public :
     wxMenuImpl( wxMenu* peer ) : m_peer(peer)
     {
     }
 {
 public :
     wxMenuImpl( wxMenu* peer ) : m_peer(peer)
     {
     }

-    
-    virtual ~wxMenuImpl() ;    
-    virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos) = 0;    
+
+    virtual ~wxMenuImpl() ;
+    virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos) = 0;

     virtual void Remove( wxMenuItem *pItem ) = 0;
     virtual void Remove( wxMenuItem *pItem ) = 0;

-    
+

     virtual void MakeRoot() = 0;
 
     virtual void SetTitle( const wxString& text ) = 0;
 
     virtual WXHMENU GetHMenu() = 0;
     virtual void MakeRoot() = 0;
 
     virtual void SetTitle( const wxString& text ) = 0;
 
     virtual WXHMENU GetHMenu() = 0;

-    
+

     wxMenu* GetWXPeer() { return m_peer ; }
 
     virtual void PopUp( wxWindow *win, int x, int y ) = 0;
     wxMenu* GetWXPeer() { return m_peer ; }
 
     virtual void PopUp( wxWindow *win, int x, int y ) = 0;


@@ -161,7 +184,7 @@ public :
     static wxMenuImpl* CreateRootMenu( wxMenu* peer );
 protected :
     wxMenu* m_peer;
     static wxMenuImpl* CreateRootMenu( wxMenu* peer );
 protected :
     wxMenu* m_peer;

-    
+

     DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)
 } ;
 #endif
     DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)
 } ;
 #endif


@@ -179,7 +202,7 @@ public :
     bool                IsRootControl() const { return m_isRootControl; }
 
     wxWindowMac*        GetWXPeer() const { return m_wxPeer; }
     bool                IsRootControl() const { return m_isRootControl; }
 
     wxWindowMac*        GetWXPeer() const { return m_wxPeer; }

-    
+

     bool IsOk() const { return GetWXWidget() != NULL; }
 
     // not only the control itself, but also all its parents must be visible
     bool IsOk() const { return GetWXWidget() != NULL; }
 
     // not only the control itself, but also all its parents must be visible


@@ -188,15 +211,23 @@ public :
     // set the visibility of this widget (maybe latent)
     virtual void        SetVisibility( bool visible ) = 0;
 
     // set the visibility of this widget (maybe latent)
     virtual void        SetVisibility( bool visible ) = 0;
 

+    virtual bool ShowWithEffect(bool WXUNUSED(show),
+                                wxShowEffect WXUNUSED(effect),
+                                unsigned WXUNUSED(timeout))
+    {
+        return false;
+    }
+

     virtual void        Raise() = 0;
     virtual void        Raise() = 0;

-    
+

     virtual void        Lower() = 0;
 
     virtual void        ScrollRect( const wxRect *rect, int dx, int dy ) = 0;
 
     virtual WXWidget    GetWXWidget() const = 0;
     virtual void        Lower() = 0;
 
     virtual void        ScrollRect( const wxRect *rect, int dx, int dy ) = 0;
 
     virtual WXWidget    GetWXWidget() const = 0;

-    
+

     virtual void        SetBackgroundColour( const wxColour& col ) = 0;
     virtual void        SetBackgroundColour( const wxColour& col ) = 0;

+    virtual bool        SetBackgroundStyle(wxBackgroundStyle style) = 0;

 
     // all coordinates in native parent widget relative coordinates
     virtual void        GetContentArea( int &left , int &top , int &width , int &height ) const = 0;
 
     // all coordinates in native parent widget relative coordinates
     virtual void        GetContentArea( int &left , int &top , int &width , int &height ) const = 0;


@@ -204,6 +235,17 @@ 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
+    virtual void        GetLayoutInset(int &left , int &top , int &right, int &bottom) const
+    {
+        left = top = right = bottom = 0;
+    }

 
     // native view coordinates are topleft to bottom right (flipped regarding CoreGraphics origin)
     virtual bool        IsFlipped() const { return true; }
 
     // native view coordinates are topleft to bottom right (flipped regarding CoreGraphics origin)
     virtual bool        IsFlipped() const { return true; }


@@ -221,13 +263,16 @@ public :
     // return true if successful
     virtual bool        SetFocus() = 0;
     virtual bool        HasFocus() const = 0;
     // return true if successful
     virtual bool        SetFocus() = 0;
     virtual bool        HasFocus() const = 0;

-    
+

     virtual void        RemoveFromParent() = 0;
     virtual void        Embed( wxWidgetImpl *parent ) = 0;
     virtual void        RemoveFromParent() = 0;
     virtual void        Embed( wxWidgetImpl *parent ) = 0;

-    
+

     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;


@@ -235,7 +280,9 @@ public :
 
     virtual wxInt32     GetValue() const = 0;
     virtual void        SetValue( wxInt32 v ) = 0;
 
     virtual wxInt32     GetValue() const = 0;
     virtual void        SetValue( wxInt32 v ) = 0;

+    virtual wxBitmap    GetBitmap() const = 0;

     virtual void        SetBitmap( const wxBitmap& bitmap ) = 0;
     virtual void        SetBitmap( const wxBitmap& bitmap ) = 0;

+    virtual void        SetBitmapPosition( wxDirection dir ) = 0;

     virtual void        SetupTabs( const wxNotebook &notebook ) =0;
     virtual void        GetBestRect( wxRect *r ) const = 0;
     virtual bool        IsEnabled() const = 0;
     virtual void        SetupTabs( const wxNotebook &notebook ) =0;
     virtual void        GetBestRect( wxRect *r ) const = 0;
     virtual bool        IsEnabled() const = 0;


@@ -249,207 +296,226 @@ public :
 
     virtual void        SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true ) = 0;
 
 
     virtual void        SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true ) = 0;
 

+    virtual void        SetToolTip(wxToolTip* WXUNUSED(tooltip)) { }
+

     // is the clicked event sent AFTER the state already changed, so no additional
     // state changing logic is required from the outside
     virtual bool        ButtonClickDidStateChange() = 0;
     // is the clicked event sent AFTER the state already changed, so no additional
     // state changing logic is required from the outside
     virtual bool        ButtonClickDidStateChange() = 0;

-    
+

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

+    // Mechanism used to keep track of whether a change should send an event
+    // Do SendEvents(false) when starting actions that would trigger programmatic events
+    // and SendEvents(true) at the end of the block.
+    virtual void        SendEvents(bool shouldSendEvents) { m_shouldSendEvents = shouldSendEvents; }
+    virtual bool        ShouldSendEvents() { return m_shouldSendEvents; }
+

     // static methods for associating native controls and their implementations
 
     // static methods for associating native controls and their implementations
 

-    static wxWidgetImpl* 
+    static wxWidgetImpl*

                         FindFromWXWidget(WXWidget control);
                         FindFromWXWidget(WXWidget control);

-    
+

     static void         RemoveAssociations( wxWidgetImpl* impl);
     static void         RemoveAssociations( wxWidgetImpl* impl);

-    
+

     static void         Associate( WXWidget control, wxWidgetImpl *impl );
     static void         Associate( WXWidget control, wxWidgetImpl *impl );

-    
+

     static WXWidget     FindFocus();
     static WXWidget     FindFocus();

-    
+

     // static creation methods, must be implemented by all toolkits
     // static creation methods, must be implemented by all toolkits

-    
-    static wxWidgetImplType*    CreateUserPane( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
-                                    const wxPoint& pos, 
+
+    static wxWidgetImplType*    CreateUserPane( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle) ;
     static wxWidgetImplType*    CreateContentView( wxNonOwnedWindow* now ) ;
 
                                     long extraStyle) ;
     static wxWidgetImplType*    CreateContentView( wxNonOwnedWindow* now ) ;
 

-    static wxWidgetImplType*    CreateButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     const wxString& label,
                                     const wxString& label,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle) ;
 
                                     long extraStyle) ;
 

-    static wxWidgetImplType*    CreateDisclosureTriangle( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateDisclosureTriangle( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     const wxString& label,
                                     const wxString& label,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle) ;
                                     long extraStyle) ;

-                                    
-    static wxWidgetImplType*    CreateStaticLine( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
-                                    const wxPoint& pos, 
+
+    static wxWidgetImplType*    CreateStaticLine( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle) ;
 
                                     long extraStyle) ;
 

-    static wxWidgetImplType*    CreateGroupBox( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateGroupBox( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     const wxString& label,
                                     const wxString& label,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle) ;
 
                                     long extraStyle) ;
 

-    static wxWidgetImplType*    CreateStaticText( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateStaticText( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     const wxString& label,
                                     const wxString& label,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle) ;
 
                                     long extraStyle) ;
 

-    static wxWidgetImplType*    CreateTextControl( wxTextCtrl* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateTextControl( wxTextCtrl* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     const wxString& content,
                                     const wxString& content,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle) ;
 
                                     long extraStyle) ;
 

-    static wxWidgetImplType*    CreateSearchControl( wxTextCtrl* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateSearchControl( wxSearchCtrl* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     const wxString& content,
                                     const wxString& content,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle) ;
 
                                     long extraStyle) ;
 

-    static wxWidgetImplType*    CreateCheckBox( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateCheckBox( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     const wxString& label,
                                     const wxString& label,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle);
                                     long extraStyle);

-                                    
-    static wxWidgetImplType*    CreateRadioButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+
+    static wxWidgetImplType*    CreateRadioButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     const wxString& label,
                                     const wxString& label,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle);
 
                                     long extraStyle);
 

-    static wxWidgetImplType*    CreateToggleButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateToggleButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     const wxString& label,
                                     const wxString& label,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle);
 
                                     long extraStyle);
 

-    static wxWidgetImplType*    CreateBitmapToggleButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateBitmapToggleButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     const wxBitmap& bitmap,
                                     const wxBitmap& bitmap,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle);
 
                                     long extraStyle);
 

-    static wxWidgetImplType*    CreateBitmapButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateBitmapButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     const wxBitmap& bitmap,
                                     const wxBitmap& bitmap,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle);
 
                                     long extraStyle);
 

-    static wxWidgetImplType*    CreateTabView( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
-                                    const wxPoint& pos, 
+    static wxWidgetImplType*    CreateTabView( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle);
 
                                     long extraStyle);
 

-    static wxWidgetImplType*    CreateGauge( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateGauge( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,
                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle);
 
                                     long extraStyle);
 

-    static wxWidgetImplType*    CreateSlider( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateSlider( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,
                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle);
 
                                     long extraStyle);
 

-    static wxWidgetImplType*    CreateSpinButton( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateSpinButton( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,
                                     wxInt32 value,
                                     wxInt32 minimum,
                                     wxInt32 maximum,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle);
 
                                     long extraStyle);
 

-    static wxWidgetImplType*    CreateScrollBar( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
-                                    const wxPoint& pos, 
+    static wxWidgetImplType*    CreateScrollBar( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle);
 
                                     long extraStyle);
 

-    static wxWidgetImplType*    CreateChoice( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
+    static wxWidgetImplType*    CreateChoice( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,

                                     wxMenu* menu,
                                     wxMenu* menu,

-                                    const wxPoint& pos, 
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle);
 
                                     long extraStyle);
 

-    static wxWidgetImplType*    CreateListBox( wxWindowMac* wxpeer, 
-                                    wxWindowMac* parent, 
-                                    wxWindowID id, 
-                                    const wxPoint& pos, 
+    static wxWidgetImplType*    CreateListBox( wxWindowMac* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,
+                                    const wxPoint& pos,

                                     const wxSize& size,
                                     const wxSize& size,

-                                    long style, 
+                                    long style,

                                     long extraStyle);
 
                                     long extraStyle);
 

+#if wxOSX_USE_COCOA
+    static wxWidgetImplType*    CreateComboBox( wxComboBox* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,
+                                    wxMenu* menu,
+                                    const wxPoint& pos,
+                                    const wxSize& size,
+                                    long style,
+                                    long extraStyle);
+#endif
+

     // converts from Toplevel-Content relative to local
     static void Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to );
 protected :
     // converts from Toplevel-Content relative to local
     static void Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to );
 protected :


@@ -457,6 +523,7 @@ protected :
     wxWindowMac*        m_wxPeer;
     bool                m_needsFocusRect;
     bool                m_needsFrame;
     wxWindowMac*        m_wxPeer;
     bool                m_needsFocusRect;
     bool                m_needsFrame;

+    bool                m_shouldSendEvents;

 
     DECLARE_ABSTRACT_CLASS(wxWidgetImpl)
 };
 
     DECLARE_ABSTRACT_CLASS(wxWidgetImpl)
 };


@@ -465,7 +532,7 @@ protected :
 // the interface to be implemented eg by a listbox
 //
 
 // the interface to be implemented eg by a listbox
 //
 

-class WXDLLIMPEXP_CORE wxListWidgetColumn 
+class WXDLLIMPEXP_CORE wxListWidgetColumn

 {
 public :
     virtual ~wxListWidgetColumn() {}
 {
 public :
     virtual ~wxListWidgetColumn() {}


@@ -476,11 +543,13 @@ class WXDLLIMPEXP_CORE wxListWidgetCellValue
 public :
     wxListWidgetCellValue() {}
     virtual ~wxListWidgetCellValue() {}
 public :
     wxListWidgetCellValue() {}
     virtual ~wxListWidgetCellValue() {}

-    
+

    virtual void Set( CFStringRef value ) = 0;
     virtual void Set( const wxString& value ) = 0;
     virtual void Set( int value ) = 0;
    virtual void Set( CFStringRef value ) = 0;
     virtual void Set( const wxString& value ) = 0;
     virtual void Set( int value ) = 0;

-    
+    virtual void Check( bool check );
+
+    virtual bool IsChecked() const;

     virtual int GetIntValue() const = 0;
     virtual wxString GetStringValue() const = 0;
 } ;
     virtual int GetIntValue() const = 0;
     virtual wxString GetStringValue() const = 0;
 } ;


@@ -490,12 +559,12 @@ class WXDLLIMPEXP_CORE wxListWidgetImpl
 public:
     wxListWidgetImpl() {}
     virtual ~wxListWidgetImpl() { }
 public:
     wxListWidgetImpl() {}
     virtual ~wxListWidgetImpl() { }

-    
-    virtual wxListWidgetColumn*     InsertTextColumn( unsigned pos, const wxString& title, bool editable = false, 
+
+    virtual wxListWidgetColumn*     InsertTextColumn( unsigned pos, const wxString& title, bool editable = false,

                                 wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) = 0 ;
                                 wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) = 0 ;

-    virtual wxListWidgetColumn*     InsertCheckColumn( unsigned pos , const wxString& title, bool editable = false, 
+    virtual wxListWidgetColumn*     InsertCheckColumn( unsigned pos , const wxString& title, bool editable = false,

                                 wxAlignment just = wxALIGN_LEFT , int defaultWidth =  -1) = 0 ;
                                 wxAlignment just = wxALIGN_LEFT , int defaultWidth =  -1) = 0 ;

-    
+

     // add and remove
 
     // TODO will be replaced
     // add and remove
 
     // TODO will be replaced


@@ -510,7 +579,7 @@ public:
     virtual int             ListGetSelection() const = 0;
     virtual int             ListGetSelections( wxArrayInt& aSelections ) const = 0;
     virtual bool            ListIsSelected( unsigned int n ) const = 0;
     virtual int             ListGetSelection() const = 0;
     virtual int             ListGetSelections( wxArrayInt& aSelections ) const = 0;
     virtual bool            ListIsSelected( unsigned int n ) const = 0;

-    
+

     // display
 
     virtual void            ListScrollTo( unsigned int n ) = 0;
     // display
 
     virtual void            ListScrollTo( unsigned int n ) = 0;


@@ -520,6 +589,8 @@ public:
     // accessing content
 
     virtual unsigned int    ListGetCount() const = 0;
     // accessing content
 
     virtual unsigned int    ListGetCount() const = 0;

+
+    virtual int             DoListHitTest( const wxPoint& inpoint ) const = 0;

 };
 
 //
 };
 
 //


@@ -527,16 +598,23 @@ public:
 //
 
 class WXDLLIMPEXP_FWD_CORE wxTextAttr;
 //
 
 class WXDLLIMPEXP_FWD_CORE wxTextAttr;

+class WXDLLIMPEXP_FWD_CORE wxTextEntry;

 
 // common interface for all implementations
 class WXDLLIMPEXP_CORE wxTextWidgetImpl
 
 {
 public :
 
 // common interface for all implementations
 class WXDLLIMPEXP_CORE wxTextWidgetImpl
 
 {
 public :

-    wxTextWidgetImpl() {}
+    // Any widgets implementing this interface must be associated with a
+    // wxTextEntry so instead of requiring the derived classes to implement
+    // another (pure) virtual function, just take the pointer to this entry in
+    // our ctor and implement GetTextEntry() ourselves.
+    wxTextWidgetImpl(wxTextEntry *entry) : m_entry(entry) {}

 
     virtual ~wxTextWidgetImpl() {}
 
 
     virtual ~wxTextWidgetImpl() {}
 

+    wxTextEntry *GetTextEntry() const { return m_entry; }
+

     virtual bool CanFocus() const { return true; }
 
     virtual wxString GetStringValue() const = 0 ;
     virtual bool CanFocus() const { return true; }
 
     virtual wxString GetStringValue() const = 0 ;


@@ -545,6 +623,7 @@ 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 GetStyle( long position, wxTextAttr& style);

     virtual void SetStyle( long start, long end, const wxTextAttr& style ) ;
     virtual void Copy() ;
     virtual void Cut() ;
     virtual void SetStyle( long start, long end, const wxTextAttr& style ) ;
     virtual void Copy() ;
     virtual void Cut() ;


@@ -574,8 +653,54 @@ public :
     virtual int GetLineLength(long lineNo) const ;
     virtual wxString GetLineText(long lineNo) const ;
     virtual void CheckSpelling(bool WXUNUSED(check)) { }
     virtual int GetLineLength(long lineNo) const ;
     virtual wxString GetLineText(long lineNo) const ;
     virtual void CheckSpelling(bool WXUNUSED(check)) { }

+
+    virtual wxSize GetBestSize() const { return wxDefaultSize; }
+
+    virtual bool SetHint(const wxString& WXUNUSED(hint)) { return false; }
+private:
+    wxTextEntry * const m_entry;
+
+    wxDECLARE_NO_COPY_CLASS(wxTextWidgetImpl);

 };
 
 };
 

+// common interface for all implementations
+class WXDLLIMPEXP_CORE wxComboWidgetImpl
+
+{
+public :
+    wxComboWidgetImpl() {}
+
+    virtual ~wxComboWidgetImpl() {}
+
+    virtual int GetSelectedItem() const { return -1; };
+    virtual void SetSelectedItem(int WXUNUSED(item)) {};
+
+    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 wxString GetStringAtIndex(int WXUNUSED(pos)) const { return wxEmptyString; }
+
+    virtual int FindString(const wxString& WXUNUSED(text)) const { return -1; }
+};
+
+//
+// common interface for buttons
+//
+
+class wxButtonImpl
+{
+    public :
+    wxButtonImpl(){}
+    virtual ~wxButtonImpl(){}
+
+    virtual void SetPressedBitmap( const wxBitmap& bitmap ) = 0;
+} ;
+

 //
 // common interface for search controls
 //
 //
 // common interface for search controls
 //


@@ -614,21 +739,21 @@ public :
     virtual ~wxNonOwnedWindowImpl()
     {
     }
     virtual ~wxNonOwnedWindowImpl()
     {
     }

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

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

-    
-    
+
+

     virtual WXWindow GetWXWindow() const = 0;
     virtual WXWindow GetWXWindow() const = 0;

-        
+

     virtual void Raise()
     {
     }
     virtual void Raise()
     {
     }

-    
+

     virtual void Lower()
     {
     }
     virtual void Lower()
     {
     }


@@ -637,12 +762,12 @@ public :
     {
         return false;
     }
     {
         return false;
     }

-    
+

     virtual bool ShowWithEffect(bool show, wxShowEffect WXUNUSED(effect), unsigned WXUNUSED(timeout))
     {
         return Show(show);
     }
     virtual bool ShowWithEffect(bool show, wxShowEffect WXUNUSED(effect), unsigned WXUNUSED(timeout))
     {
         return Show(show);
     }

-        
+

     virtual void Update()
     {
     }
     virtual void Update()
     {
     }


@@ -660,18 +785,22 @@ public :
     virtual void SetExtraStyle( long WXUNUSED(exStyle) )
     {
     }
     virtual void SetExtraStyle( long WXUNUSED(exStyle) )
     {
     }

-    
+
+    virtual void SetWindowStyleFlag( long WXUNUSED(style) )
+    {
+    }
+

     virtual bool SetBackgroundStyle(wxBackgroundStyle WXUNUSED(style))
     virtual bool SetBackgroundStyle(wxBackgroundStyle WXUNUSED(style))

-    {            
+    {

         return false ;
     }
         return false ;
     }

-    
-    bool CanSetTransparent()
+
+    virtual bool CanSetTransparent()

     {
         return false;
     }
 
     {
         return false;
     }
 

-    virtual void GetContentArea( int &left , int &top , int &width , int &height ) const = 0;    
+    virtual void GetContentArea( int &left , int &top , int &width , int &height ) const = 0;

     virtual void MoveWindow(int x, int y, int width, int height) = 0;
     virtual void GetPosition( int &x, int &y ) const = 0;
     virtual void GetSize( int &width, int &height ) const = 0;
     virtual void MoveWindow(int x, int y, int width, int height) = 0;
     virtual void GetPosition( int &x, int &y ) const = 0;
     virtual void GetSize( int &width, int &height ) const = 0;


@@ -680,34 +809,50 @@ public :
     {
         return false;
     }
     {
         return false;
     }

-        
+

     virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) = 0;
     virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) = 0;

-    
+

     virtual bool IsMaximized() const = 0;
     virtual bool IsMaximized() const = 0;

-    
+

     virtual bool IsIconized() const= 0;
     virtual bool IsIconized() const= 0;

-    
+

     virtual void Iconize( bool iconize )= 0;
     virtual void Iconize( bool iconize )= 0;

-    
+

     virtual void Maximize(bool maximize) = 0;
     virtual void Maximize(bool maximize) = 0;

-    
+

     virtual bool IsFullScreen() const= 0;
     virtual bool IsFullScreen() const= 0;

-    
+
+    virtual void ShowWithoutActivating() { Show(true); }
+

     virtual bool ShowFullScreen(bool show, long style)= 0;
 
     virtual void RequestUserAttention(int flags) = 0;
     virtual bool ShowFullScreen(bool show, long style)= 0;
 
     virtual void RequestUserAttention(int flags) = 0;

-    
-    virtual void ScreenToWindow( int *x, int *y ) = 0; 
-    
+
+    virtual void ScreenToWindow( int *x, int *y ) = 0;
+

     virtual void WindowToScreen( int *x, int *y ) = 0;
     virtual void WindowToScreen( int *x, int *y ) = 0;

-    
+
+    virtual bool IsActive() = 0;
+

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

-    
+
+    static wxNonOwnedWindowImpl*
+                FindFromWXWindow(WXWindow window);
+
+    static void  RemoveAssociations( wxNonOwnedWindowImpl* impl);
+
+    static void  Associate( WXWindow window, wxNonOwnedWindowImpl *impl );
+

     // static creation methods, must be implemented by all toolkits
     // static creation methods, must be implemented by all toolkits

-    
+
+    static wxNonOwnedWindowImpl* CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, WXWindow native) ;
+

     static wxNonOwnedWindowImpl* CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, const wxPoint& pos, const wxSize& size,
     long style, long extraStyle, const wxString& name  ) ;
 
     static wxNonOwnedWindowImpl* CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, const wxPoint& pos, const wxSize& size,
     long style, long extraStyle, const wxString& name  ) ;
 

+    virtual void SetModified(bool WXUNUSED(modified)) { }
+    virtual bool IsModified() const { return false; }
+

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