made MacSetupCursor virtual in order to allow wxTextCtrl to use MLTE native cursor handling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -152,7 +152,8 @@ public:
|
|||||||
void OnUpdateRedo(wxUpdateUIEvent& event);
|
void OnUpdateRedo(wxUpdateUIEvent& event);
|
||||||
|
|
||||||
virtual bool MacCanFocus() const { return true ; }
|
virtual bool MacCanFocus() const { return true ; }
|
||||||
|
virtual bool MacSetupCursor( const wxPoint& pt ) ;
|
||||||
|
|
||||||
virtual void MacSuperShown( bool show ) ;
|
virtual void MacSuperShown( bool show ) ;
|
||||||
virtual bool Show(bool show = TRUE) ;
|
virtual bool Show(bool show = TRUE) ;
|
||||||
|
|
||||||
|
@@ -242,7 +242,7 @@ public:
|
|||||||
virtual void Update() ;
|
virtual void Update() ;
|
||||||
// for compatibility
|
// for compatibility
|
||||||
void MacUpdateImmediately() { Update() ; }
|
void MacUpdateImmediately() { Update() ; }
|
||||||
bool MacSetupCursor( const wxPoint& pt ) ;
|
virtual bool MacSetupCursor( const wxPoint& pt ) ;
|
||||||
|
|
||||||
// virtual bool MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* rootwin ) ;
|
// virtual bool MacSetPortDrawingParams( const Point & localOrigin, const Rect & clipRect, WindowRef window , wxWindowMac* rootwin ) ;
|
||||||
// virtual void MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) ;
|
// virtual void MacGetPortParams(Point* localOrigin, Rect* clipRect, WindowRef *window , wxWindowMac** rootwin ) ;
|
||||||
|
@@ -1606,7 +1606,13 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
|
|||||||
event.Enable( CanRedo() );
|
event.Enable( CanRedo() );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxTextCtrl::MacSetupCursor( const wxPoint& pt )
|
||||||
|
{
|
||||||
|
if ( m_macUsesTXN )
|
||||||
|
return true ;
|
||||||
|
else
|
||||||
|
return wxWindow::MacSetupCursor( pt ) ;
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
// wxUSE_TEXTCTRL
|
// wxUSE_TEXTCTRL
|
||||||
|
@@ -1606,7 +1606,13 @@ void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
|
|||||||
event.Enable( CanRedo() );
|
event.Enable( CanRedo() );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxTextCtrl::MacSetupCursor( const wxPoint& pt )
|
||||||
|
{
|
||||||
|
if ( m_macUsesTXN )
|
||||||
|
return true ;
|
||||||
|
else
|
||||||
|
return wxWindow::MacSetupCursor( pt ) ;
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
// wxUSE_TEXTCTRL
|
// wxUSE_TEXTCTRL
|
||||||
|
Reference in New Issue
Block a user