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

Added symptomatic fix to wrong height in wxStaticText.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2001-07-16 08:20:13 +00:00
parent 23d416bfc4
commit 1348e1a5d9
2 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/mac/carbon/stattext.cpp
View File

@@ -189,14 +189,17 @@ void wxStaticText::OnPaint( wxPaintEvent &event )
wxSize wxStaticText::DoGetBestSize() const
{
int x , y ;
int widthTextMax = 0, widthLine,
int x,y ;
int widthTextMax = 0, widthLine,
heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;
wxString curLine;
for ( const wxChar *pc = m_label; ; pc++ ) {
if ( *pc == wxT('\n') || *pc == wxT('\0') ) {
if ( !curLine ) {
for ( const wxChar *pc = m_label; ; pc++ )
{
if ( *pc == wxT('\n') || *pc == wxT('\0') )
{
if ( !curLine )
{
// we can't use GetTextExtent - it will return 0 for both width
// and height and an empty line should count in height
// calculation
@@ -206,12 +209,17 @@ wxSize wxStaticText::DoGetBestSize() const
GetTextExtent(_T("W"), NULL, &heightLineDefault);
heightTextTotal += heightLineDefault;
heightTextTotal++; // FIXME: why is this necessary?
}
else {
else
{
GetTextExtent(curLine, &widthLine, &heightLine);
if ( widthLine > widthTextMax )
widthTextMax = widthLine;
heightTextTotal += heightLine;
heightTextTotal++; // FIXME: why is this necessary?
}
if ( *pc == wxT('\n') ) {

22
src/mac/stattext.cpp
View File

@@ -189,14 +189,17 @@ void wxStaticText::OnPaint( wxPaintEvent &event )
wxSize wxStaticText::DoGetBestSize() const
{
int x , y ;
int widthTextMax = 0, widthLine,
int x,y ;
int widthTextMax = 0, widthLine,
heightTextTotal = 0, heightLineDefault = 0, heightLine = 0;
wxString curLine;
for ( const wxChar *pc = m_label; ; pc++ ) {
if ( *pc == wxT('\n') || *pc == wxT('\0') ) {
if ( !curLine ) {
for ( const wxChar *pc = m_label; ; pc++ )
{
if ( *pc == wxT('\n') || *pc == wxT('\0') )
{
if ( !curLine )
{
// we can't use GetTextExtent - it will return 0 for both width
// and height and an empty line should count in height
// calculation
@@ -206,12 +209,17 @@ wxSize wxStaticText::DoGetBestSize() const
GetTextExtent(_T("W"), NULL, &heightLineDefault);
heightTextTotal += heightLineDefault;
heightTextTotal++; // FIXME: why is this necessary?
}
else {
else
{
GetTextExtent(curLine, &widthLine, &heightLine);
if ( widthLine > widthTextMax )
widthTextMax = widthLine;
heightTextTotal += heightLine;
heightTextTotal++; // FIXME: why is this necessary?
}
if ( *pc == wxT('\n') ) {