X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32c77a71336262a7d7d5e79ac690a4bff78d1c92..d669c2415958a769d9565ffd20f3fa2f23eddf77:/src/gtk/stattext.cpp?ds=sidebyside

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index b125eeb11f..d753dc0155 100644
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -2,9 +2,8 @@
 // Name:        stattext.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -23,14 +22,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticText,wxControl)
 
 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 );
-};
+}
 
 bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &label, 
       const wxPoint &pos, const wxSize &size, 
@@ -54,28 +53,77 @@ bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &labe
     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 ) + 4;
+         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 ) + 4;
+           if (x > newSize.x) newSize.x = x;
+         }
+       } while (nl);
+     } 
+     else 
+     {
+       newSize.x = gdk_string_measure( m_widget->style->font, label ) + 4;
+     }
+   }
+   if (newSize.y == -1) 
+   {
+     if (y == 1) 
+       newSize.y = 26;
+     else
+       newSize.y = 4 + y * (m_widget->style->font->ascent + 2*m_widget->style->font->descent);
+   }
+  
   SetSize( newSize.x, newSize.y );
   
+  m_parent->AddChild( this );
+
+  (m_parent->m_insertCallback)( m_parent, this );
+  
   PostCreation();
   
+  SetBackgroundColour( parent->GetBackgroundColour() );
+  SetForegroundColour( parent->GetForegroundColour() );
+
   Show( TRUE );
     
   return TRUE;
-};
+}
 
 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;
-};
+}
 
 void wxStaticText::SetLabel( const wxString &label )
 {
   wxControl::SetLabel(label);
 
   gtk_label_set( GTK_LABEL(m_widget), m_label );
-};
+}
+
+void wxStaticText::ApplyWidgetStyle()
+{
+  SetWidgetStyle();
+  gtk_widget_set_style( m_widget, m_widgetStyle );
+}
+