reverted the change to not use wxList until dynarray.h is fixed to provide operator...

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

diff --git a/src/gtk1/statline.cpp b/src/gtk1/statline.cpp
index fda6826dc69b8de5d2bd1688392cd5b5248e568d..0e05c9e758d6b988a9c4d0f03d2f845fc798983f 100644 (file)
--- a/src/gtk1/statline.cpp
+++ b/src/gtk1/statline.cpp
@@ -7,9 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "statline.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/statline.h"
 
 
 #include "wx/statline.h"
 


@@ -44,22 +43,43 @@ bool wxStaticLine::Create( wxWindow *parent, wxWindowID id,
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {

-        wxFAIL_MSG( _T("wxStaticLine creation failed") );
-       return FALSE;
+        wxFAIL_MSG( wxT("wxStaticLine creation failed") );
+        return FALSE;

     }
 
     if ( IsVertical() )
     }
 
     if ( IsVertical() )

+    {

         m_widget = gtk_vseparator_new();
         m_widget = gtk_vseparator_new();

+        if (size.x == -1)
+        {
+            wxSize new_size( size );
+            new_size.x = 4;
+            SetSize( new_size );
+        }
+    }

     else
     else

+    {

         m_widget = gtk_hseparator_new();
         m_widget = gtk_hseparator_new();

+        if (size.y == -1)
+        {
+            wxSize new_size( size );
+            new_size.y = 4;
+            SetSize( new_size );
+        }
+    }

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

-    PostCreation();
-
-    Show( TRUE );
+    PostCreation(size);

 
     return TRUE;
 }
 
 
     return TRUE;
 }
 

+// static
+wxVisualAttributes
+wxStaticLine::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_vseparator_new);
+}
+

 #endif
 #endif