Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wrong override params

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-04-17 18:25:40 +00:00
parent 8d5b63cc44
commit f096a6fdfc
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/osx/carbon/textctrl.cpp
View File

@@ -234,7 +234,7 @@ public :
void AdjustCreationAttributes( const wxColour& background, bool visible ) ; void AdjustCreationAttributes( const wxColour& background, bool visible ) ;
virtual void SetFont( const wxFont & font, const wxColour& foreground, long windowStyle ) ; virtual void SetFont( const wxFont & font, const wxColour& foreground, long windowStyle, bool ignoreBlack ) ;
virtual void SetBackgroundColour(const wxColour& col ); virtual void SetBackgroundColour(const wxColour& col );
virtual void SetStyle( long start, long end, const wxTextAttr& style ) ; virtual void SetStyle( long start, long end, const wxTextAttr& style ) ;
virtual void Copy() ; virtual void Copy() ;
@@ -1080,7 +1080,8 @@ void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , lo
void wxMacMLTEControl::SetFont(const wxFont & font, void wxMacMLTEControl::SetFont(const wxFont & font,
const wxColour& foreground, const wxColour& foreground,
long WXUNUSED(windowStyle)) long WXUNUSED(windowStyle),
bool WXUNUSED(ignoreBlack))
{ {
wxMacEditHelper help( m_txn ) ; wxMacEditHelper help( m_txn ) ;
TXNSetAttribute( wxTextAttr( foreground, wxNullColour, font ), kTXNStartOffset, kTXNEndOffset ) ; TXNSetAttribute( wxTextAttr( foreground, wxNullColour, font ), kTXNStartOffset, kTXNEndOffset ) ;