Small correction to list ctrl and default button size.

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

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 9026c416b59dbcb2b9d4ad352c43760c08586869..194fb3da086e2044c8c1b2dbd270160426efd3d6 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -4,12 +4,12 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifdef __GNUG__
-#pragma implementation "stattext.h"
+    #pragma implementation "stattext.h"
 #endif
 
 #include "wx/stattext.h"
@@ -23,29 +23,41 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText,wxControl)
 
-wxStaticText::wxStaticText(void)
+wxStaticText::wxStaticText()
 {
 }
 
-wxStaticText::wxStaticText( wxWindow *parent, wxWindowID id, const wxString &label, 
-      const wxPoint &pos, const wxSize &size, 
-      long style, const wxString &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, 
-      long style, const wxString &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;
-  
+
     wxSize newSize = size;
-  
+
     PreCreation( parent, id, pos, size, style, name );
-  
+
+    // notice that we call the base class version which will just remove the
+    // '&' characters from the string, but not set the label's text to it
+    // because the label is not yet created and because SetLabel() has a side
+    // effect of changing the control size which might not be desirable
     wxControl::SetLabel(label);
-    m_widget = gtk_label_new( m_label );
+    m_widget = gtk_label_new( m_label.mbc_str() );
 
     GtkJustification justify;
     if ( style & wxALIGN_CENTER )
@@ -56,26 +68,30 @@ bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &labe
       justify = GTK_JUSTIFY_LEFT;
     gtk_label_set_justify(GTK_LABEL(m_widget), justify);
 
+#if GTK_MINOR_VERSION == 2
+    // GTK_JUSTIFY_LEFT is 0, RIGHT 1 and CENTER 2
+    static const float labelAlignments[] = { 0.0, 1.0, 0.5 };
+    gtk_misc_set_alignment(GTK_MISC(m_widget), labelAlignments[justify], 0.0);
+#endif // GTK 1.2.x
+    
     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 );
-  
-    m_parent->AddChild( this );
 
-    (m_parent->m_insertCallback)( m_parent, this );
-  
+    m_parent->DoAddChild( this );
+
     PostCreation();
-  
+
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
     SetFont( parent->GetFont() );
 
     Show( TRUE );
-    
+
     return TRUE;
 }
 
@@ -83,20 +99,29 @@ wxString wxStaticText::GetLabel(void) const
 {
     char *str = (char *) NULL;
     gtk_label_get( GTK_LABEL(m_widget), &str );
-    wxString tmp( str );
-    return tmp;
+
+    return wxString(str);
 }
 
 void wxStaticText::SetLabel( const wxString &label )
 {
     wxControl::SetLabel(label);
 
-    gtk_label_set( GTK_LABEL(m_widget), m_label );
-} 
+    gtk_label_set( GTK_LABEL(m_widget), m_label.mbc_str() );
+
+    // adjust the label size to the new label
+
+    // TODO there should be a way to prevent SetLabel() from doing it (an
+    //      additional parameter?)
+    GtkRequisition req;
+    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
+
+    SetSize( req.width, req.height );
+}
 
 void wxStaticText::ApplyWidgetStyle()
 {
     SetWidgetStyle();
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
-  
+