Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

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

diff --git a/src/gtk1/statline.cpp b/src/gtk1/statline.cpp
index 98bb5f04b5c3225cea85e54f7e69f5273ddc5a4a..ae6aa2dfeddf9040cbb6dddc67b82b04c03bd738 100644 (file)
--- a/src/gtk1/statline.cpp
+++ b/src/gtk1/statline.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        statline.cpp
+// Name:        src/gtk1/statline.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -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"
 


@@ -22,8 +21,6 @@
 // wxStaticLine
 //-----------------------------------------------------------------------------
 
 // wxStaticLine
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
-

 wxStaticLine::wxStaticLine()
 {
 }
 wxStaticLine::wxStaticLine()
 {
 }


@@ -41,20 +38,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