X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dcf924a345ea8ffbc1cf6b40b5f75c6005e504c0..1be7f92adb9b0140ccbbc7a5b4d2731da0318837:/src/gtk/statline.cpp?ds=sidebyside

diff --git a/src/gtk/statline.cpp b/src/gtk/statline.cpp
index eb9374713c..60970765ed 100644
--- a/src/gtk/statline.cpp
+++ b/src/gtk/statline.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:           wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -22,39 +22,60 @@
 // wxStaticLine
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticLine,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
 
-wxStaticLine::wxStaticLine(void)
+wxStaticLine::wxStaticLine()
 {
 }
 
 wxStaticLine::wxStaticLine( wxWindow *parent, wxWindowID id,
-      const wxPoint &pos, const wxSize &size, 
-      long style, const wxString &name )
+                            const wxPoint &pos, const wxSize &size,
+                            long style, const wxString &name )
 {
     Create( parent, id, pos, size, style, name );
 }
 
-bool wxStaticLine::Create( wxWindow *parent, wxWindowID id, 
-      const wxPoint &pos, const wxSize &size, 
-      long style, const wxString &name )
+bool wxStaticLine::Create( wxWindow *parent, wxWindowID id,
+                           const wxPoint &pos, const wxSize &size,
+                           long style, const wxString &name )
 {
     m_needParent = TRUE;
-  
-    PreCreation( parent, id, pos, size, style, name );
 
-    if (style & wxVERTICAL)
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        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 );
-  
+
     PostCreation();
-  
+
     Show( TRUE );
-    
+
     return TRUE;
 }
 
-#endif
\ No newline at end of file
+#endif