X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/94bd2eded1acd9400eec77f1af15eddbbcbde45a..cffee23b4fb7e2843d39318d2e20758a105b26bf:/src/gtk/stattext.cpp?ds=inline

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index b533595706..e7b40878d4 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,91 +22,77 @@ 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, 
       long style, const wxString &name )
 {
-  m_needParent = TRUE;
+    m_needParent = TRUE;
   
-  wxSize newSize = size;
+    wxSize newSize = size;
   
-  PreCreation( parent, id, pos, size, style, name );
+    PreCreation( parent, id, pos, size, style, name );
   
-  wxControl::SetLabel(label);
-  m_widget = gtk_label_new( m_label );
-
-  GtkJustification justify;
-  if ( style & wxALIGN_CENTER )
-    justify = GTK_JUSTIFY_CENTER;
-  else if ( style & wxALIGN_RIGHT )
-    justify = GTK_JUSTIFY_RIGHT;
-  else // wxALIGN_LEFT is 0
-    justify = GTK_JUSTIFY_LEFT;
-  gtk_label_set_justify(GTK_LABEL(m_widget), justify);
-  
-   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);
-     }
-   }
+    wxControl::SetLabel(label);
+    m_widget = gtk_label_new( m_label );
+
+    GtkJustification justify;
+    if ( style & wxALIGN_CENTER )
+      justify = GTK_JUSTIFY_CENTER;
+    else if ( style & wxALIGN_RIGHT )
+      justify = GTK_JUSTIFY_RIGHT;
+    else // wxALIGN_LEFT is 0
+      justify = GTK_JUSTIFY_LEFT;
+    gtk_label_set_justify(GTK_LABEL(m_widget), justify);
+
+    GtkRequisition req;
+    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
+    
+    if (newSize.x == -1) newSize.x = req.width;
+    if (newSize.y == -1) newSize.y = req.height;
+	
+    SetSize( newSize.x, newSize.y );
   
-  SetSize( newSize.x, newSize.y );
+    m_parent->AddChild( this );
+
+    (m_parent->m_insertCallback)( m_parent, this );
   
-  PostCreation();
+    PostCreation();
   
-  Show( TRUE );
+    SetBackgroundColour( parent->GetBackgroundColour() );
+    SetForegroundColour( parent->GetForegroundColour() );
+
+    Show( TRUE );
     
-  return TRUE;
-};
+    return TRUE;
+}
 
 wxString wxStaticText::GetLabel(void) const
 {
-  char *str = NULL;
-  gtk_label_get( GTK_LABEL(m_widget), &str );
-  wxString tmp( str );
-  return tmp;
-};
+    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);
+    wxControl::SetLabel(label);
+
+    gtk_label_set( GTK_LABEL(m_widget), m_label );
+} 
 
-  gtk_label_set( GTK_LABEL(m_widget), m_label );
-};
+void wxStaticText::ApplyWidgetStyle()
+{
+    SetWidgetStyle();
+    gtk_widget_set_style( m_widget, m_widgetStyle );
+}
+