Merge branch 'dev' into rt-cli

This commit is contained in:
Hombre
2017-03-18 18:17:45 +01:00
156 changed files with 7335 additions and 1876 deletions

View File

@@ -315,6 +315,7 @@ public:
class MyComboBoxText : public Gtk::ComboBoxText
{
int naturalWidth, minimumWidth;
sigc::connection myConnection;
bool on_scroll_event (GdkEventScroll* event);
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const;
@@ -324,6 +325,8 @@ public:
MyComboBoxText (bool has_entry = false);
void setPreferredWidth (int minimum_width, int natural_width);
void connect(const sigc::connection &connection) { myConnection = connection; }
void block(bool blocked) { myConnection.block(blocked); }
};
/**