implemented (untested) work around for wxScrolledWindow painting bug

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

diff --git a/include/wx/mac/control.h b/include/wx/mac/control.h
index 441d823d20ffa279df1630a415359d601c3f70fc..35a00c50138e52c65e524ad9c47928e0f3e95d4c 100644 (file)
--- a/include/wx/mac/control.h
+++ b/include/wx/mac/control.h
@@ -52,33 +52,35 @@ public:
    virtual void SetLabel(const wxString& title) ;
 
    wxList& GetSubcontrols() { return m_subControls; }
    virtual void SetLabel(const wxString& title) ;
 
    wxList& GetSubcontrols() { return m_subControls; }

-
+   

    void OnEraseBackground(wxEraseEvent& event);
    void OnEraseBackground(wxEraseEvent& event);

-
-               virtual bool                                            Enable(bool enabled) ;
-               virtual bool                                            Show(bool show) ;
-                       
-               virtual void                                            MacRedrawControl () ;   
-               virtual void                                            MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
-               virtual void                                            MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString label , 
-                                                                                const wxPoint& pos,
-                                                                                const wxSize& size, long style,
-                                                                                const wxValidator& validator,
-                                                                                const wxString& name , Rect *outBounds , StringPtr maclabel ) ;
-               virtual void                                            MacPostControlCreate() ;
-               virtual void                                            MacAdjustControlRect() ;
-               virtual ControlHandle   MacGetContainerForEmbedding() ;
-               virtual void                                            MacSuperChangedPosition() ;
-               virtual void                                            MacSuperEnabled( bool enabled ) ;
-               virtual void                                            MacSuperShown( bool show ) ;
-               virtual bool                                            MacCanFocus() const ;
-
-               virtual void                                                            DoSetSize(int x, int y,int width, int height,int sizeFlags ) ;
-               virtual void                                            OnKeyDown( wxKeyEvent &event ) ;
-               virtual void                                            OnMouseEvent( wxMouseEvent &event ) ;
-               virtual void                                    OnPaint(wxPaintEvent& event) ;
-               virtual void                                            Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL) ;
-               ControlHandle                                   GetMacControl() { return m_macControl ;}
+   
+   virtual bool                 Enable(bool enabled) ;
+   virtual bool                 Show(bool show = TRUE) ;
+   
+   virtual void                 MacRedrawControl () ;
+   virtual void         MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
+   virtual void                 MacPreControlCreate( wxWindow *parent, wxWindowID id, wxString label , 
+                                             const wxPoint& pos,
+                                             const wxSize& size, long style,
+                                             const wxValidator& validator,
+                                             const wxString& name ,
+                                             Rect *outBounds ,
+                                             StringPtr maclabel ) ;
+   virtual void                 MacPostControlCreate() ;
+   virtual void                 MacAdjustControlRect() ;
+   virtual ControlHandle MacGetContainerForEmbedding() ;
+   virtual void         MacSuperChangedPosition() ;
+   virtual void         MacSuperEnabled( bool enabled ) ;
+   virtual void         MacSuperShown( bool show ) ;
+   virtual bool                 MacCanFocus() const ;
+   
+   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                 Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL) ;
+   ControlHandle        GetMacControl() { return m_macControl ;}

 
 #if WXWIN_COMPATIBILITY
    virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
 
 #if WXWIN_COMPATIBILITY
    virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }


@@ -101,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 ;