X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.h;h=e9744fd107a273c12365a86d11cec545228109d6;hb=aa9b8db38efb9e97460c76e27cecc4d1591b23e5;hp=22f03a22a7174cd32838e6eb7fed6b8f95d6bd5b;hpb=56c41b294aa47a38ac3e1be70d4868f260cb4274;p=libs%2Fgltk.git diff --git a/source/panel.h b/source/panel.h index 22f03a2..e9744fd 100644 --- a/source/panel.h +++ b/source/panel.h @@ -46,7 +46,7 @@ public: void expand(bool, bool); void ghost(bool); void gravity(int, int); - void grid(unsigned); + void grid(std::size_t); void layout(); template void unnamed_child(); @@ -67,7 +67,7 @@ private: protected: std::vector nav_order; - Layout *layout; + Layout *layout = nullptr; static TypeRegistry widget_registry; static bool widget_registry_init_done; @@ -81,24 +81,24 @@ public: template static void register_child_type(const std::string &); - virtual const char *get_class() const { return "panel"; } + const char *get_class() const override { return "panel"; } void set_layout(Layout *); Layout *get_layout() { return layout; } protected: - virtual void autosize_special(const Part &, Geometry &) const; - virtual void render_special(const Part &, GL::Renderer &) const; + void autosize_special(const Part &, Geometry &) const override; + void render_special(const Part &, GL::Renderer &) const override; public: - virtual bool navigate(Navigation); + bool navigate(Navigation) override; protected: Widget *find_next_child(int, int, int, int, int) const; static int compute_delta(int, int, int, int, int); - virtual void on_size_change(); - virtual void on_child_added(Widget &); - virtual void on_child_removed(Widget &); + void on_size_change() override; + void on_child_added(Widget &) override; + void on_child_removed(Widget &) override; };