Fixed VC6 compilation - wxAny(const wxVariant&) ctor required a specific 'template<>')

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

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 5e9bac45b2541b1644690d451e62d9e8a54bc58f..7e3d81d77049e6e343a578628fc1b31f933fe491 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -52,9 +52,10 @@ bool wxStaticText::Create(wxWindow *parent,
     }
 
     m_widget = gtk_label_new(NULL);
+    g_object_ref(m_widget);
 
     GtkJustification justify;
-    if ( style & wxALIGN_CENTER )
+    if ( style & wxALIGN_CENTER_HORIZONTAL )
       justify = GTK_JUSTIFY_CENTER;
     else if ( style & wxALIGN_RIGHT )
       justify = GTK_JUSTIFY_RIGHT;
@@ -130,8 +131,8 @@ void wxStaticText::SetLabel( const wxString& str )
         GTKSetLabelForLabel(GTK_LABEL(m_widget), label);
 
     // adjust the label size to the new label unless disabled
-    if ( !HasFlag(wxST_NO_AUTORESIZE) && 
-         !IsEllipsized() )  // if ellipsize is ON, then we don't want to get resized!
+    if ( !HasFlag(wxST_NO_AUTORESIZE) &&
+         !IsEllipsized() )  // if ellipsization is ON, then we don't want to get resized!
         SetSize( GetBestSize() );
 }
 
@@ -174,8 +175,8 @@ bool wxStaticText::SetFont( const wxFont &font )
 }
 
 void wxStaticText::DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags )
+                             int width, int height,
+                             int sizeFlags )
 {
     wxStaticTextBase::DoSetSize(x, y, width, height, sizeFlags);
 
@@ -229,7 +230,11 @@ wxString wxStaticText::DoGetLabel() const
 
 void wxStaticText::DoSetLabel(const wxString& str)
 {
-    GTKSetLabelForLabel(GTK_LABEL(m_widget), str);
+    // this function looks like GTKSetLabelForLabel() but here we just want to modify
+    // the GTK control without altering any internal wxStaticText variable
+    
+    const wxString labelGTK = GTKConvertMnemonics(str);
+    gtk_label_set_text_with_mnemonic(GTK_LABEL(m_widget), wxGTK_CONV(labelGTK));
 }
 
 // static