Author: kitone
Date: Thu Jan 1 13:16:54 2015
New Revision: 874
URL: http://svn.gna.org/viewcvs/subtitleeditor?rev=874&view=rev
Log:
Fix bug #22857, bug #23018 patch from Philip Rinn and
Modified:
trunk/src/gui/textviewcell.cc
trunk/src/gui/textviewcell.h
trunk/src/subtitleview.cc
Modified: trunk/src/gui/textviewcell.cc
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/src/gui/textviewcell.cc?rev=874&r1=873&r2=874&view=diff
==============================================================================
--- trunk/src/gui/textviewcell.cc (original)
+++ trunk/src/gui/textviewcell.cc Thu Jan 1 13:16:54 2015
@@ -30,10 +30,10 @@
* Initialize the widget with the AutomaticSpellChecker.
*/
TextViewCell::TextViewCell()
-: Glib::ObjectBase(typeid(TextViewCell)),
- Gtk::CellEditable(),
+: Gtk::CellEditable(),
m_editing_canceled(false),
- m_used_ctrl_enter_to_confirm_change(false)
+ m_used_ctrl_enter_to_confirm_change(false),
+ Glib::ObjectBase(typeid(TextViewCell))
{
se_debug(SE_DEBUG_VIEW);
Modified: trunk/src/gui/textviewcell.h
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/src/gui/textviewcell.h?rev=874&r1=873&r2=874&view=diff
==============================================================================
--- trunk/src/gui/textviewcell.h (original)
+++ trunk/src/gui/textviewcell.h Thu Jan 1 13:16:54 2015
@@ -28,7 +28,7 @@
/*
* Cell text editable with multiline support.
*/
-class TextViewCell : public Gtk::TextView, public Gtk::CellEditable
+class TextViewCell : public Gtk::CellEditable, public Gtk::TextView
{
public:
Modified: trunk/src/subtitleview.cc
URL:
http://svn.gna.org/viewcvs/subtitleeditor/trunk/src/subtitleview.cc?rev=874&r1=873&r2=874&view=diff
==============================================================================
--- trunk/src/subtitleview.cc (original)
+++ trunk/src/subtitleview.cc Thu Jan 1 13:16:54 2015
@@ -38,12 +38,12 @@
/*
*
*/
-class TimeCell : public Gtk::TextView, public Gtk::CellEditable
+class TimeCell : public Gtk::CellEditable, public Gtk::TextView
{
public:
TimeCell()
- :Glib::ObjectBase(typeid(TimeCell)), Gtk::CellEditable()
+ :Gtk::CellEditable(), Glib::ObjectBase(typeid(TimeCell))
{
se_debug(SE_DEBUG_VIEW);
}
_______________________________________________
Subtitleeditor-commits mailing list
[email protected]
https://mail.gna.org/listinfo/subtitleeditor-commits
