Declare strptime when using MSL headers on OS X.

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

diff --git a/src/gtk/statline.cpp b/src/gtk/statline.cpp
index 98bb5f04b5c3225cea85e54f7e69f5273ddc5a4a..3f95edd803b53931fa465226d912df09c52624fa 100644 (file)
--- a/src/gtk/statline.cpp
+++ b/src/gtk/statline.cpp
@@ -7,10 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "statline.h"
 #endif
 
 #pragma implementation "statline.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

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


@@ -41,20 +44,46 @@ bool wxStaticLine::Create( wxWindow *parent, wxWindowID id,
 {
     m_needParent = TRUE;
 
 {
     m_needParent = TRUE;
 

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