X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7fff16b863c4fb4c92d44d08e91b31e835c904d0..92a98ecc5369edfebf13151dc9e9d4acaf326342:/src/gtk/statline.cpp?ds=sidebyside diff --git a/src/gtk/statline.cpp b/src/gtk/statline.cpp index 14bfb736df..a9b52ab88e 100644 --- a/src/gtk/statline.cpp +++ b/src/gtk/statline.cpp @@ -2,7 +2,6 @@ // Name: src/gtk/statline.cpp // Purpose: // Author: Robert Roebling -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -14,8 +13,8 @@ #if wxUSE_STATLINE -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include "wx/gtk/private/gtk2-compat.h" //----------------------------------------------------------------------------- // wxStaticLine @@ -43,9 +42,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 ); @@ -55,7 +56,6 @@ bool wxStaticLine::Create( wxWindow *parent, wxWindowID id, } else { - m_widget = gtk_hseparator_new(); if (size.y == -1) { wxSize new_size( size ); @@ -63,7 +63,6 @@ bool wxStaticLine::Create( wxWindow *parent, wxWindowID id, SetSize( new_size ); } } - g_object_ref(m_widget); m_parent->DoAddChild( this ); @@ -76,7 +75,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