no message

[wxWidgets.git] / src / gtk1 / stattext.cpp

diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index b125eeb11f7e152f29aeb16fe5a3b6189e2687fb..b05d93c32cd2f558b367038fca6b67fcf206fdd4 100644 (file)
--- a/src/gtk1/stattext.cpp
+++ b/src/gtk1/stattext.cpp
@@ -23,14 +23,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticText,wxControl)
 
 wxStaticText::wxStaticText(void)
 {
 
 wxStaticText::wxStaticText(void)
 {

-};
+}

 
 wxStaticText::wxStaticText( wxWindow *parent, wxWindowID id, const wxString &label, 
       const wxPoint &pos, const wxSize &size, 
       long style, const wxString &name )
 {
   Create( parent, id, label, pos, size, style, name );
 
 wxStaticText::wxStaticText( wxWindow *parent, wxWindowID id, const wxString &label, 
       const wxPoint &pos, const wxSize &size, 
       long style, const wxString &name )
 {
   Create( parent, id, label, pos, size, style, name );

-};
+}

 
 bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &label, 
       const wxPoint &pos, const wxSize &size, 
 
 bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &label, 
       const wxPoint &pos, const wxSize &size, 


@@ -54,8 +54,40 @@ bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &labe
     justify = GTK_JUSTIFY_LEFT;
   gtk_label_set_justify(GTK_LABEL(m_widget), justify);
   
     justify = GTK_JUSTIFY_LEFT;
   gtk_label_set_justify(GTK_LABEL(m_widget), justify);
   

-  if (newSize.x == -1) newSize.x = gdk_string_measure( m_widget->style->font, label );
-  if (newSize.y == -1) newSize.y = 26;
+   int y = 1;
+   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 );
   
   PostCreation();
   SetSize( newSize.x, newSize.y );
   
   PostCreation();


@@ -63,19 +95,19 @@ bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &labe
   Show( TRUE );
     
   return TRUE;
   Show( TRUE );
     
   return TRUE;

-};
+}

 
 wxString wxStaticText::GetLabel(void) const
 {
 
 wxString wxStaticText::GetLabel(void) const
 {

-  char *str = NULL;
+  char *str = (char *) NULL;

   gtk_label_get( GTK_LABEL(m_widget), &str );
   wxString tmp( str );
   return tmp;
   gtk_label_get( GTK_LABEL(m_widget), &str );
   wxString tmp( str );
   return tmp;

-};
+}

 
 void wxStaticText::SetLabel( const wxString &label )
 {
   wxControl::SetLabel(label);
 
   gtk_label_set( GTK_LABEL(m_widget), m_label );
 
 void wxStaticText::SetLabel( const wxString &label )
 {
   wxControl::SetLabel(label);
 
   gtk_label_set( GTK_LABEL(m_widget), m_label );

-};
+}