diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-07-16 10:26:19 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2018-07-19 12:13:34 +0200 |
| commit | 337012970f62a8a40da2a02806363b560cf295df (patch) | |
| tree | cb440cd82c1135a7fad59e46dd7084b2d14db1ed /vcl | |
| parent | de607309e27616a9e53eadee2bab9cd0de74cae3 (diff) | |
move freeze/thaw to Widget
Change-Id: I3944092c26ca81028912f6fb206b148b49e4f172
Reviewed-on: https://gerrit.libreoffice.org/57495
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/salvtables.cxx | 30 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkinst.cxx | 18 |
2 files changed, 24 insertions, 24 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 7f03aed3e6c2..b89ad836136c 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -398,6 +398,16 @@ public: m_xWidget->EnableRTL(bRTL); } + virtual void freeze() override + { + m_xWidget->SetUpdateMode(false); + } + + virtual void thaw() override + { + m_xWidget->SetUpdateMode(true); + } + virtual weld::Container* weld_parent() const override; virtual ~SalInstanceWidget() override @@ -1588,16 +1598,6 @@ public: return nRet; } - virtual void freeze() override - { - m_xTreeView->SetUpdateMode(false); - } - - virtual void thaw() override - { - m_xTreeView->SetUpdateMode(true); - } - virtual void set_selection_mode(bool bMultiple) override { m_xTreeView->EnableMultiSelection(bMultiple); @@ -2122,16 +2122,6 @@ public: m_xComboBoxText->SetStyle(m_xComboBoxText->GetStyle() | WB_SORT); } - virtual void freeze() override - { - m_xComboBoxText->SetUpdateMode(false); - } - - virtual void thaw() override - { - m_xComboBoxText->SetUpdateMode(true); - } - virtual ~SalInstanceComboBoxText() override { clear(); diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 26bc4dbb0e3a..89655fd1b654 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -1462,6 +1462,16 @@ public: gtk_widget_set_direction(m_pWidget, bRTL ? GTK_TEXT_DIR_RTL : GTK_TEXT_DIR_LTR); } + virtual void freeze() override + { + gtk_widget_freeze_child_notify(m_pWidget); + } + + virtual void thaw() override + { + gtk_widget_thaw_child_notify(m_pWidget); + } + virtual ~GtkInstanceWidget() override { if (m_nFocusInSignalId) @@ -3745,7 +3755,7 @@ public: { disable_notify_events(); g_object_ref(m_pListStore); - gtk_widget_freeze_child_notify(GTK_WIDGET(m_pTreeView)); + GtkInstanceContainer::freeze(); gtk_tree_view_set_model(m_pTreeView, nullptr); enable_notify_events(); } @@ -3754,7 +3764,7 @@ public: { disable_notify_events(); gtk_tree_view_set_model(m_pTreeView, GTK_TREE_MODEL(m_pListStore)); - gtk_widget_thaw_child_notify(GTK_WIDGET(m_pTreeView)); + GtkInstanceContainer::thaw(); g_object_unref(m_pListStore); enable_notify_events(); } @@ -4762,7 +4772,7 @@ public: virtual void freeze() override { - gtk_widget_freeze_child_notify(GTK_WIDGET(m_pComboBoxText)); + GtkInstanceContainer::freeze(); if (m_xSorter) { GtkTreeModel* pModel = gtk_combo_box_get_model(GTK_COMBO_BOX(m_pComboBoxText)); @@ -4779,7 +4789,7 @@ public: GtkTreeSortable* pSortable = GTK_TREE_SORTABLE(pModel); gtk_tree_sortable_set_sort_column_id(pSortable, 0, GTK_SORT_ASCENDING); } - gtk_widget_thaw_child_notify(GTK_WIDGET(m_pComboBoxText)); + GtkInstanceContainer::thaw(); } virtual ~GtkInstanceComboBoxText() override |