From c8a8c6a3fa96f7b6837fd66dcd14ada97e6c69e6 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Tue, 19 Mar 2019 16:01:29 -0400 Subject: [PATCH] Remove radio button function overloads made unused in previous commit --- src/ShuttleGui.cpp | 21 --------------------- src/ShuttleGui.h | 3 --- 2 files changed, 24 deletions(-) diff --git a/src/ShuttleGui.cpp b/src/ShuttleGui.cpp index 480f2de95..5ae98700a 100644 --- a/src/ShuttleGui.cpp +++ b/src/ShuttleGui.cpp @@ -1959,17 +1959,6 @@ wxChoice * ShuttleGuiBase::TieNumberAsChoice( Prompt, SettingName, Default, Choices, InternalChoices ); } -/// Integer specific version of StartRadioButtonGroup. -/// All 'TieRadioButton()' enclosed must be ints. -void ShuttleGuiBase::StartRadioButtonGroup( const wxString & SettingName, const int iDefaultValue ) -{ - // Configure the generic type mechanism to use OUR integer. - mRadioValueInt = iDefaultValue; - mRadioValue.create( mRadioValueInt ); - // Now actually start the radio button group. - StartRadioButtonGroup( SettingName ); -} - /// String specific version of StartRadioButtonGroup. /// All 'TieRadioButton()' enclosed must be strings. void ShuttleGuiBase::StartRadioButtonGroup( const wxString & SettingName, const wxString & DefaultValue ) @@ -1982,16 +1971,6 @@ void ShuttleGuiBase::StartRadioButtonGroup( const wxString & SettingName, const } -/// This function must be within a StartRadioButtonGroup - EndRadioButtonGroup pair. -wxRadioButton * ShuttleGuiBase::TieRadioButton( - const wxString &Prompt, - const int iValue) -{ - int iTemp = iValue; - WrappedType WrappedRef( iTemp ); - return TieRadioButton( Prompt, WrappedRef ); -} - /// This function must be within a StartRadioButtonGroup - EndRadioButtonGroup pair. wxRadioButton * ShuttleGuiBase::TieRadioButton( const wxString &Prompt, diff --git a/src/ShuttleGui.h b/src/ShuttleGui.h index 12390c957..cd29a3a54 100644 --- a/src/ShuttleGui.h +++ b/src/ShuttleGui.h @@ -178,7 +178,6 @@ public: void StartRadioButtonGroup( const wxString & SettingName ); void EndRadioButtonGroup(); - void StartRadioButtonGroup( const wxString & SettingName, const int iDefaultValue ); void StartRadioButtonGroup( const wxString & SettingName, const wxString &DefaultValue ); void DoDataShuttle( const wxString &Name, WrappedType & WrappedRef ); @@ -217,7 +216,6 @@ public: wxSlider * TieVSlider( const wxString &Prompt, float &pos, const float fMin, const float fMax); wxRadioButton * TieRadioButton( const wxString & Prompt, WrappedType &WrappedRef); - wxRadioButton * TieRadioButton( const wxString &Prompt, const int iValue); wxRadioButton * TieRadioButton( const wxString &Prompt, const wxString &Value); wxSpinCtrl * TieSpinCtrl( const wxString &Prompt, WrappedType & WrappedRef, const int max, const int min = 0 ); @@ -351,7 +349,6 @@ protected: Maybe mRadioValue; /// The wrapped value associated with the active radio button. wxString mRadioValueString; /// Unwrapped string value. - int mRadioValueInt; /// Unwrapped integer value. int miSizerProp; int mSizerDepth;