cleanup / adding effects

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/textctrl.h b/include/wx/mac/carbon/textctrl.h
index acc52b5b3c2c514bfa25bea8837204ada6cda0ae..5f7a4f79d06a7d4e94acdde8407bef3da292bc8e 100644 (file)
--- a/include/wx/mac/carbon/textctrl.h
+++ b/include/wx/mac/carbon/textctrl.h
@@ -171,7 +171,6 @@ public:
     virtual bool MacSetupCursor( const wxPoint& pt );
 
     virtual void MacVisibilityChanged();
     virtual bool MacSetupCursor( const wxPoint& pt );
 
     virtual void MacVisibilityChanged();

-    virtual void MacEnabledStateChanged();

     virtual void MacSuperChangedPosition();
     virtual void MacCheckSpelling(bool check);
 
     virtual void MacSuperChangedPosition();
     virtual void MacCheckSpelling(bool check);
 

diff --git a/include/wx/mac/carbon/toplevel.h b/include/wx/mac/carbon/toplevel.h
index 3a2a8eb24b1fbebd90093eb318b2c15f499be3c3..dd7c539bfc58650ad446c8031899c1d89c275729 100644 (file)
--- a/include/wx/mac/carbon/toplevel.h
+++ b/include/wx/mac/carbon/toplevel.h
@@ -94,6 +94,14 @@ public:
     virtual void Lower();
     virtual bool Show( bool show = true );
 
     virtual void Lower();
     virtual bool Show( bool show = true );
 

+    virtual bool ShowWithEffect(wxShowEffect effect,
+                                unsigned timeout = 0,
+                                wxDirection dir = wxBOTTOM);
+   
+    virtual bool HideWithEffect(wxShowEffect effect,
+                                unsigned timeout = 0,
+                                wxDirection dir = wxBOTTOM);
+     

     virtual void SetExtraStyle(long exStyle) ;
 
     virtual bool SetBackgroundColour( const wxColour &colour );
     virtual void SetExtraStyle(long exStyle) ;
 
     virtual bool SetBackgroundColour( const wxColour &colour );

diff --git a/include/wx/mac/carbon/window.h b/include/wx/mac/carbon/window.h
index e9823f386b6c21cb64a811a85e746cb3f94de419..43fe62748fe860f50eefc84d140500343f7907a0 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:


@@ -163,7 +162,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 +308,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;