fixed wxScrollBar creation when default size was used

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/scrolbar.h b/include/wx/gtk/scrolbar.h
index f471873aa3c75f73098c4b76e8a47e1b5d1ab30e..672334a1ded247ad9c0342e5a09601c3b971e0a1 100644 (file)
--- a/include/wx/gtk/scrolbar.h
+++ b/include/wx/gtk/scrolbar.h
@@ -77,6 +77,9 @@ public:
     GtkAdjustment  *m_adjust;
     float           m_oldPos;
 
+protected:
+    virtual wxSize DoGetBestSize() const;
+
 private:
     DECLARE_DYNAMIC_CLASS(wxScrollBar)
 };

diff --git a/include/wx/gtk1/scrolbar.h b/include/wx/gtk1/scrolbar.h
index f471873aa3c75f73098c4b76e8a47e1b5d1ab30e..672334a1ded247ad9c0342e5a09601c3b971e0a1 100644 (file)
--- a/include/wx/gtk1/scrolbar.h
+++ b/include/wx/gtk1/scrolbar.h
@@ -77,6 +77,9 @@ public:
     GtkAdjustment  *m_adjust;
     float           m_oldPos;
 
+protected:
+    virtual wxSize DoGetBestSize() const;
+
 private:
     DECLARE_DYNAMIC_CLASS(wxScrollBar)
 };

diff --git a/src/gtk/scrolbar.cpp b/src/gtk/scrolbar.cpp
index 14530aef2481d411d71545cdf940e7758575a60b..42fa93452df1121c0b1f2688c68a1176cec51ff7 100644 (file)
--- a/src/gtk/scrolbar.cpp
+++ b/src/gtk/scrolbar.cpp
@@ -180,6 +180,8 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 
     PostCreation();
 
+    SetBestSize(size);
+
     SetBackgroundColour( parent->GetBackgroundColour() );
 
     Show( TRUE );
@@ -334,4 +336,9 @@ void wxScrollBar::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
+wxSize wxScrollBar::DoGetBestSize() const
+{
+    return wxControl::DoGetBestSize();
+}
+
 #endif

diff --git a/src/gtk1/scrolbar.cpp b/src/gtk1/scrolbar.cpp
index 14530aef2481d411d71545cdf940e7758575a60b..42fa93452df1121c0b1f2688c68a1176cec51ff7 100644 (file)
--- a/src/gtk1/scrolbar.cpp
+++ b/src/gtk1/scrolbar.cpp
@@ -180,6 +180,8 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 
     PostCreation();
 
+    SetBestSize(size);
+
     SetBackgroundColour( parent->GetBackgroundColour() );
 
     Show( TRUE );
@@ -334,4 +336,9 @@ void wxScrollBar::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
+wxSize wxScrollBar::DoGetBestSize() const
+{
+    return wxControl::DoGetBestSize();
+}
+
 #endif