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 0ae75eec9b89a8fc6cdec9037c6c84630beb2fe2..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


@@ -202,8 +200,6 @@ public:
     bool                MacIsUserPane() { return m_macIsUserPane; }
 
     virtual bool        MacSetupCursor( const wxPoint& pt ) ;
     bool                MacIsUserPane() { return m_macIsUserPane; }
 
     virtual bool        MacSetupCursor( const wxPoint& pt ) ;

-    virtual void        MacSetBackgroundBrush( const wxBrush &brush ) ;
-    const wxBrush&      MacGetBackgroundBrush() const { return m_macBackgroundBrush ; }

 
     // return the rectangle that would be visible of this control,
     // regardless whether controls are hidden
 
     // return the rectangle that would be visible of this control,
     // regardless whether controls are hidden


@@ -259,10 +255,8 @@ public:
     // the 'true' OS level control for this wxWindow
     wxMacControl*       GetPeer() const { return m_peer ; }
 
     // the 'true' OS level control for this wxWindow
     wxMacControl*       GetPeer() const { return m_peer ; }
 

-#if wxMAC_USE_CORE_GRAPHICS

     void *              MacGetCGContextRef() { return m_cgContextRef ; }
     void                MacSetCGContextRef(void * cg) { m_cgContextRef = cg ; }
     void *              MacGetCGContextRef() { return m_cgContextRef ; }
     void                MacSetCGContextRef(void * cg) { m_cgContextRef = cg ; }

-#endif

 
 protected:
     // For controls like radio buttons which are genuinely composite
 
 protected:
     // For controls like radio buttons which are genuinely composite


@@ -274,9 +268,7 @@ protected:
     // the peer object, allowing for cleaner API support
     wxMacControl *       m_peer ;
 
     // the peer object, allowing for cleaner API support
     wxMacControl *       m_peer ;
 

-#if wxMAC_USE_CORE_GRAPHICS

     void *              m_cgContextRef ;
     void *              m_cgContextRef ;

-#endif

 
     // cache the clipped rectangles within the window hierarchy
     void                MacUpdateClippedRects() const ;
 
     // cache the clipped rectangles within the window hierarchy
     void                MacUpdateClippedRects() const ;


@@ -291,7 +283,6 @@ protected:
 
     // true if is is not a native control but a wxWindow control
     bool                m_macIsUserPane ;
 
     // true if is is not a native control but a wxWindow control
     bool                m_macIsUserPane ;

-    wxBrush             m_macBackgroundBrush ;

 
     // insets of the mac control from the wx top left corner
     wxPoint             m_macTopLeftInset ;
 
     // insets of the mac control from the wx top left corner
     wxPoint             m_macTopLeftInset ;


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