[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

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

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 978321af9f026d89c7f6a0fbb30f4dd36984b503..316d7b2888d71537b857c62b3b85fc1085cbcedb 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -4,15 +4,28 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifdef __GNUG__
-#pragma implementation "stattext.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma implementation "stattext.h"

 #endif
 
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_STATTEXT
+

 #include "wx/stattext.h"
 #include "wx/stattext.h"

+#include "wx/gtk/private.h"
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
+extern "C"
+void wxgtk_window_size_request_callback(GtkWidget *widget,
+                                        GtkRequisition *requisition,
+                                        wxWindow *win);

 
 //-----------------------------------------------------------------------------
 // wxStaticText
 
 //-----------------------------------------------------------------------------
 // wxStaticText


@@ -20,106 +33,186 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText,wxControl)
 
 
 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 );
 }
 
 {
   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 );
-  
-  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 ) + 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 );
-  
-  PostCreation();
-  
-  SetBackgroundColour( parent->GetBackgroundColour() );
-  SetForegroundColour( parent->GetForegroundColour() );
-
-  Show( TRUE );
+    m_needParent = TRUE;
+
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxStaticText creation failed") );
+        return FALSE;
+    }
+
+    // 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( wxGTK_CONV( m_label ) );

     
     

-  return TRUE;
+    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);
+
+    // 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);
+
+        gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
+
+    m_parent->DoAddChild( this );
+
+    PostCreation(size);
+    
+    // the bug below only happens with GTK 2
+#ifdef __WXGTK20__
+    if ( justify != GTK_JUSTIFY_LEFT )
+    {
+        // if we let GTK call wxgtk_window_size_request_callback the label
+        // always shrinks to its minimal size for some reason and so no
+        // alignment except the default left doesn't work (in fact it does,
+        // but you don't see it)
+        gtk_signal_disconnect_by_func
+        (
+            GTK_OBJECT(m_widget),
+            GTK_SIGNAL_FUNC(wxgtk_window_size_request_callback),
+            (gpointer) this
+        );
+    }
+#endif // __WXGTK20__
+
+    return TRUE;

 }
 
 }
 

-wxString wxStaticText::GetLabel(void) const
+wxString wxStaticText::GetLabel() const

 {
 {

-  char *str = (char *) NULL;
-  gtk_label_get( GTK_LABEL(m_widget), &str );
-  wxString tmp( str );
-  return tmp;
+    GtkLabel *label = GTK_LABEL(m_widget);
+
+#ifdef __WXGTK20__
+    wxString str = wxGTK_CONV_BACK( gtk_label_get_text( label ) );
+#else
+    wxString str = wxString( label->label );
+#endif
+
+    return wxString(str);

 }
 
 void wxStaticText::SetLabel( const wxString &label )
 {
 }
 
 void wxStaticText::SetLabel( const wxString &label )
 {

-  wxControl::SetLabel(label);
+    wxControl::SetLabel(label);
+
+#ifdef __WXGTK20__
+    // Build the colorized version of the label (markup only allowed
+    // under GTK2):
+    if (m_foregroundColour.Ok())
+    {
+        // If the color has been set, create a markup string to pass to
+        // the label setter
+        wxString colorlabel;
+        colorlabel.Printf(_T("<span foreground=\"#%02x%02x%02x\">%s</span>"),
+                          m_foregroundColour.Red(), m_foregroundColour.Green(),
+                          m_foregroundColour.Blue(),
+                          wxEscapeStringForPangoMarkup(label).c_str());
+        gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) );
+    }
+    else
+#endif
+        gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
+
+    // adjust the label size to the new label unless disabled
+    if (!HasFlag(wxST_NO_AUTORESIZE))
+    {
+        InvalidateBestSize();
+        SetSize( GetBestSize() );
+    }
+}
+
+bool wxStaticText::SetFont( const wxFont &font )
+{
+    bool ret = wxControl::SetFont(font);

 
 

-  gtk_label_set( GTK_LABEL(m_widget), m_label );
+    // adjust the label size to the new label unless disabled
+    if (!HasFlag(wxST_NO_AUTORESIZE))
+    {
+        InvalidateBestSize();
+        SetSize( GetBestSize() );
+    }
+    return ret;

 }
 
 }
 

-void wxStaticText::ApplyWidgetStyle()
+void wxStaticText::DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags )

 {
 {

-  SetWidgetStyle();
-  gtk_widget_set_style( m_widget, m_widgetStyle );
+    wxControl::DoSetSize( x, y, width, height, sizeFlags );

 }
 }

-  
+
+wxSize wxStaticText::DoGetBestSize() const
+{
+    // Do not return any arbitrary default value...
+    wxASSERT_MSG( m_widget, wxT("wxStaticText::DoGetBestSize called before creation") );
+
+#ifndef __WXGTK20__
+    // This resets the internal GTK1 size calculation, which
+    // otherwise would be cashed (incorrectly)
+    gtk_label_set_pattern( GTK_LABEL(m_widget), NULL );
+#endif
+
+    // GetBestSize is supposed to return unwrapped size
+    gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
+    
+    GtkRequisition req;
+    req.width = -1;
+    req.height = -1;
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
+        (m_widget, &req );
+
+    gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
+    
+    return wxSize (req.width, req.height);
+}
+
+bool wxStaticText::SetForegroundColour(const wxColour& colour)
+{
+    // First, we call the base class member
+    wxControl::SetForegroundColour(colour);
+    // Then, to force the color change, we set the label with the current label
+    SetLabel(GetLabel());
+    return true;
+}
+
+// static
+wxVisualAttributes
+wxStaticText::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_label_new);
+}
+
+#endif // wxUSE_STATTEXT