|
 |
e40c1c2 |
diff -up easystroke-0.6.0/actions.cc.lambda easystroke-0.6.0/actions.cc
|
|
|
e40c1c2 |
--- easystroke-0.6.0/actions.cc.lambda 2013-03-27 11:52:38.000000000 -0400
|
|
|
e40c1c2 |
+++ easystroke-0.6.0/actions.cc 2016-02-01 12:04:07.337863849 -0500
|
|
|
e40c1c2 |
@@ -51,10 +51,10 @@ void TreeViewMulti::on_drag_begin(const
|
|
|
e40c1c2 |
context->set_icon(pb, pb->get_width(), pb->get_height());
|
|
|
e40c1c2 |
}
|
|
|
e40c1c2 |
|
|
|
e40c1c2 |
-bool negate(bool b) { return !b; }
|
|
|
e40c1c2 |
-
|
|
|
e40c1c2 |
TreeViewMulti::TreeViewMulti() : Gtk::TreeView(), pending(false) {
|
|
|
e40c1c2 |
- get_selection()->set_select_function(sigc::group(&negate, sigc::ref(pending)));
|
|
|
e40c1c2 |
+ get_selection()->set_select_function([this](Glib::RefPtr<Gtk::TreeModel> const&, Gtk::TreeModel::Path const&, bool) {
|
|
|
e40c1c2 |
+ return !pending;
|
|
|
e40c1c2 |
+ });
|
|
|
e40c1c2 |
}
|
|
|
e40c1c2 |
|
|
|
e40c1c2 |
enum Type { COMMAND, KEY, TEXT, SCROLL, IGNORE, BUTTON, MISC };
|
|
|
e40c1c2 |
diff -up easystroke-0.6.0/Makefile.lambda easystroke-0.6.0/Makefile
|
|
|
e40c1c2 |
--- easystroke-0.6.0/Makefile.lambda 2016-02-01 12:05:13.012390968 -0500
|
|
|
e40c1c2 |
+++ easystroke-0.6.0/Makefile 2016-02-01 12:06:06.620004974 -0500
|
|
|
e40c1c2 |
@@ -21,8 +21,7 @@ LOCALEDIR= $(PREFIX)/share/locale
|
|
|
e40c1c2 |
DFLAGS =
|
|
|
e40c1c2 |
OFLAGS = -O2
|
|
|
e40c1c2 |
AOFLAGS = -O3
|
|
|
e40c1c2 |
-STROKEFLAGS = -Wall -std=c99 $(DFLAGS)
|
|
|
e40c1c2 |
-CXXFLAGS = -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" `pkg-config gtkmm-3.0 dbus-glib-1 --cflags`
|
|
|
e40c1c2 |
+CXXFLAGS = -Wall $(DFLAGS) -std=c++11 -DLOCALEDIR=\"$(LOCALEDIR)\" `pkg-config gtkmm-3.0 dbus-glib-1 --cflags`
|
|
|
e40c1c2 |
CFLAGS = -Wall $(DFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" `pkg-config gtk+-3.0 --cflags` -DGETTEXT_PACKAGE='"easystroke"'
|
|
|
e40c1c2 |
LDFLAGS = $(DFLAGS)
|
|
|
e40c1c2 |
|
|
|
e40c1c2 |
@@ -63,7 +62,7 @@ $(BINARY): $(OFILES)
|
|
|
e40c1c2 |
$(CXX) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
|
|
|
e40c1c2 |
|
|
|
e40c1c2 |
stroke.o: stroke.c
|
|
|
e40c1c2 |
- $(CC) $(STROKEFLAGS) $(AOFLAGS) -MT $@ -MMD -MP -MF $*.Po -o $@ -c $<
|
|
|
e40c1c2 |
+ $(CC) $(CFLAGS) $(AOFLAGS) -MT $@ -MMD -MP -MF $*.Po -o $@ -c $<
|
|
|
e40c1c2 |
|
|
|
e40c1c2 |
%.o: %.c
|
|
|
e40c1c2 |
$(CC) $(CFLAGS) $(OFLAGS) -MT $@ -MMD -MP -MF $*.Po -o $@ -c $<
|