diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index a3e7edf..20fdde2 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -1,36 +1,18 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include #include -#include +#include +#include #include -#include +#include #include -#include #include #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "unicode/utypes.h" -#include "unicode/utext.h" #include #include -#include #include "ubl-settings-datetime.h" using namespace std; @@ -687,16 +669,17 @@ void MainWindow::append_region_zone(string region, string zone, Gtk::ComboBoxTex } // Cортировка пузырьком if (size_vec==0){ + size_vec = array_region_local.size(); for (int i = 0; i < size_vec; i++) { for (int j = 0; j < size_vec-1; j++) { - if (array_region_local[j] > array_region_local[j + 1]) { - auto b = array_region_local[j]; - array_region_local[j] = array_region_local[j + 1]; - array_region_local[j + 1] = b; - b = array_region[j]; - array_region[j] = array_region[j + 1]; - array_region[j + 1] = b; - } + if (array_region_local[j] > array_region_local[j + 1]) { + auto b = array_region_local[j]; + array_region_local[j] = array_region_local[j + 1]; + array_region_local[j + 1] = b; + b = array_region[j]; + array_region[j] = array_region[j + 1]; + array_region[j + 1] = b; + } } } } diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 4a5ef20..c1572ab 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -100,22 +100,7 @@ class MainWindow : public Gtk::ApplicationWindow { int error; }; vector array_region_local; - vector array_region;/*={ - "America", - "Antarctica", - "Arctic", - "Asia", - "Africa", - "Etc", - "Atlantic", - "Australia", - "Brazil", - "Canada", - "Chile", - "Europe", - "Indian", - "Mexico", - "US"};*/ + vector array_region; public: MainWindow(BaseObjectType* obj, Glib::RefPtr const& builder); MainWindow(Glib::RefPtr const& builder);