X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69cc4323fda247afc21e45839067e0a139bf2132..cbeda384e51acb82e13994cb67ac1714669cae10:/include/wx/osx/core/private.h?ds=inline

diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h
index 10c0665b09..cc2193377b 100644
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -95,12 +95,15 @@ class wxWidgetImpl;
 class wxNotebook;
 class wxTextCtrl;
 
+WXDLLIMPEXP_CORE wxWindowMac * wxFindWindowFromWXWidget(WXWidget inControl );
+
 #if wxOSX_USE_CARBON
 typedef wxMacControl wxWidgetImplType;
 #else
 typedef wxWidgetImpl wxWidgetImplType;
 #endif
 
+#if wxUSE_MENUS
 class wxMenuItemImpl : public wxObject 
 {
 public :
@@ -161,7 +164,7 @@ protected :
     
     DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)
 } ;
-
+#endif
 
 
 class WXDLLIMPEXP_CORE wxWidgetImpl : public wxObject
@@ -202,12 +205,18 @@ public :
     virtual void        GetSize( int &width, int &height ) const = 0;
     virtual void        SetControlSize( wxWindowVariant variant ) = 0;
 
+    // native view coordinates are topleft to bottom right (flipped regarding CoreGraphics origin)
+    virtual bool        IsFlipped() const { return true; }
+
     virtual void        SetNeedsDisplay( const wxRect* where = NULL ) = 0;
     virtual bool        GetNeedsDisplay() const = 0;
 
     virtual bool        NeedsFocusRect() const;
     virtual void        SetNeedsFocusRect( bool needs );
 
+    virtual bool        NeedsFrame() const;
+    virtual void        SetNeedsFrame( bool needs );
+
     virtual bool        CanFocus() const = 0;
     // return true if successful
     virtual bool        SetFocus() = 0;
@@ -255,6 +264,8 @@ public :
     
     static void         Associate( WXWidget control, wxWidgetImpl *impl );
     
+    static WXWidget     FindFocus();
+    
     // static creation methods, must be implemented by all toolkits
     
     static wxWidgetImplType*    CreateUserPane( wxWindowMac* wxpeer, 
@@ -445,6 +456,7 @@ protected :
     bool                m_isRootControl;
     wxWindowMac*        m_wxPeer;
     bool                m_needsFocusRect;
+    bool                m_needsFrame;
 
     DECLARE_ABSTRACT_CLASS(wxWidgetImpl)
 };
@@ -722,7 +734,7 @@ private :
 
 void wxMacCocoaRelease( void* obj );
 void wxMacCocoaAutorelease( void* obj );
-void wxMacCocoaRetain( void* obj );
+void* wxMacCocoaRetain( void* obj );
 
 
 #endif