X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..4b60ad0d8c1ea4f840ad0b9b7c11270322634394:/src/gtk1/scrolbar.cpp diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp index 60750087df..af054a217c 100644 --- a/src/gtk1/scrolbar.cpp +++ b/src/gtk1/scrolbar.cpp @@ -20,9 +20,7 @@ #include "wx/scrolbar.h" #include "wx/utils.h" - -#include - +#include "wx/math.h" #include "wx/gtk/private.h" //----------------------------------------------------------------------------- @@ -179,13 +177,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id, m_parent->DoAddChild( this ); - PostCreation(); - - SetBestSize(size); - - SetBackgroundColour( parent->GetBackgroundColour() ); - - Show( TRUE ); + PostCreation(size); return TRUE; } @@ -331,15 +323,16 @@ bool wxScrollBar::IsOwnGtkWindow( GdkWindow *window ) ); } -void wxScrollBar::ApplyWidgetStyle() +wxSize wxScrollBar::DoGetBestSize() const { - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + return wxControl::DoGetBestSize(); } -wxSize wxScrollBar::DoGetBestSize() const +// static +wxVisualAttributes +wxScrollBar::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - return wxControl::DoGetBestSize(); + return GetDefaultAttributesFromGTKWidget(gtk_vscrollbar_new); } #endif