Merge branch 'dev' into hidpi-icons

This commit is contained in:
Hombre
2018-11-29 00:15:57 +01:00
264 changed files with 6738 additions and 5146 deletions

View File

@@ -30,12 +30,12 @@ private:
public:
SplashImage ();
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr);
Gtk::SizeRequestMode get_request_mode_vfunc () const;
void get_preferred_height_vfunc (int &minimum_height, int &natural_height) const;
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const;
void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const;
void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const;
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr) override;
Gtk::SizeRequestMode get_request_mode_vfunc () const override;
void get_preferred_height_vfunc (int &minimum_height, int &natural_height) const override;
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const override;
void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const override;
void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const override;
};
//class Splash : public Gtk::Window {