From 6bfa95d427433d5e63a785cb8818e2d15091b8b5 Mon Sep 17 00:00:00 2001 From: Luca Bacci Date: Fri, 3 Aug 2018 15:16:22 +0200 Subject: [PATCH] modern-gtk2: Rename callback after OptionComboBox class switch (!17) Final part in a series of commits to replace Gtk::OptionMenu widgets with GParted::OptionComboBox. This specific commit renames the signal handler callback to match the previously renamed combobox widget variable names. Closes !17 - Gtk2 modernisation --- include/Dialog_Partition_New.h | 2 +- src/Dialog_Partition_New.cc | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/include/Dialog_Partition_New.h b/include/Dialog_Partition_New.h index 74897c03..95e6a9ba 100644 --- a/include/Dialog_Partition_New.h +++ b/include/Dialog_Partition_New.h @@ -61,7 +61,7 @@ private: std::vector FILESYSTEMS ; //signal handlers - void optionmenu_changed( bool ); + void combobox_changed(bool); unsigned short new_count, first_creatable_fs ; }; diff --git a/src/Dialog_Partition_New.cc b/src/Dialog_Partition_New.cc index d4aade12..84ffa582 100644 --- a/src/Dialog_Partition_New.cc +++ b/src/Dialog_Partition_New.cc @@ -127,7 +127,7 @@ void Dialog_Partition_New::set_data( const Device & device, combo_type.set_size_request(160, -1); combo_type.signal_changed().connect( - sigc::bind( sigc::mem_fun( *this, &Dialog_Partition_New::optionmenu_changed ), true ) ); + sigc::bind(sigc::mem_fun(*this, &Dialog_Partition_New::combobox_changed), true)); table_create.attach(combo_type, 1, 2, 0, 1, Gtk::FILL); // Partition name @@ -147,7 +147,7 @@ void Dialog_Partition_New::set_data( const Device & device, build_filesystems_combo(device.readonly); combo_filesystem.signal_changed().connect( - sigc::bind( sigc::mem_fun( *this, &Dialog_Partition_New::optionmenu_changed ), false ) ); + sigc::bind(sigc::mem_fun(*this, &Dialog_Partition_New::combobox_changed), false)); table_create.attach(combo_filesystem, 1, 2, 2, 3, Gtk::FILL); //Label @@ -168,8 +168,8 @@ void Dialog_Partition_New::set_data( const Device & device, //set first enabled file system combo_filesystem.set_active(first_creatable_fs); - optionmenu_changed( false ) ; - + combobox_changed(false); + //set spinbuttons initial values spinbutton_after .set_value( 0 ) ; spinbutton_size.set_value( ceil( fs_limits.max_size / double(MEBIBYTE) ) ); @@ -181,7 +181,7 @@ void Dialog_Partition_New::set_data( const Device & device, // Connect signal handler for Dialog_Base_Partiton combo_alignment. combo_alignment.signal_changed().connect( - sigc::bind( sigc::mem_fun( *this, &Dialog_Partition_New::optionmenu_changed ), false ) ); + sigc::bind(sigc::mem_fun(*this, &Dialog_Partition_New::combobox_changed), false)); this ->show_all_children() ; } @@ -310,7 +310,8 @@ const Partition & Dialog_Partition_New::Get_New_Partition() return *new_partition; } -void Dialog_Partition_New::optionmenu_changed( bool type ) + +void Dialog_Partition_New::combobox_changed(bool type) { g_assert( new_partition != NULL ); // Bug: Not initialised by constructor calling set_data()