Browse Source

Moved on_key_press_event and on_button_press_event to protected as in the Gtkmm classes.

merge-requests/365/head
eidheim 10 years ago
parent
commit
4dc55579a1
  1. 6
      src/source.h
  2. 6
      src/source_clang.h
  3. 1
      src/window.h

6
src/source.h

@ -102,9 +102,6 @@ namespace Source {
void set_tab_char_and_size(char tab_char, unsigned tab_size);
std::pair<char, unsigned> get_tab_char_and_size() {return {tab_char, tab_size};}
bool on_key_press_event(GdkEventKey* key) override;
bool on_button_press_event(GdkEventButton *event) override;
bool soft_reparse_needed=false;
bool full_reparse_needed=false;
virtual void soft_reparse() {soft_reparse_needed=false;}
@ -136,6 +133,9 @@ namespace Source {
bool find_right_bracket_forward(Gtk::TextIter iter, Gtk::TextIter &found_iter);
bool find_left_bracket_backward(Gtk::TextIter iter, Gtk::TextIter &found_iter);
bool on_key_press_event(GdkEventKey* key) override;
bool on_button_press_event(GdkEventButton *event) override;
std::pair<char, unsigned> find_tab_char_and_size();
unsigned tab_size;
char tab_char;

6
src/source_clang.h

@ -25,7 +25,6 @@ namespace Source {
};
ClangViewParse(const boost::filesystem::path &file_path, const boost::filesystem::path& project_path, Glib::RefPtr<Gsv::Language> language);
bool on_key_press_event(GdkEventKey* key) override;
void configure() override;
@ -41,6 +40,8 @@ namespace Source {
void show_diagnostic_tooltips(const Gdk::Rectangle &rectangle) override;
void show_type_tooltips(const Gdk::Rectangle &rectangle) override;
bool on_key_press_event(GdkEventKey* key) override;
boost::regex bracket_regex;
boost::regex no_bracket_statement_regex;
boost::regex no_bracket_no_para_statement_regex;
@ -82,11 +83,12 @@ namespace Source {
};
ClangViewAutocomplete(const boost::filesystem::path &file_path, const boost::filesystem::path& project_path, Glib::RefPtr<Gsv::Language> language);
bool on_key_press_event(GdkEventKey* key) override;
virtual void async_delete();
bool full_reparse() override;
protected:
bool on_key_press_event(GdkEventKey* key) override;
std::thread autocomplete_thread;
sigc::connection autocomplete_done_connection;
sigc::connection autocomplete_restart_connection;

1
src/window.h

@ -11,6 +11,7 @@ public:
Window();
Notebook notebook;
protected:
bool on_key_press_event(GdkEventKey *event) override;
bool on_delete_event(GdkEventAny *event) override;

Loading…
Cancel
Save