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 f6ed9b27ec63faf920f14a1475d3e1bae5ca4733..cc2193377b53a4e2b3dd9ba533a07aed660f74b6 100644 (file)
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -43,7 +43,7 @@ wxString WXDLLIMPEXP_CORE wxMacMakeStringFromPascal( const unsigned char * from
 
 class WXDLLIMPEXP_CORE wxMacCGContextStateSaver
 {
 
 class WXDLLIMPEXP_CORE wxMacCGContextStateSaver
 {

-    DECLARE_NO_COPY_CLASS(wxMacCGContextStateSaver)
+    wxDECLARE_NO_COPY_CLASS(wxMacCGContextStateSaver);

 
 public:
     wxMacCGContextStateSaver( CGContextRef cg )
 
 public:
     wxMacCGContextStateSaver( CGContextRef cg )


@@ -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 :


@@ -130,7 +133,7 @@ public :
 protected :
     wxMenuItem* m_peer;
     
 protected :
     wxMenuItem* m_peer;
     

-    DECLARE_ABSTRACT_CLASS(wxMenuItemImpl);
+    DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)

 } ;
 
 class wxMenuImpl : public wxObject 
 } ;
 
 class wxMenuImpl : public wxObject 


@@ -159,9 +162,9 @@ public :
 protected :
     wxMenu* m_peer;
     
 protected :
     wxMenu* m_peer;
     

-    DECLARE_ABSTRACT_CLASS(wxMenuItemImpl);
+    DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)

 } ;
 } ;

-
+#endif

 
 
 class WXDLLIMPEXP_CORE wxWidgetImpl : public wxObject
 
 
 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;
 
     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 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;
     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 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, 


@@ -445,6 +456,7 @@ protected :
     bool                m_isRootControl;
     wxWindowMac*        m_wxPeer;
     bool                m_needsFocusRect;
     bool                m_isRootControl;
     wxWindowMac*        m_wxPeer;
     bool                m_needsFocusRect;

+    bool                m_needsFrame;

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


@@ -722,7 +734,7 @@ private :
 
 void wxMacCocoaRelease( void* obj );
 void wxMacCocoaAutorelease( void* obj );
 
 void wxMacCocoaRelease( void* obj );
 void wxMacCocoaAutorelease( void* obj );

-void wxMacCocoaRetain( void* obj );
+void* wxMacCocoaRetain( void* obj );

 
 
 #endif
 
 
 #endif