zalox
/
jucipp
mirror of https://gitlab.com/cppit/jucipp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Removed overloading (accidental) of on_motion_notify_event and on_mark_set.

merge-requests/365/head
eidheim 11 years ago
parent
f924a7f3f9
commit
ebd18156c5
2 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      juci/source.cc
  2. 4
      juci/source.h

10
juci/source.cc
Unescape View File

@ -217,8 +217,8 @@ parse_thread_go(true), parse_thread_mapped(false), parse_thread_stop(false), dia
signal_key_press_event().connect(sigc::mem_fun(*this, &Source::ClangView::on_key_press), false); signal_key_press_event().connect(sigc::mem_fun(*this, &Source::ClangView::on_key_press), false);
signal_key_release_event().connect(sigc::mem_fun(*this, &Source::ClangView::on_key_release), false); signal_key_release_event().connect(sigc::mem_fun(*this, &Source::ClangView::on_key_release), false);
signal_motion_notify_event().connect(sigc::mem_fun(*this, &Source::ClangView::on_motion_notify_event), false); signal_motion_notify_event().connect(sigc::mem_fun(*this, &Source::ClangView::clangview_on_motion_notify_event), false);
get_buffer()->signal_mark_set().connect(sigc::mem_fun(*this, &Source::ClangView::on_mark_set), false); get_buffer()->signal_mark_set().connect(sigc::mem_fun(*this, &Source::ClangView::clangview_on_mark_set), false);
} }
Source::ClangView::~ClangView() { Source::ClangView::~ClangView() {
@ -375,10 +375,10 @@ void Source::ClangView::update_diagnostics() {
buffer->apply_tag(tag, start, end); buffer->apply_tag(tag, start, end);
} }
} }
on_mark_set(get_buffer()->get_insert()->get_iter(), get_buffer()->get_mark("insert")); clangview_on_mark_set(get_buffer()->get_insert()->get_iter(), get_buffer()->get_mark("insert"));
} }
bool Source::ClangView::on_motion_notify_event(GdkEventMotion* event) { bool Source::ClangView::clangview_on_motion_notify_event(GdkEventMotion* event) {
Gdk::Rectangle rectangle(event->x, event->y, 1, 1); Gdk::Rectangle rectangle(event->x, event->y, 1, 1);
diagnostic_tooltips.show(rectangle); diagnostic_tooltips.show(rectangle);
auto cursor=Gdk::Cursor::create(Gdk::CursorType::XTERM); auto cursor=Gdk::Cursor::create(Gdk::CursorType::XTERM);
@ -386,7 +386,7 @@ bool Source::ClangView::on_motion_notify_event(GdkEventMotion* event) {
return false; return false;
} }
void Source::ClangView::on_mark_set(const Gtk::TextBuffer::iterator& iterator, const Glib::RefPtr<Gtk::TextBuffer::Mark>& mark) { void Source::ClangView::clangview_on_mark_set(const Gtk::TextBuffer::iterator& iterator, const Glib::RefPtr<Gtk::TextBuffer::Mark>& mark) {
if(mark->get_name()=="insert") { if(mark->get_name()=="insert") {
Gdk::Rectangle rectangle; Gdk::Rectangle rectangle;
get_iter_location(iterator, rectangle); get_iter_location(iterator, rectangle);

4
juci/source.h
Unescape View File

@ -98,8 +98,8 @@ namespace Source {
void update_syntax(const std::vector<Range> &locations); void update_syntax(const std::vector<Range> &locations);
void update_diagnostics(); void update_diagnostics();
Tooltips diagnostic_tooltips; Tooltips diagnostic_tooltips;
bool on_motion_notify_event(GdkEventMotion* event); bool clangview_on_motion_notify_event(GdkEventMotion* event);
void on_mark_set(const Gtk::TextBuffer::iterator& iterator, const Glib::RefPtr<Gtk::TextBuffer::Mark>& mark); void clangview_on_mark_set(const Gtk::TextBuffer::iterator& iterator, const Glib::RefPtr<Gtk::TextBuffer::Mark>& mark);
static clang::Index clang_index; static clang::Index clang_index;
std::map<std::string, std::string> get_buffer_map() const; std::map<std::string, std::string> get_buffer_map() const;

Write Preview
Loading…
Cancel
Save