added arrow cursor for standard controls

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

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index b89853149c3583c4e164b02f20df2d0dbac99065..255ecb25f8f30cd0e4d1b14dd3b144f0eac1cc72 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -12,7 +12,12 @@
     #pragma implementation "stattext.h"
 #endif
 
     #pragma implementation "stattext.h"
 #endif
 

+#include "wx/defs.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"
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"


@@ -60,12 +65,8 @@ bool wxStaticText::Create(wxWindow *parent,
     // 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);
     // 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.mbc_str() );
+    m_widget = gtk_label_new( wxGTK_CONV( m_label ) );

     
     

-    gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
-
-    SetFont( parent->GetFont() );
-

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


@@ -79,11 +80,25 @@ 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);
 

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

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

+    
+    ApplyWidgetStyle();
+
+    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 );

 
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
 
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );


@@ -94,8 +109,13 @@ bool wxStaticText::Create(wxWindow *parent,
 
 wxString wxStaticText::GetLabel() const
 {
 
 wxString wxStaticText::GetLabel() const
 {

-    char *str = (char *) NULL;
-    gtk_label_get( GTK_LABEL(m_widget), &str );
+    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);
 }
 
     return wxString(str);
 }


@@ -104,13 +124,22 @@ void wxStaticText::SetLabel( const wxString &label )
 {
     wxControl::SetLabel(label);
 
 {
     wxControl::SetLabel(label);
 

-    gtk_label_set( GTK_LABEL(m_widget), m_label.mbc_str() );
+    gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );

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

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

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

-    }
+}
+
+bool wxStaticText::SetFont( const wxFont &font )
+{
+    bool ret = wxControl::SetFont(font);
+
+    // adjust the label size to the new label unless disabled
+    if (!HasFlag(wxST_NO_AUTORESIZE))
+        SetSize( GetBestSize() );
+    
+    return ret;

 }
 
 void wxStaticText::ApplyWidgetStyle()
 }
 
 void wxStaticText::ApplyWidgetStyle()


@@ -118,3 +147,23 @@ void wxStaticText::ApplyWidgetStyle()
     SetWidgetStyle();
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
     SetWidgetStyle();
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }

+
+wxSize wxStaticText::DoGetBestSize() const
+{
+    // 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 );
+    gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );
+
+    GtkRequisition req;
+    req.width = 2;
+    req.height = 2;
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
+        (m_widget, &req );
+
+    return wxSize(req.width, req.height);
+}
+
+#endif // wxUSE_STATTEXT