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

Added the static text patch for multiline text

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 1998-08-18 07:09:00 +00:00
parent c4afa2cbfd
commit 94bd2eded1
2 changed files with 68 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/gtk/stattext.cpp
View File

@ -54,8 +54,40 @@ bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &labe
justify = GTK_JUSTIFY_LEFT; justify = GTK_JUSTIFY_LEFT;
gtk_label_set_justify(GTK_LABEL(m_widget), justify); gtk_label_set_justify(GTK_LABEL(m_widget), justify);
if (newSize.x == -1) newSize.x = gdk_string_measure( m_widget->style->font, label ); int y = 1;
if (newSize.y == -1) newSize.y = 26; if (newSize.x == -1) {
char *s = WXSTRINGCAST m_label;
char *nl = strchr(s, '\n');
if (nl) {
do {
*nl = 0;
int x = gdk_string_measure( m_widget->style->font, s );
if (x > newSize.x) {
newSize.x = x;
}
*nl++ = '\n';
if ((nl = strchr(s = nl, '\n'))) {
++y;
} else {
int x = gdk_string_measure( m_widget->style->font, s );
if (x > newSize.x) {
newSize.x = x;
}
}
} while (nl);
} else {
newSize.x = gdk_string_measure( m_widget->style->font, label );
}
}
if (newSize.y == -1) {
if (y == 1) {
newSize.y = 26;
} else {
newSize.y
= y * (m_widget->style->font->ascent +m_widget->style->font->descent);
}
}
SetSize( newSize.x, newSize.y ); SetSize( newSize.x, newSize.y );
PostCreation(); PostCreation();

36
src/gtk1/stattext.cpp
View File

@ -54,8 +54,40 @@ bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &labe
justify = GTK_JUSTIFY_LEFT; justify = GTK_JUSTIFY_LEFT;
gtk_label_set_justify(GTK_LABEL(m_widget), justify); gtk_label_set_justify(GTK_LABEL(m_widget), justify);
if (newSize.x == -1) newSize.x = gdk_string_measure( m_widget->style->font, label ); int y = 1;
if (newSize.y == -1) newSize.y = 26; if (newSize.x == -1) {
char *s = WXSTRINGCAST m_label;
char *nl = strchr(s, '\n');
if (nl) {
do {
*nl = 0;
int x = gdk_string_measure( m_widget->style->font, s );
if (x > newSize.x) {
newSize.x = x;
}
*nl++ = '\n';
if ((nl = strchr(s = nl, '\n'))) {
++y;
} else {
int x = gdk_string_measure( m_widget->style->font, s );
if (x > newSize.x) {
newSize.x = x;
}
}
} while (nl);
} else {
newSize.x = gdk_string_measure( m_widget->style->font, label );
}
}
if (newSize.y == -1) {
if (y == 1) {
newSize.y = 26;
} else {
newSize.y
= y * (m_widget->style->font->ascent +m_widget->style->font->descent);
}
}
SetSize( newSize.x, newSize.y ); SetSize( newSize.x, newSize.y );
PostCreation(); PostCreation();