applied patch from Xavier Nodet implementing better handling of subexpressions array...

[wxWidgets.git] / include / wx / mac / control.h

diff --git a/include/wx/mac/control.h b/include/wx/mac/control.h
index fb050681615c34a86f40558e5e8b5bdf39ad30c2..35a00c50138e52c65e524ad9c47928e0f3e95d4c 100644 (file)
--- a/include/wx/mac/control.h
+++ b/include/wx/mac/control.h
@@ -75,7 +75,7 @@ public:
    virtual void         MacSuperShown( bool show ) ;
    virtual bool                 MacCanFocus() const ;
    
    virtual void         MacSuperShown( bool show ) ;
    virtual bool                 MacCanFocus() const ;
    

-   virtual void         DoSetSize(int x, int y,int width, int height,int sizeFlags ) ;
+   virtual void         DoSetSize(int x, int y,int width, int height,int sizeFlags = wxSIZE_AUTO ) ;

    virtual void         OnKeyDown( wxKeyEvent &event ) ;
    virtual void                 OnMouseEvent( wxMouseEvent &event ) ;
    virtual void         OnPaint(wxPaintEvent& event) ;
    virtual void         OnKeyDown( wxKeyEvent &event ) ;
    virtual void                 OnMouseEvent( wxMouseEvent &event ) ;
    virtual void         OnPaint(wxPaintEvent& event) ;


@@ -103,6 +103,7 @@ protected:
 protected:
    // For controls like radiobuttons which are really composite
        ControlHandle           m_macControl ;
 protected:
    // For controls like radiobuttons which are really composite
        ControlHandle           m_macControl ;

+       bool                            m_macControlIsShown ;

        wxList m_subControls;
        int                                                     m_macHorizontalBorder ;
        int                                                     m_macVerticalBorder ;
        wxList m_subControls;
        int                                                     m_macHorizontalBorder ;
        int                                                     m_macVerticalBorder ;