Style and comment updates

diff --git a/source/button.h b/source/button.h
index 165ca4f8447d779a3b82ac05bd1180aa16512212..22426ca5399f6ba9c6f69c866150247f9e584d7a 100644 (file)
--- a/source/button.h
+++ b/source/button.h
@@ -21,6 +21,7 @@ public:
        {
        public:
                Loader(Button &);
+
        private:
                void text(const std::string &);
        };

diff --git a/source/dialog.h b/source/dialog.h
index 285478ebb570ddead2d12deae299805dd595ecee..6f3556586939eeabf882a3661d8063d41dcd8d03 100644 (file)
--- a/source/dialog.h
+++ b/source/dialog.h
@@ -20,6 +20,7 @@ public:
        {
        public:
                Loader(Dialog &, WidgetMap &);
+
        private:
                void action_button(const std::string &, int);
        };

diff --git a/source/dropdown.h b/source/dropdown.h
index 3a42d007755a38c6478fc46fbd032224df7e4a0b..e7935f702aaeb1d7c6fd1f0879c6b673c1a4aaa2 100644 (file)
--- a/source/dropdown.h
+++ b/source/dropdown.h
@@ -19,6 +19,7 @@ public:
        {
        public:
                Loader(Dropdown &);
+
        private:
                void item(const std::string &);
        };

diff --git a/source/entry.h b/source/entry.h
index ee390a0421116df51cc2b701a21249fd26f8faed..3c7ab63548aa35fda07df38eeca8a105b9788bc0 100644 (file)
--- a/source/entry.h
+++ b/source/entry.h
@@ -16,9 +16,12 @@ Text entry field.
 
 Special parts:
 
-  text    The current text of the widget.  Graphics are ignored.
-  cursor  Indicates the current input position.  Fill_x is ignored.
-  slider  A vertical slider for multiline entries.
+  text       The current text of the widget.  Graphics are ignored.
+  cursor     Indicates the current input position.  Fill and align are taken
+             from the text part.
+  selection  Highlights the selected text.  Fill and align are taken from the
+             text part.
+  slider     A vertical slider for multiline entries.
 */
 class MSPGLTK_API Entry: virtual public Widget, private Container
 {

diff --git a/source/geometry.h b/source/geometry.h
index fac3bbc7a506ea9cde32a37fad8a5e50618d562a..cb99cedecb8d6198e89bc869c633eb9a07d55f22 100644 (file)
--- a/source/geometry.h
+++ b/source/geometry.h
@@ -19,6 +19,7 @@ struct MSPGLTK_API Geometry
 
        Geometry() = default;
        Geometry(int x_, int y_, unsigned w_, unsigned h_): x(x_), y(y_), w(w_), h(h_) { }
+
        bool is_inside(int, int) const;
        bool is_inside_relative(int, int) const;
 };

diff --git a/source/grid.h b/source/grid.h
index be1c2661c9c8533846c6a440dfedfe4ccbd8a9c4..01cfffaab4e95a96060141e3204e2b7c793eda31 100644 (file)
--- a/source/grid.h
+++ b/source/grid.h
@@ -15,6 +15,7 @@ public:
        {
        public:
                Loader(Grid &);
+
        private:
                void next_row();
                void skip();

diff --git a/source/image.cpp b/source/image.cpp
index 448da7b985e14664730a1dc33b9994df98bcecbb..6e24d71b13a42df36a0f2f23b5442dc3406f28a1 100644 (file)
--- a/source/image.cpp
+++ b/source/image.cpp
@@ -12,8 +12,7 @@ namespace GLtk {
 
 Image::Image(const GL::Texture2D *i):
        image(i)
-{
-}
+{ }
 
 void Image::autosize_special(const Part &part, Geometry &ageom) const
 {

diff --git a/source/label.h b/source/label.h
index 6b350ed7ecd690e25da9a288ea877554181eabb7..0fb09e928fa6ff2e8edad62214e70991432ec3b2 100644 (file)
--- a/source/label.h
+++ b/source/label.h
@@ -18,6 +18,7 @@ public:
        {
        public:
                Loader(Label &);
+
        private:
                void text(const std::string &);
        };

diff --git a/source/lineararrangement.h b/source/lineararrangement.h
index 7535bc7879247c57c151a0f839e39245f5146aa2..6f3c26ace105f96d4a47c2230d9d1fa930a1e4a0 100644 (file)
--- a/source/lineararrangement.h
+++ b/source/lineararrangement.h
@@ -15,6 +15,7 @@ public:
        {
        public:
                Loader(LinearArrangement &);
+
        private:
                void expand();
                void spacing(unsigned);

diff --git a/source/list.h b/source/list.h
index 0938eaf05ee162a59c8407a3d38b9e0765237177..72b5b8890668fdb0c31946c9e17632f7569a6528 100644 (file)
--- a/source/list.h
+++ b/source/list.h
@@ -42,6 +42,7 @@ public:
        {
        public:
                Loader(List &);
+
        private:
                void item(const std::string &);
        };
@@ -128,8 +129,7 @@ private:
                const ListDataStore<ValueType> *data;
 
        public:
-               TypedItemFactory(const ListData &d)
-               { set_data(d); }
+               TypedItemFactory(const ListData &d) { set_data(d); }
 
                void set_data(const ListData &d) override
                {

diff --git a/source/part.h b/source/part.h
index 10eef5ff2ac329e4214ab33c48092d97fb8690ee..1e79165fd4f02af21af122262de1ac7929cd411a 100644 (file)
--- a/source/part.h
+++ b/source/part.h
@@ -24,6 +24,7 @@ public:
        {
        public:
                Loader(Part &, Resources &);
+
        private:
                void finish() override;
 
@@ -44,6 +45,7 @@ private:
 
 public:
        Part(const std::string &);
+
        const std::string &get_name() const { return name; }
        const Graphic *get_graphic(State) const;
        const Geometry &get_geometry() const { return geom; }

diff --git a/source/resources.h b/source/resources.h
index 6a1c603c050766487a27995270c65d136f55ba91..31c573470ec9015e181849a909376796b2f3abb2 100644 (file)
--- a/source/resources.h
+++ b/source/resources.h
@@ -17,8 +17,8 @@ namespace Msp {
 namespace GLtk {
 
 /**
-Stores resources such as styles and graphics.  All widgets require a Resources
-instance in constructor.
+Stores resources such as styles and graphics.  The Root widget requires a
+Resources instance as constructor parameter.
 */
 class MSPGLTK_API Resources: public DataFile::Collection
 {
@@ -30,6 +30,7 @@ public:
 
        public:
                Loader(Resources &);
+
        private:
                void default_font(const std::string &);
                void font(const std::string &);

diff --git a/source/toggle.h b/source/toggle.h
index 2b38ffc2084f023ac0ea011f9720b58e85e2195f..7da0e36996150d8256acfde03621a37d0f620fdd 100644 (file)
--- a/source/toggle.h
+++ b/source/toggle.h
@@ -19,8 +19,10 @@ public:
        {
        public:
                Loader(Toggle &);
+
        private:
                void finish() override;
+
                void text(const std::string &);
        };
 

diff --git a/source/widget.h b/source/widget.h
index fc517989364c899a4d315585ad2de04552653eaa..001da84a891f2bb9743f3d3553cff6cee7ddbf03 100644 (file)
--- a/source/widget.h
+++ b/source/widget.h
@@ -31,6 +31,7 @@ public:
        {
        public:
                Loader(Widget &);
+
        private:
                void position(int, int);
                void size(unsigned, unsigned);