fix missing mouse-up events (eg when track control was called, which is consuming...

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

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 228cac559f569289b5b3dc6be4615521b959c931..c245fd315c96c06415602ad9195a9dd8d63754fc 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -61,7 +61,7 @@ bool wxStaticText::Create(wxWindow *parent,
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {

-        wxFAIL_MSG( wxT("wxXX creation failed") );
+        wxFAIL_MSG( wxT("wxStaticText creation failed") );

         return FALSE;
     }
 
         return FALSE;
     }
 


@@ -90,7 +90,7 @@ bool wxStaticText::Create(wxWindow *parent,
 
     m_parent->DoAddChild( this );
 
 
     m_parent->DoAddChild( this );
 

-    PostCreation();
+    PostCreation(size);

     
     // the bug below only happens with GTK 2
 #ifdef __WXGTK20__
     
     // the bug below only happens with GTK 2
 #ifdef __WXGTK20__


@@ -109,27 +109,6 @@ bool wxStaticText::Create(wxWindow *parent,
     }
 #endif // __WXGTK20__
 
     }
 #endif // __WXGTK20__
 

-    ApplyWidgetStyle();
-
-    InheritAttributes();
-//    wxControl::SetFont( parent->GetFont() );
-    
-    wxSize size_best( DoGetBestSize() );
-    wxSize new_size( size );
-    if (new_size.x == -1)
-        new_size.x = size_best.x;
-    if (new_size.y == -1)
-        new_size.y = size_best.y;
-    if ((new_size.x != size.x) || (new_size.y != size.y))
-        SetSize( new_size.x, new_size.y );
-
-//     if (ShouldInheritColours())
-//     {
-//         SetBackgroundColour( parent->GetBackgroundColour() );
-//         SetForegroundColour( parent->GetForegroundColour() );
-//     }
-    Show( TRUE );
-

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -150,11 +129,30 @@ 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):
+    wxString colorlabel = label;
+    // If the color has been set, create a markup string to pass to
+    // the label setter
+    if (m_foregroundColour.Ok())
+    {
+        colorlabel.Printf(_T("<span foreground=\"#%02x%02x%02x\">%s</span>"),
+                          m_foregroundColour.Red(), m_foregroundColour.Green(),
+                          m_foregroundColour.Blue(), label.c_str());
+    }
+        
+    gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) );
+#else

     gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
     gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );

+#endif

 
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))
 
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))

+    {
+        InvalidateBestSize();

         SetSize( GetBestSize() );
         SetSize( GetBestSize() );

+    }

 }
 
 bool wxStaticText::SetFont( const wxFont &font )
 }
 
 bool wxStaticText::SetFont( const wxFont &font )


@@ -163,17 +161,13 @@ bool wxStaticText::SetFont( const wxFont &font )
 
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))
 
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))

+    {
+        InvalidateBestSize();

         SetSize( GetBestSize() );
         SetSize( GetBestSize() );

-    
+    }

     return ret;
 }
 
     return ret;
 }
 

-void wxStaticText::ApplyWidgetStyle()
-{
-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
-}
-

 wxSize wxStaticText::DoGetBestSize() const
 {
     // Do not return any arbitrary default value...
 wxSize wxStaticText::DoGetBestSize() const
 {
     // Do not return any arbitrary default value...


@@ -189,7 +183,25 @@ wxSize wxStaticText::DoGetBestSize() const
     (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
         (m_widget, &req );
 
     (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
         (m_widget, &req );
 

-    return wxSize(req.width, req.height);
+    wxSize best(req.width, req.height);
+    CacheBestSize(best);
+    return best;
+}
+
+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
 }
 
 #endif // wxUSE_STATTEXT