check that the version of __sync_sub_and_fetch that returns a value is supported...

[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 e9823f386b6c21cb64a811a85e746cb3f94de419..76b9f3410f9ac0d48117d812bdac0885c7bdd716 100644 (file)
--- a/include/wx/mac/carbon/window.h
+++ b/include/wx/mac/carbon/window.h
@@ -84,7 +84,6 @@ public:
                                const;
 protected:
     virtual void DoEnable( bool enable );
                                const;
 protected:
     virtual void DoEnable( bool enable );

-    virtual void OnEnabled( bool enabled );

     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
 
 public:
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
 
 public:


@@ -137,7 +136,6 @@ public:
 
     // event handlers
     // --------------
 
     // event handlers
     // --------------

-    void OnSetFocus( wxFocusEvent& event );

     void OnPaint( wxPaintEvent& event );
     void OnNcPaint( wxNcPaintEvent& event );
     void OnEraseBackground(wxEraseEvent& event );
     void OnPaint( wxPaintEvent& event );
     void OnNcPaint( wxNcPaintEvent& event );
     void OnEraseBackground(wxEraseEvent& event );


@@ -163,7 +161,7 @@ public:
     wxWindowMac *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const;
 
     virtual void        MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
     wxWindowMac *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const;
 
     virtual void        MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;

-    virtual bool        MacDoRedraw( WXHRGN updatergn , long time ) ;
+    virtual bool        MacDoRedraw( void* updatergn , long time ) ;

     virtual bool        MacCanFocus() const ;
 
     // this should not be overriden in classes above wxWindowMac
     virtual bool        MacCanFocus() const ;
 
     // this should not be overriden in classes above wxWindowMac


@@ -309,10 +307,6 @@ protected:
     void                MacRepositionScrollBars() ;
     void                MacUpdateControlFont() ;
 
     void                MacRepositionScrollBars() ;
     void                MacUpdateControlFont() ;
 

-    void                MacPropagateVisibilityChanged() ;
-    void                MacPropagateEnabledStateChanged() ;
-    void                MacPropagateHiliteChanged() ;
-

     // implement the base class pure virtuals
     virtual wxSize DoGetBestSize() const;
     virtual wxSize DoGetSizeFromClientSize( const wxSize & size ) const;
     // implement the base class pure virtuals
     virtual wxSize DoGetBestSize() const;
     virtual wxSize DoGetSizeFromClientSize( const wxSize & size ) const;