1. added SetSelection() to wxItemContainer and removed its declarations

[wxWidgets.git] / include / wx / mac / carbon / window.h

diff --git a/include/wx/mac/carbon/window.h b/include/wx/mac/carbon/window.h
index 60d0652bd3c9e5dbe60d994e52e5b8f6223e1fb4..0890ca5cb5f69f3016bb1f37b7e1ac0abd53b901 100644 (file)
--- a/include/wx/mac/carbon/window.h
+++ b/include/wx/mac/carbon/window.h
@@ -82,6 +82,9 @@ public:
     virtual void Freeze() ;
     virtual void Thaw() ;
 
     virtual void Freeze() ;
     virtual void Thaw() ;
 

+    virtual void Update() ;
+    virtual void ClearBackground() ;
+

     virtual bool SetCursor( const wxCursor &cursor );
     virtual bool SetFont( const wxFont &font ) ;
     virtual bool SetBackgroundColour( const wxColour &colour );
     virtual bool SetCursor( const wxCursor &cursor );
     virtual bool SetFont( const wxFont &font ) ;
     virtual bool SetBackgroundColour( const wxColour &colour );


@@ -141,6 +144,7 @@ public:
     // event handlers
     // --------------
     void OnSetFocus(wxFocusEvent& event) ;
     // event handlers
     // --------------
     void OnSetFocus(wxFocusEvent& event) ;

+    void OnPaint(wxPaintEvent& event);

     void OnNcPaint(wxNcPaintEvent& event);
     void OnEraseBackground(wxEraseEvent& event);
     void OnMouseEvent( wxMouseEvent &event ) ;
     void OnNcPaint(wxNcPaintEvent& event);
     void OnEraseBackground(wxEraseEvent& event);
     void OnMouseEvent( wxMouseEvent &event ) ;


@@ -193,7 +197,6 @@ public:
     
     bool                       MacIsUserPane() { return m_macIsUserPane; }
 
     
     bool                       MacIsUserPane() { return m_macIsUserPane; }
 

-    virtual void        Update() ;

     virtual bool        MacSetupCursor( const wxPoint& pt ) ;
         
     virtual void        MacSetBackgroundBrush( const wxBrush &brush ) ;
     virtual bool        MacSetupCursor( const wxPoint& pt ) ;
         
     virtual void        MacSetBackgroundBrush( const wxBrush &brush ) ;