XPM updates

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

diff --git a/src/gtk1/statline.cpp b/src/gtk1/statline.cpp
index eb9374713cb9e440b858625bc242ddeb13500467..4e8f0787cb0b5d2f1a0dad7912883a1d6b8c05fe 100644 (file)
--- a/src/gtk1/statline.cpp
+++ b/src/gtk1/statline.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:           wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -22,39 +22,60 @@
 // wxStaticLine
 //-----------------------------------------------------------------------------
 
 // wxStaticLine
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticLine,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)

 
 

-wxStaticLine::wxStaticLine(void)
+wxStaticLine::wxStaticLine()

 {
 }
 
 wxStaticLine::wxStaticLine( wxWindow *parent, wxWindowID id,
 {
 }
 
 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 );
 }
 
 {
     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;
 {
     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();
         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();
     PostCreation();

-  
+

     Show( TRUE );
     Show( TRUE );

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 

-#endif
\ No newline at end of file
+#endif