AddBook ignores wxMac paths (still won't work)

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

diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index 102a55b09ad85b2465e2e58ce2b90d7b1193c19c..f10c32753c92eba493c55b015478fb9b3fa71acb 100644 (file)
--- a/src/gtk1/stattext.cpp
+++ b/src/gtk1/stattext.cpp
@@ -12,6 +12,10 @@
     #pragma implementation "stattext.h"
 #endif
 
     #pragma implementation "stattext.h"
 #endif
 

+#include "wx/defs.h"
+
+#if wxUSE_STATTEXT
+

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


@@ -48,9 +52,12 @@ bool wxStaticText::Create(wxWindow *parent,
 {
     m_needParent = TRUE;
 
 {
     m_needParent = TRUE;
 

-    wxSize newSize = size;
-
-    PreCreation( parent, id, pos, size, style, name );
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxXX creation failed") );
+        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
 
     // 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


@@ -58,7 +65,7 @@ bool wxStaticText::Create(wxWindow *parent,
     // effect of changing the control size which might not be desirable
     wxControl::SetLabel(label);
     m_widget = gtk_label_new( m_label.mbc_str() );
     // 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;
     GtkJustification justify;
     if ( style & wxALIGN_CENTER )
       justify = GTK_JUSTIFY_CENTER;


@@ -68,30 +75,38 @@ bool wxStaticText::Create(wxWindow *parent,
       justify = GTK_JUSTIFY_LEFT;
     gtk_label_set_justify(GTK_LABEL(m_widget), justify);
 
       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 );
+    // GTK_JUSTIFY_LEFT is 0, RIGHT 1 and CENTER 2
+    static const float labelAlignments[] = { 0.0, 1.0, 0.5 };
+    gtk_misc_set_alignment(GTK_MISC(m_widget), labelAlignments[justify], 0.0);

 
 

-    if (newSize.x == -1) newSize.x = req.width;
-    if (newSize.y == -1) newSize.y = req.height;
+    // do not move this call elsewhere
+    gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE );

 
 

-    SetSize( newSize.x, newSize.y );
-
-    m_parent->AddChild( this );
-
-    (m_parent->m_insertCallback)( m_parent, this );
+    m_parent->DoAddChild( this );

 
     PostCreation();
 
     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() );

-    SetFont( parent->GetFont() );
-

     Show( TRUE );
 
     return TRUE;
 }
 
     Show( TRUE );
 
     return TRUE;
 }
 

-wxString wxStaticText::GetLabel(void) const
+wxString wxStaticText::GetLabel() const

 {
     char *str = (char *) NULL;
     gtk_label_get( GTK_LABEL(m_widget), &str );
 {
     char *str = (char *) NULL;
     gtk_label_get( GTK_LABEL(m_widget), &str );


@@ -105,14 +120,20 @@ void wxStaticText::SetLabel( const wxString &label )
 
     gtk_label_set( GTK_LABEL(m_widget), m_label.mbc_str() );
 
 
     gtk_label_set( GTK_LABEL(m_widget), m_label.mbc_str() );
 

-    // adjust the label size to the new label
+    // adjust the label size to the new label unless disabled
+    if (!HasFlag(wxST_NO_AUTORESIZE))
+        SetSize( GetBestSize() );
+}

 
 

-    // 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 );
+bool wxStaticText::SetFont( const wxFont &font )
+{
+    bool ret = wxControl::SetFont(font);

 
 

-    SetSize( req.width, req.height );
+    // 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()


@@ -121,3 +142,22 @@ void wxStaticText::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
     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