remove unnecessary include of wx/cairo.h

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

diff --git a/src/gtk/statline.cpp b/src/gtk/statline.cpp
index 97bfa70cfa4a3833a159ec0a323a808a541b2490..b46305680d56b3ab7c8e1702ca7cb033372423b9 100644 (file)
--- a/src/gtk/statline.cpp
+++ b/src/gtk/statline.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statline.cpp
+// Name:        src/gtk/statline.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -14,15 +14,13 @@
 
 #if wxUSE_STATLINE
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gtk/gtk.h>
+#include "wx/gtk/private/gtk2-compat.h"
 
 //-----------------------------------------------------------------------------
 // wxStaticLine
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticLine, wxControl)
-
 wxStaticLine::wxStaticLine()
 {
 }
@@ -45,9 +43,11 @@ bool wxStaticLine::Create( wxWindow *parent, wxWindowID id,
         return FALSE;
     }
 
-    if ( IsVertical() )
+    const bool isVertical = IsVertical();
+    m_widget = gtk_separator_new(GtkOrientation(isVertical));
+    g_object_ref(m_widget);
+    if (isVertical)
     {
-        m_widget = gtk_vseparator_new();
         if (size.x == -1)
         {
             wxSize new_size( size );
@@ -57,7 +57,6 @@ bool wxStaticLine::Create( wxWindow *parent, wxWindowID id,
     }
     else
     {
-        m_widget = gtk_hseparator_new();
         if (size.y == -1)
         {
             wxSize new_size( size );
@@ -77,7 +76,7 @@ bool wxStaticLine::Create( wxWindow *parent, wxWindowID id,
 wxVisualAttributes
 wxStaticLine::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
-    return GetDefaultAttributesFromGTKWidget(gtk_vseparator_new);
+    return GetDefaultAttributesFromGTKWidget(gtk_separator_new(GTK_ORIENTATION_VERTICAL));
 }
 
 #endif