Another attempts at getting dialog positions right

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

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 48a31738201d88a7ea5c7137c6b4db60d4fc5081..102a55b09ad85b2465e2e58ce2b90d7b1193c19c 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -4,119 +4,120 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifdef __GNUG__

-#pragma implementation "stattext.h"
+    #pragma implementation "stattext.h"

 #endif
 
 #include "wx/stattext.h"
 
 #endif
 
 #include "wx/stattext.h"
 

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

 //-----------------------------------------------------------------------------
 // wxStaticText
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText,wxControl)
 
 //-----------------------------------------------------------------------------
 // wxStaticText
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxStaticText,wxControl)
 

-wxStaticText::wxStaticText(void)
+wxStaticText::wxStaticText()

 {
 }
 
 {
 }
 

-wxStaticText::wxStaticText( wxWindow *parent, wxWindowID id, const wxString &label, 
-      const wxPoint &pos, const wxSize &size, 
-      long style, const wxString &name )
+wxStaticText::wxStaticText(wxWindow *parent,
+                           wxWindowID id,
+                           const wxString &label,
+                           const wxPoint &pos,
+                           const wxSize &size,
+                           long style,
+                           const wxString &name)

 {
   Create( parent, id, label, pos, size, style, name );
 }
 
 {
   Create( parent, id, label, pos, size, style, name );
 }
 

-bool wxStaticText::Create( wxWindow *parent, wxWindowID id, const wxString &label, 
-      const wxPoint &pos, const wxSize &size, 
-      long style, const wxString &name )
+bool wxStaticText::Create(wxWindow *parent,
+                          wxWindowID id,
+                          const wxString &label,
+                          const wxPoint &pos,
+                          const wxSize &size,
+                          long style,
+                          const wxString &name )

 {
 {

-  m_needParent = TRUE;
-  
-  wxSize newSize = size;
-  
-  PreCreation( parent, id, pos, size, style, name );
-  
-  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);
-  
-   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 );
-         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 );
-           if (x > newSize.x) {
-             newSize.x = x;
-           }
-         }
-       } while (nl);
-     } else {
-       newSize.x = gdk_string_measure( m_widget->style->font, label );
-     }
-   }
-   if (newSize.y == -1) {
-     if (y == 1) {
-       newSize.y = 26;
-     } else {
-       newSize.y
-         = y * (m_widget->style->font->ascent +m_widget->style->font->descent);
-     }
-   }
-  
-  SetSize( newSize.x, newSize.y );
-  
-  PostCreation();
-  
-  SetBackgroundColour( parent->GetBackgroundColour() );
-  SetForegroundColour( parent->GetForegroundColour() );
-
-  Show( TRUE );
-    
-  return TRUE;
+    m_needParent = TRUE;
+
+    wxSize newSize = size;
+
+    PreCreation( parent, id, pos, size, style, name );
+
+    // 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( m_label.mbc_str() );
+
+    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->m_insertCallback)( m_parent, this );
+
+    PostCreation();
+
+    SetBackgroundColour( parent->GetBackgroundColour() );
+    SetForegroundColour( parent->GetForegroundColour() );
+    SetFont( parent->GetFont() );
+
+    Show( 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 );
+
+    return wxString(str);

 }
 
 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.mbc_str() );
+
+    // adjust the label size to the new label
+
+    // TODO there should be a way to prevent SetLabel() from doing it (an
+    //      additional parameter?)
+    GtkRequisition req;
+    (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
+
+    SetSize( req.width, req.height );

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

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

 }
 }

-  
+