X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32c77a71336262a7d7d5e79ac690a4bff78d1c92..2a29700ecf3d6862db16c5f5c9086a698a7ff247:/src/gtk/stattext.cpp

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index b125eeb11f..b1f31084a5 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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -15,6 +14,9 @@
 
 #include "wx/stattext.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxStaticText
 //-----------------------------------------------------------------------------
@@ -23,59 +25,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);
+    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 );
   
-  if (newSize.x == -1) newSize.x = gdk_string_measure( m_widget->style->font, label );
-  if (newSize.y == -1) newSize.y = 26;
-  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 );
+}
+