gtk spinctrl code simplification

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

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 1849d21f5d3375ae3b032ef85ffc5325f476d609..2641ea02f33db4b7a9c41169d89db99d8dc0c86d 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

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


@@ -65,13 +61,10 @@ bool wxStaticText::Create(wxWindow *parent,
         return FALSE;
     }
 
         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 ) );
-    
+    const wxString labelGTK = GTKConvertMnemonics(label);
+    m_label = label;
+    m_widget = gtk_label_new_with_mnemonic(wxGTK_CONV(labelGTK));
+

     GtkJustification justify;
     if ( style & wxALIGN_CENTER )
       justify = GTK_JUSTIFY_CENTER;
     GtkJustification justify;
     if ( style & wxALIGN_CENTER )
       justify = GTK_JUSTIFY_CENTER;


@@ -85,29 +78,23 @@ bool wxStaticText::Create(wxWindow *parent,
     static const float labelAlignments[] = { 0.0, 1.0, 0.5 };
     gtk_misc_set_alignment(GTK_MISC(m_widget), labelAlignments[justify], 0.0);
 
     static const float labelAlignments[] = { 0.0, 1.0, 0.5 };
     gtk_misc_set_alignment(GTK_MISC(m_widget), labelAlignments[justify], 0.0);
 

-    // do not move this call elsewhere
-    gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
+    gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );

 
     m_parent->DoAddChild( this );
 
     PostCreation(size);
 
     m_parent->DoAddChild( this );
 
     PostCreation(size);

-    
+

     // the bug below only happens with GTK 2
     // 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)
     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
-        );
+        g_signal_handlers_disconnect_by_func (m_widget,
+                                              (gpointer) wxgtk_window_size_request_callback,
+                                              this);

     }
     }

-#endif // __WXGTK20__

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -115,44 +102,20 @@ bool wxStaticText::Create(wxWindow *parent,
 wxString wxStaticText::GetLabel() const
 {
     GtkLabel *label = GTK_LABEL(m_widget);
 wxString wxStaticText::GetLabel() const
 {
     GtkLabel *label = GTK_LABEL(m_widget);

-
-#ifdef __WXGTK20__

     wxString str = wxGTK_CONV_BACK( gtk_label_get_text( label ) );
     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 )
 {
 
     return wxString(str);
 }
 
 void wxStaticText::SetLabel( const wxString &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 ) );
-#endif
+    wxCHECK_RET( m_widget != NULL, wxT("invalid static text") );
+
+    GTKSetLabelForLabel(GTK_LABEL(m_widget), label);

 
     // adjust the label size to the new label unless disabled
 
     // adjust the label size to the new label unless disabled

-    if (!HasFlag(wxST_NO_AUTORESIZE))
-    {
+    if ( !HasFlag(wxST_NO_AUTORESIZE) )

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

-        SetSizeHints(GetSize());
-    }

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


@@ -162,16 +125,17 @@ 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() );

-        SetSizeHints(GetSize());

     }
     return ret;
 }
 
     }
     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
 }
 
 wxSize wxStaticText::DoGetBestSize() const


@@ -179,17 +143,18 @@ wxSize wxStaticText::DoGetBestSize() const
     // Do not return any arbitrary default value...
     wxASSERT_MSG( m_widget, wxT("wxStaticText::DoGetBestSize called before creation") );
 
     // Do not return any arbitrary default value...
     wxASSERT_MSG( m_widget, wxT("wxStaticText::DoGetBestSize called before creation") );
 

-    // this invalidates the size request
-    gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
+    // GetBestSize is supposed to return unwrapped size

     gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
 
     GtkRequisition req;
     gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
 
     GtkRequisition req;

-    req.width = 2;
-    req.height = 2;
+    req.width = -1;
+    req.height = -1;

     (* 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);
+    gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE );
+
+    return wxSize (req.width, req.height);

 }
 
 bool wxStaticText::SetForegroundColour(const wxColour& colour)
 }
 
 bool wxStaticText::SetForegroundColour(const wxColour& colour)


@@ -201,6 +166,16 @@ bool wxStaticText::SetForegroundColour(const wxColour& colour)
     return true;
 }
 
     return true;
 }
 

+bool wxStaticText::GTKWidgetNeedsMnemonic() const
+{
+    return true;
+}
+
+void wxStaticText::GTKWidgetDoSetMnemonic(GtkWidget* w)
+{
+    gtk_label_set_mnemonic_widget(GTK_LABEL(m_widget), w);
+}
+

 // static
 wxVisualAttributes
 wxStaticText::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 // static
 wxVisualAttributes
 wxStaticText::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))