Use "&Help" so wxMac doesn't make an extra help menu

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

diff --git a/src/gtk1/statline.cpp b/src/gtk1/statline.cpp
index fda6826dc69b8de5d2bd1688392cd5b5248e568d..d4299aa62ebfe87f1d0e11fe552757a38e968bd4 100644 (file)
--- a/src/gtk1/statline.cpp
+++ b/src/gtk1/statline.cpp
@@ -7,10 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "statline.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/statline.h"
 
 #if wxUSE_STATLINE
@@ -44,14 +47,30 @@ bool wxStaticLine::Create( wxWindow *parent, wxWindowID id,
     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() )
+    {
         m_widget = gtk_vseparator_new();
+        if (size.x == -1)
+        {
+            wxSize new_size( size );
+            new_size.x = 4;
+            SetSize( new_size );
+        }
+    }
     else
+    {
         m_widget = gtk_hseparator_new();
+        if (size.y == -1)
+        {
+            wxSize new_size( size );
+            new_size.y = 4;
+            SetSize( new_size );
+        }
+    }
 
     m_parent->DoAddChild( this );