more wxToolTip changes

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

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index d753dc015563c2425e36bf17894776c40c0b31d1..b1f31084a56e3d833e5c06d226a1efc6ffbb7d42 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -14,6 +14,9 @@
 
 #include "wx/stattext.h"
 
 
 #include "wx/stattext.h"
 

+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+

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


@@ -35,95 +38,64 @@ bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &labe
       const wxPoint &pos, const wxSize &size, 
       long style, const wxString &name )
 {
       const wxPoint &pos, const wxSize &size, 
       long style, const wxString &name )
 {

-  m_needParent = TRUE;
-  
-  wxSize newSize = size;
+    m_needParent = TRUE;

   
   

-  PreCreation( parent, id, pos, size, style, name );
+    wxSize newSize = size;

   
   

-  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);
+    PreCreation( parent, id, pos, size, style, name );

   
   

-   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 );
+    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);
+
+    GtkRequisition req;
+    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
+    
+    if (newSize.x == -1) newSize.x = req.width;
+    if (newSize.y == -1) newSize.y = req.height;
+       
+    SetSize( newSize.x, newSize.y );

   
   

-  m_parent->AddChild( this );
+    m_parent->AddChild( this );

 
 

-  (m_parent->m_insertCallback)( m_parent, this );
+    (m_parent->m_insertCallback)( m_parent, this );

   
   

-  PostCreation();
+    PostCreation();

   
   

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

 
 

-  Show( TRUE );
+    Show( TRUE );

     
     

-  return TRUE;
+    return TRUE;

 }
 
 wxString wxStaticText::GetLabel(void) const
 {
 }
 
 wxString wxStaticText::GetLabel(void) const
 {

-  char *str = (char *) NULL;
-  gtk_label_get( GTK_LABEL(m_widget), &str );
-  wxString tmp( str );
-  return tmp;
+    char *str = (char *) NULL;
+    gtk_label_get( GTK_LABEL(m_widget), &str );
+    wxString tmp( str );
+    return tmp;

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

-  wxControl::SetLabel(label);
+    wxControl::SetLabel(label);

 
 

-  gtk_label_set( GTK_LABEL(m_widget), m_label );
-}
+    gtk_label_set( GTK_LABEL(m_widget), m_label );
+} 

 
 void wxStaticText::ApplyWidgetStyle()
 {
 
 void wxStaticText::ApplyWidgetStyle()
 {

-  SetWidgetStyle();
-  gtk_widget_set_style( m_widget, m_widgetStyle );
+    SetWidgetStyle();
+    gtk_widget_set_style( m_widget, m_widgetStyle );

 }
   
 }