minor cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: stattext.cpp
|
// Name: src/mac/carbon/stattext.cpp
|
||||||
// Purpose: wxStaticText
|
// Purpose: wxStaticText
|
||||||
// Author: Stefan Csomor
|
// Author: Stefan Csomor
|
||||||
// Modified by:
|
// Modified by:
|
||||||
@@ -53,14 +53,14 @@ bool wxStaticText::Create( wxWindow *parent,
|
|||||||
&bounds, str, NULL, m_peer->GetControlRefAddr() );
|
&bounds, str, NULL, m_peer->GetControlRefAddr() );
|
||||||
verify_noerr( err );
|
verify_noerr( err );
|
||||||
|
|
||||||
if ( ( style & wxST_DOTS_END ) || ( style & wxST_DOTS_MIDDLE ) )
|
if ( ( style & wxST_DOTS_END ) || ( style & wxST_DOTS_MIDDLE ) )
|
||||||
{
|
{
|
||||||
TruncCode tCode = truncEnd ;
|
TruncCode tCode = truncEnd;
|
||||||
if ( style & wxST_DOTS_MIDDLE )
|
if ( style & wxST_DOTS_MIDDLE )
|
||||||
tCode = truncMiddle ;
|
tCode = truncMiddle;
|
||||||
|
|
||||||
err = m_peer->SetData(kControlStaticTextTruncTag,tCode) ;
|
err = m_peer->SetData( kControlStaticTextTruncTag, tCode );
|
||||||
err = m_peer->SetData(kControlStaticTextIsMultilineTag,(Boolean)0) ;
|
err = m_peer->SetData( kControlStaticTextIsMultilineTag, (Boolean)0 );
|
||||||
}
|
}
|
||||||
|
|
||||||
MacPostControlCreate( pos, size );
|
MacPostControlCreate( pos, size );
|
||||||
@@ -99,7 +99,7 @@ wxSize wxStaticText::DoGetBestSize() const
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ( m_label.Length() == 0 )
|
if ( m_label.Length() == 0 )
|
||||||
bounds.h = 0 ;
|
bounds.h = 0;
|
||||||
|
|
||||||
bounds.h += MacGetLeftBorderSize() + MacGetRightBorderSize();
|
bounds.h += MacGetLeftBorderSize() + MacGetRightBorderSize();
|
||||||
bounds.v += MacGetTopBorderSize() + MacGetBottomBorderSize();
|
bounds.v += MacGetTopBorderSize() + MacGetBottomBorderSize();
|
||||||
@@ -125,7 +125,7 @@ void wxStaticText::SetLabel( const wxString& st )
|
|||||||
Refresh();
|
Refresh();
|
||||||
|
|
||||||
// we shouldn't need forced updates
|
// we shouldn't need forced updates
|
||||||
// Update() ;
|
// Update();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wxStaticText::SetFont(const wxFont& font)
|
bool wxStaticText::SetFont(const wxFont& font)
|
||||||
|
Reference in New Issue
Block a user