X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c46d050368659ba3afff87b8c0127ce2e77860b5..e9e8b38179b147dd04f5c19af7e56a94342e93a7:/include/wx/osx/core/private.h?ds=sidebyside

diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h
index ba2d659c20..6da5f8c7b0 100644
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -114,6 +114,7 @@ class wxWidgetImpl;
 class wxComboBox;
 class wxNotebook;
 class wxTextCtrl;
+class wxSearchCtrl;
 
 WXDLLIMPEXP_CORE wxWindowMac * wxFindWindowFromWXWidget(WXWidget inControl );
 
@@ -151,7 +152,7 @@ public :
                        wxMenu *pSubMenu );
     
     // handle OS specific menu items if they weren't handled during normal processing
-    virtual bool DoDefault() {} ;
+    virtual bool DoDefault() { return false; }
 protected :
     wxMenuItem* m_peer;
 
@@ -234,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 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; }
@@ -258,6 +270,9 @@ public :
     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;
@@ -370,7 +385,7 @@ public :
                                     long style,
                                     long extraStyle) ;
 
-    static wxWidgetImplType*    CreateSearchControl( wxTextCtrl* wxpeer,
+    static wxWidgetImplType*    CreateSearchControl( wxSearchCtrl* wxpeer,
                                     wxWindowMac* parent,
                                     wxWindowID id,
                                     const wxString& content,
@@ -641,6 +656,7 @@ public :
 
     virtual wxSize GetBestSize() const { return wxDefaultSize; }
 
+    virtual bool SetHint(const wxString& WXUNUSED(hint)) { return false; }
 private:
     wxTextEntry * const m_entry;