no changes, just remove #if'd out code

[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 b514797d8959b93b67a06041f2f595128a45b1c7..cc2193377b53a4e2b3dd9ba533a07aed660f74b6 100644 (file)
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -95,12 +95,15 @@ class wxWidgetImpl;
 class wxNotebook;
 class wxTextCtrl;
 
 class wxNotebook;
 class wxTextCtrl;
 

+WXDLLIMPEXP_CORE wxWindowMac * wxFindWindowFromWXWidget(WXWidget inControl );
+

 #if wxOSX_USE_CARBON
 typedef wxMacControl wxWidgetImplType;
 #else
 typedef wxWidgetImpl wxWidgetImplType;
 #endif
 
 #if wxOSX_USE_CARBON
 typedef wxMacControl wxWidgetImplType;
 #else
 typedef wxWidgetImpl wxWidgetImplType;
 #endif
 

+#if wxUSE_MENUS

 class wxMenuItemImpl : public wxObject 
 {
 public :
 class wxMenuItemImpl : public wxObject 
 {
 public :


@@ -161,7 +164,7 @@ protected :
     
     DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)
 } ;
     
     DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)
 } ;

-
+#endif

 
 
 class WXDLLIMPEXP_CORE wxWidgetImpl : public wxObject
 
 
 class WXDLLIMPEXP_CORE wxWidgetImpl : public wxObject


@@ -202,6 +205,9 @@ public :
     virtual void        GetSize( int &width, int &height ) const = 0;
     virtual void        SetControlSize( wxWindowVariant variant ) = 0;
 
     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 void        SetNeedsDisplay( const wxRect* where = NULL ) = 0;
     virtual bool        GetNeedsDisplay() const = 0;
 


@@ -258,6 +264,8 @@ public :
     
     static void         Associate( WXWidget control, wxWidgetImpl *impl );
     
     
     static void         Associate( WXWidget control, wxWidgetImpl *impl );
     

+    static WXWidget     FindFocus();
+    

     // static creation methods, must be implemented by all toolkits
     
     static wxWidgetImplType*    CreateUserPane( wxWindowMac* wxpeer, 
     // static creation methods, must be implemented by all toolkits
     
     static wxWidgetImplType*    CreateUserPane( wxWindowMac* wxpeer,