mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolves: tdf#129484 install decimal key handler for all widgets again

Browse Source 
reparent notebook back to its original parent so its not destroyed
when the overflow parent is destroyed

and

add g_object_ref/g_object_unref guard to GtkInstanceWidget

Change-Id: I85d691c05e82531e398736258668e024c4aa1e64
Reviewed-on: https://gerrit.libreoffice.org/85508
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2019-12-19 10:50:40 +00:00
parent e59bbb72b1
commit 2a5d4ed38d
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
vcl/unx/gtk3/gtk3gtkinst.cxx
View File

@@ -2182,6 +2182,10 @@ public:
, m_nDragDropReceivedSignalId(0) , m_nDragDropReceivedSignalId(0)
, m_nDragLeaveSignalId(0) , m_nDragLeaveSignalId(0)
{ {
if (!bTakeOwnership)
g_object_ref(m_pWidget);
localizeDecimalSeparator();
} }
virtual void connect_key_press(const Link<const KeyEvent&, bool>& rLink) override virtual void connect_key_press(const Link<const KeyEvent&, bool>& rLink) override
@@ -2771,6 +2775,8 @@ public:
if (m_bTakeOwnership) if (m_bTakeOwnership)
gtk_widget_destroy(m_pWidget); gtk_widget_destroy(m_pWidget);
else
g_object_unref(m_pWidget);
} }
virtual void disable_notify_events() virtual void disable_notify_events()
@@ -6083,8 +6089,17 @@ public:
g_signal_handler_disconnect(m_pOverFlowNotebook, m_nOverFlowSwitchPageSignalId); g_signal_handler_disconnect(m_pOverFlowNotebook, m_nOverFlowSwitchPageSignalId);
gtk_widget_destroy(GTK_WIDGET(m_pOverFlowNotebook)); gtk_widget_destroy(GTK_WIDGET(m_pOverFlowNotebook));
if (m_pOverFlowBox) if (m_pOverFlowBox)
{
// put it back to how we found it initially
GtkWidget* pParent = gtk_widget_get_parent(GTK_WIDGET(m_pOverFlowBox));
g_object_ref(m_pNotebook);
gtk_container_remove(GTK_CONTAINER(m_pOverFlowBox), GTK_WIDGET(m_pNotebook));
gtk_container_add(GTK_CONTAINER(pParent), GTK_WIDGET(m_pNotebook));
g_object_unref(m_pNotebook);
gtk_widget_destroy(GTK_WIDGET(m_pOverFlowBox)); gtk_widget_destroy(GTK_WIDGET(m_pOverFlowBox));
} }
}
}; };
class GtkInstanceButton : public GtkInstanceContainer, public virtual weld::Button class GtkInstanceButton : public GtkInstanceContainer, public virtual weld::Button
@@ -10512,7 +10527,6 @@ public:
, m_bBlockOutput(false) , m_bBlockOutput(false)
, m_bBlank(false) , m_bBlank(false)
{ {
localizeDecimalSeparator();
} }
virtual int get_value() const override virtual int get_value() const override