From 3a12cb0a94ad8d6f0bfeb05af77977f2644b650a Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 10 Mar 2004 01:15:30 +0000 Subject: [PATCH] Give wxGauge a best size git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/gauge.h | 2 ++ include/wx/gtk1/gauge.h | 2 ++ src/gtk/gauge.cpp | 8 +++++++- src/gtk1/gauge.cpp | 8 +++++++- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/include/wx/gtk/gauge.h b/include/wx/gtk/gauge.h index ced1476387..5ca47abcf6 100644 --- a/include/wx/gtk/gauge.h +++ b/include/wx/gtk/gauge.h @@ -98,6 +98,8 @@ protected: // set the gauge value to the value of m_gaugePos void DoSetGauge(); + virtual wxSize DoGetBestSize() const; + private: DECLARE_DYNAMIC_CLASS(wxGauge) }; diff --git a/include/wx/gtk1/gauge.h b/include/wx/gtk1/gauge.h index ced1476387..5ca47abcf6 100644 --- a/include/wx/gtk1/gauge.h +++ b/include/wx/gtk1/gauge.h @@ -98,6 +98,8 @@ protected: // set the gauge value to the value of m_gaugePos void DoSetGauge(); + virtual wxSize DoGetBestSize() const; + private: DECLARE_DYNAMIC_CLASS(wxGauge) }; diff --git a/src/gtk/gauge.cpp b/src/gtk/gauge.cpp index 693dbce205..45f1d7b869 100644 --- a/src/gtk/gauge.cpp +++ b/src/gtk/gauge.cpp @@ -56,7 +56,8 @@ bool wxGauge::Create( wxWindow *parent, m_parent->DoAddChild( this ); PostCreation(); - + SetBestSize(size); + Show( TRUE ); return TRUE; @@ -71,6 +72,11 @@ void wxGauge::DoSetGauge() m_rangeMax ? ((float)m_gaugePos)/m_rangeMax : 0.); } +wxSize wxGauge::DoGetBestSize() const +{ + return wxSize(100, 28); +} + void wxGauge::SetRange( int range ) { m_rangeMax = range; diff --git a/src/gtk1/gauge.cpp b/src/gtk1/gauge.cpp index 693dbce205..45f1d7b869 100644 --- a/src/gtk1/gauge.cpp +++ b/src/gtk1/gauge.cpp @@ -56,7 +56,8 @@ bool wxGauge::Create( wxWindow *parent, m_parent->DoAddChild( this ); PostCreation(); - + SetBestSize(size); + Show( TRUE ); return TRUE; @@ -71,6 +72,11 @@ void wxGauge::DoSetGauge() m_rangeMax ? ((float)m_gaugePos)/m_rangeMax : 0.); } +wxSize wxGauge::DoGetBestSize() const +{ + return wxSize(100, 28); +} + void wxGauge::SetRange( int range ) { m_rangeMax = range; -- 2.45.2