From e066ec2e038405621a7de50e4cd735e548eb488d Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 10 Oct 2012 00:16:37 +0300
Subject: Delete copy constructor in some classes.

---
 src/gui/widgets/avatarlistbox.h          |  2 ++
 src/gui/widgets/battletab.h              |  2 ++
 src/gui/widgets/browserbox.h             |  2 ++
 src/gui/widgets/button.h                 |  2 ++
 src/gui/widgets/channeltab.h             |  1 +
 src/gui/widgets/chattab.h                |  2 ++
 src/gui/widgets/checkbox.h               |  2 ++
 src/gui/widgets/desktop.h                |  3 +++
 src/gui/widgets/dropdown.h               |  2 ++
 src/gui/widgets/dropshortcutcontainer.h  |  2 ++
 src/gui/widgets/emoteshortcutcontainer.h |  2 ++
 src/gui/widgets/extendedlistbox.h        |  2 ++
 src/gui/widgets/extendednamesmodel.h     |  2 ++
 src/gui/widgets/flowcontainer.h          |  2 ++
 src/gui/widgets/guildchattab.h           |  2 ++
 src/gui/widgets/guitable.h               |  2 ++
 src/gui/widgets/horizontcontainer.h      |  2 ++
 src/gui/widgets/icon.h                   |  2 ++
 src/gui/widgets/inttextfield.h           |  2 ++
 src/gui/widgets/itemcontainer.h          |  2 ++
 src/gui/widgets/itemlinkhandler.h        |  2 ++
 src/gui/widgets/itemshortcutcontainer.h  |  2 ++
 src/gui/widgets/label.h                  |  2 ++
 src/gui/widgets/layout.h                 |  2 ++
 src/gui/widgets/layouthelper.h           |  2 ++
 src/gui/widgets/listbox.h                |  2 ++
 src/gui/widgets/namesmodel.h             |  2 ++
 src/gui/widgets/passwordfield.h          |  2 ++
 src/gui/widgets/playerbox.h              |  2 ++
 src/gui/widgets/popup.h                  |  2 ++
 src/gui/widgets/progressbar.h            |  2 ++
 src/gui/widgets/progressindicator.h      | 16 ++++++-----
 src/gui/widgets/radiobutton.h            |  2 ++
 src/gui/widgets/radiogroup.h             |  2 ++
 src/gui/widgets/scrollarea.h             |  2 ++
 src/gui/widgets/setupitem.h              | 20 ++++++++++++++
 src/gui/widgets/setuptab.h               | 46 +++++++++++++++++---------------
 src/gui/widgets/setuptabscroll.h         |  2 ++
 src/gui/widgets/shopitems.h              |  2 ++
 src/gui/widgets/shoplistbox.h            |  2 ++
 src/gui/widgets/shortcutcontainer.h      |  2 ++
 src/gui/widgets/slider.h                 |  2 ++
 src/gui/widgets/sliderlist.h             |  2 ++
 src/gui/widgets/spellshortcutcontainer.h |  2 ++
 src/gui/widgets/tab.h                    |  3 +++
 src/gui/widgets/tabbedarea.h             |  2 ++
 src/gui/widgets/tablemodel.h             |  2 ++
 src/gui/widgets/tabstrip.h               |  2 ++
 src/gui/widgets/textbox.h                |  2 ++
 src/gui/widgets/textfield.h              |  2 ++
 src/gui/widgets/textpreview.h            |  2 ++
 src/gui/widgets/tradetab.h               |  2 ++
 src/gui/widgets/vertcontainer.h          |  2 ++
 src/gui/widgets/whispertab.h             |  2 ++
 src/gui/widgets/widgetgroup.h            |  2 ++
 src/gui/widgets/window.h                 |  2 ++
 56 files changed, 160 insertions(+), 29 deletions(-)

(limited to 'src/gui/widgets')

diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h
index 803a80070..84c491cd2 100644
--- a/src/gui/widgets/avatarlistbox.h
+++ b/src/gui/widgets/avatarlistbox.h
@@ -48,6 +48,8 @@ class AvatarListBox final : public ListBox, public ConfigListener
 public:
     AvatarListBox(AvatarListModel *const model);
 
+    A_DELETE_COPY(AvatarListBox);
+
     ~AvatarListBox();
 
     /**
diff --git a/src/gui/widgets/battletab.h b/src/gui/widgets/battletab.h
index 87b082901..83dc44499 100644
--- a/src/gui/widgets/battletab.h
+++ b/src/gui/widgets/battletab.h
@@ -33,6 +33,8 @@ class BattleTab final : public ChatTab
     public:
         BattleTab();
 
+        A_DELETE_COPY(BattleTab);
+
         ~BattleTab();
 
         int getType() const override
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index 9cf74ef4f..7f9812a99 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -84,6 +84,8 @@ class BrowserBox final : public gcn::Widget,
         BrowserBox(const unsigned int mode = AUTO_SIZE,
                    const bool opaque = true);
 
+        A_DELETE_COPY(BrowserBox);
+
         /**
          * Destructor.
          */
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index 36f539b6a..d7e7ebf89 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -72,6 +72,8 @@ class Button final : public gcn::Button, public gcn::WidgetListener
                const std::string &actionEventId,
                gcn::ActionListener *const listener);
 
+        A_DELETE_COPY(Button);
+
         /**
          * Destructor.
          */
diff --git a/src/gui/widgets/channeltab.h b/src/gui/widgets/channeltab.h
index 96b6dd6ac..d51e71511 100644
--- a/src/gui/widgets/channeltab.h
+++ b/src/gui/widgets/channeltab.h
@@ -33,6 +33,7 @@ class Channel;
 class ChannelTab final : public ChatTab
 {
     public:
+        A_DELETE_COPY(ChannelTab);
 
         Channel *getChannel() const
         { return mChannel; }
diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h
index ba6698e50..2ab19814d 100644
--- a/src/gui/widgets/chattab.h
+++ b/src/gui/widgets/chattab.h
@@ -55,6 +55,8 @@ class ChatTab : public Tab
          */
         ChatTab(const std::string &name);
 
+        A_DELETE_COPY(ChatTab);
+
         ~ChatTab();
 
         /**
diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h
index 54e9a5e0d..63569214a 100644
--- a/src/gui/widgets/checkbox.h
+++ b/src/gui/widgets/checkbox.h
@@ -44,6 +44,8 @@ class CheckBox final : public gcn::CheckBox
                  gcn::ActionListener *const listener = nullptr,
                  const std::string &eventId = "");
 
+        A_DELETE_COPY(CheckBox);
+
         /**
          * Destructor.
          */
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index d8fa7d36a..0a9759835 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -50,6 +50,9 @@ class Desktop final : public Container, private gcn::WidgetListener
 {
     public:
         Desktop();
+
+        A_DELETE_COPY(Desktop);
+
         ~Desktop();
 
         /**
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index f76a38b4d..97732db9b 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -52,6 +52,8 @@ class DropDown final : public gcn::DropDown
                  gcn::ActionListener *const listener = nullptr,
                  const std::string &eventId = "");
 
+        A_DELETE_COPY(DropDown);
+
         ~DropDown();
 
         /**
diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/dropshortcutcontainer.h
index 337973412..8b591b3c0 100644
--- a/src/gui/widgets/dropshortcutcontainer.h
+++ b/src/gui/widgets/dropshortcutcontainer.h
@@ -44,6 +44,8 @@ class DropShortcutContainer final : public ShortcutContainer
          */
         DropShortcutContainer();
 
+        A_DELETE_COPY(DropShortcutContainer);
+
         /**
          * Destructor.
          */
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index 736370a93..75b1e5a03 100644
--- a/src/gui/widgets/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -45,6 +45,8 @@ class EmoteShortcutContainer final : public ShortcutContainer
          */
         EmoteShortcutContainer();
 
+        A_DELETE_COPY(EmoteShortcutContainer);
+
         /**
          * Destructor.
          */
diff --git a/src/gui/widgets/extendedlistbox.h b/src/gui/widgets/extendedlistbox.h
index af3ae64a9..ac6c767c3 100644
--- a/src/gui/widgets/extendedlistbox.h
+++ b/src/gui/widgets/extendedlistbox.h
@@ -31,6 +31,8 @@ class ExtendedListBox final : public ListBox
          */
         ExtendedListBox(gcn::ListModel *const listModel);
 
+        A_DELETE_COPY(ExtendedListBox);
+
         ~ExtendedListBox();
 
         /**
diff --git a/src/gui/widgets/extendednamesmodel.h b/src/gui/widgets/extendednamesmodel.h
index a4b6013c2..52f162edb 100644
--- a/src/gui/widgets/extendednamesmodel.h
+++ b/src/gui/widgets/extendednamesmodel.h
@@ -32,6 +32,8 @@ class ExtendedNamesModel : public ExtendedListModel
     public:
         ExtendedNamesModel();
 
+        A_DELETE_COPY(ExtendedNamesModel);
+
         virtual ~ExtendedNamesModel();
 
         virtual int getNumberOfElements() override;
diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h
index d04dffb23..240290327 100644
--- a/src/gui/widgets/flowcontainer.h
+++ b/src/gui/widgets/flowcontainer.h
@@ -40,6 +40,8 @@ class FlowContainer final : public Container,
          */
         FlowContainer(const int boxWidth, const int boxHeight);
 
+        A_DELETE_COPY(FlowContainer);
+
         /**
          * Destructor.
          */
diff --git a/src/gui/widgets/guildchattab.h b/src/gui/widgets/guildchattab.h
index 54dd67a8d..4981ad41e 100644
--- a/src/gui/widgets/guildchattab.h
+++ b/src/gui/widgets/guildchattab.h
@@ -33,6 +33,8 @@ class GuildChatTab final : public ChatTab
     public:
         GuildChatTab();
 
+        A_DELETE_COPY(GuildChatTab);
+
         ~GuildChatTab();
 
         bool handleCommand(const std::string &type,
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index 76fdb4b54..5953348fc 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -56,6 +56,8 @@ public:
     GuiTable(TableModel *const initial_model = nullptr,
              const bool opacity = true);
 
+    A_DELETE_COPY(GuiTable);
+
     virtual ~GuiTable();
 
     /**
diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h
index 1db5bf7a8..334c00969 100644
--- a/src/gui/widgets/horizontcontainer.h
+++ b/src/gui/widgets/horizontcontainer.h
@@ -36,6 +36,8 @@ class HorizontContainer final : public Container, public gcn::WidgetListener
     public:
         HorizontContainer(const int height, const int spacing);
 
+        A_DELETE_COPY(HorizontContainer);
+
         virtual void add(gcn::Widget *widget);
 
         virtual void add(gcn::Widget *widget, int spacing);
diff --git a/src/gui/widgets/icon.h b/src/gui/widgets/icon.h
index ec9c8319f..004d77c23 100644
--- a/src/gui/widgets/icon.h
+++ b/src/gui/widgets/icon.h
@@ -45,6 +45,8 @@ class Icon final : public gcn::Widget
          */
         Icon(Image *const image);
 
+        A_DELETE_COPY(Icon);
+
         /** 
          * Gets the current Image.
          */
diff --git a/src/gui/widgets/inttextfield.h b/src/gui/widgets/inttextfield.h
index 430ae4746..e846e0cbe 100644
--- a/src/gui/widgets/inttextfield.h
+++ b/src/gui/widgets/inttextfield.h
@@ -37,6 +37,8 @@ class IntTextField final : public TextField
         IntTextField(const int def = 0, const int min = 0, const int max = 0,
                      const bool enabled = true, const int width = 0);
 
+        A_DELETE_COPY(IntTextField);
+
         /**
          * Sets the minimum and maximum values of the text box.
          */
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index e7bf11e48..867d837c2 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -63,6 +63,8 @@ class ItemContainer final : public gcn::Widget,
         ItemContainer(Inventory *const inventory,
                       const bool forceQuantity = false);
 
+        A_DELETE_COPY(ItemContainer);
+
         /**
          * Destructor.
          */
diff --git a/src/gui/widgets/itemlinkhandler.h b/src/gui/widgets/itemlinkhandler.h
index 35415a010..c50ea5dc2 100644
--- a/src/gui/widgets/itemlinkhandler.h
+++ b/src/gui/widgets/itemlinkhandler.h
@@ -32,6 +32,8 @@ class ItemLinkHandler final : public LinkHandler
     public:
         ItemLinkHandler();
 
+        A_DELETE_COPY(ItemLinkHandler);
+
         ~ItemLinkHandler();
 
         void handleLink(const std::string &link,
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index e7a13b45f..9b8bfe797 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -45,6 +45,8 @@ class ItemShortcutContainer final : public ShortcutContainer
          */
         ItemShortcutContainer(const unsigned number);
 
+        A_DELETE_COPY(ItemShortcutContainer);
+
         /**
          * Destructor.
          */
diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h
index fc82fa900..046f2ca00 100644
--- a/src/gui/widgets/label.h
+++ b/src/gui/widgets/label.h
@@ -44,6 +44,8 @@ class Label final : public gcn::Label
          */
         Label(const std::string &caption);
 
+        A_DELETE_COPY(Label);
+
         /**
          * Draws the label.
          */
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
index beccfcb01..f5dab2d33 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.h
@@ -336,6 +336,8 @@ class Layout final : public LayoutCell
     public:
         Layout();
 
+        A_DELETE_COPY(Layout);
+
         /**
          * Sets the margin around the layout.
          */
diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h
index 2285e15cd..72402f630 100644
--- a/src/gui/widgets/layouthelper.h
+++ b/src/gui/widgets/layouthelper.h
@@ -40,6 +40,8 @@ class LayoutHelper final : public gcn::WidgetListener
          */
         LayoutHelper(gcn::Container *const container);
 
+        A_DELETE_COPY(LayoutHelper);
+
         /**
          * Destructor.
          */
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index efe6da57d..f484c8ad0 100644
--- a/src/gui/widgets/listbox.h
+++ b/src/gui/widgets/listbox.h
@@ -42,6 +42,8 @@ class ListBox : public gcn::ListBox
          */
         ListBox(gcn::ListModel *const listModel);
 
+        A_DELETE_COPY(ListBox);
+
         ~ListBox();
 
         /**
diff --git a/src/gui/widgets/namesmodel.h b/src/gui/widgets/namesmodel.h
index 69d9f3c56..47248e246 100644
--- a/src/gui/widgets/namesmodel.h
+++ b/src/gui/widgets/namesmodel.h
@@ -32,6 +32,8 @@ class NamesModel : public gcn::ListModel
     public:
         NamesModel();
 
+        A_DELETE_COPY(NamesModel);
+
         virtual ~NamesModel();
 
         virtual int getNumberOfElements() override;
diff --git a/src/gui/widgets/passwordfield.h b/src/gui/widgets/passwordfield.h
index 0444427ee..b5b2c4e53 100644
--- a/src/gui/widgets/passwordfield.h
+++ b/src/gui/widgets/passwordfield.h
@@ -38,6 +38,8 @@ class PasswordField final : public TextField
          */
         PasswordField(const std::string &text = "");
 
+        A_DELETE_COPY(PasswordField);
+
         /**
          * Draws the password field.
          */
diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h
index 3b3116294..4ae3c8866 100644
--- a/src/gui/widgets/playerbox.h
+++ b/src/gui/widgets/playerbox.h
@@ -49,6 +49,8 @@ class PlayerBox final : public gcn::ScrollArea
 
         PlayerBox(std::string skin = "");
 
+        A_DELETE_COPY(PlayerBox);
+
         /**
          * Destructor.
          */
diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h
index af7c8d5bd..26e73c183 100644
--- a/src/gui/widgets/popup.h
+++ b/src/gui/widgets/popup.h
@@ -60,6 +60,8 @@ class Popup : public Container, public gcn::MouseListener,
          */
         Popup(const std::string &name = "", std::string skin = "");
 
+        A_DELETE_COPY(Popup);
+
         /**
          * Destructor. Deletes all the added widgets.
          */
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index 3b8b976cf..bf57b6536 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -49,6 +49,8 @@ class ProgressBar final : public gcn::Widget, public gcn::WidgetListener
                     const int width = 40, const int height = 7,
                     const int color = -1);
 
+        A_DELETE_COPY(ProgressBar);
+
         ~ProgressBar();
 
         /**
diff --git a/src/gui/widgets/progressindicator.h b/src/gui/widgets/progressindicator.h
index 2db3fe8b9..7e79d0cca 100644
--- a/src/gui/widgets/progressindicator.h
+++ b/src/gui/widgets/progressindicator.h
@@ -32,17 +32,19 @@ class SimpleAnimation;
  */
 class ProgressIndicator final : public gcn::Widget
 {
-public:
-    ProgressIndicator();
+    public:
+        ProgressIndicator();
 
-    ~ProgressIndicator();
+        A_DELETE_COPY(ProgressIndicator);
 
-    void logic() override;
+        ~ProgressIndicator();
 
-    void draw(gcn::Graphics *graphics) override;
+        void logic() override;
 
-private:
-    SimpleAnimation *mIndicator;
+        void draw(gcn::Graphics *graphics) override;
+
+    private:
+        SimpleAnimation *mIndicator;
 };
 
 #endif // PROGRESSINDICATOR_H
diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h
index cc0ff7734..d53154ed9 100644
--- a/src/gui/widgets/radiobutton.h
+++ b/src/gui/widgets/radiobutton.h
@@ -39,6 +39,8 @@ class RadioButton final : public gcn::RadioButton
         RadioButton(const std::string &caption, const std::string &group,
                     const bool marked = false);
 
+        A_DELETE_COPY(RadioButton);
+
         /**
          * Destructor.
          */
diff --git a/src/gui/widgets/radiogroup.h b/src/gui/widgets/radiogroup.h
index 370d46436..008570faf 100644
--- a/src/gui/widgets/radiogroup.h
+++ b/src/gui/widgets/radiogroup.h
@@ -31,6 +31,8 @@ class RadioGroup final : public WidgetGroup
         RadioGroup(const std::string &group, const int height,
                    const int spacing);
 
+        A_DELETE_COPY(RadioGroup);
+
         gcn::Widget *createWidget(const std::string &name) override;
 };
 
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index 7a1a3b076..26a41ee45 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -56,6 +56,8 @@ class ScrollArea final : public gcn::ScrollArea, public gcn::WidgetListener
         ScrollArea(gcn::Widget *const widget, const bool opaque = true,
                    const std::string &skin = "");
 
+        A_DELETE_COPY(ScrollArea);
+
         /**
          * Destructor. Also deletes the content.
          */
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index f36dc2534..0643890a6 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -68,6 +68,8 @@ class SetupItem : public gcn::ActionListener
                   std::string eventName, std::string def,
                   const bool mainConfig);
 
+        A_DELETE_COPY(SetupItem);
+
         ~SetupItem();
 
         void load();
@@ -141,6 +143,8 @@ class SetupItemCheckBox final : public SetupItem
                           std::string eventName, std::string def,
                           const bool mainConfig = true);
 
+        A_DELETE_COPY(SetupItemCheckBox);
+
         ~SetupItemCheckBox();
 
         void createControls();
@@ -166,6 +170,8 @@ class SetupItemTextField final : public SetupItem
                            std::string eventName, std::string def,
                            const bool mainConfig = true);
 
+        A_DELETE_COPY(SetupItemTextField);
+
         ~SetupItemTextField();
 
         void createControls();
@@ -203,6 +209,8 @@ class SetupItemIntTextField final : public SetupItem
                               const int min, const int max,
                               std::string def, const bool mainConfig = true);
 
+        A_DELETE_COPY(SetupItemIntTextField);
+
         ~SetupItemIntTextField();
 
         void createControls();
@@ -232,6 +240,8 @@ class SetupItemLabel final : public SetupItem
                        SetupTabScroll *const parent,
                        const bool separator = true);
 
+        A_DELETE_COPY(SetupItemLabel);
+
         ~SetupItemLabel();
 
         void createControls();
@@ -262,6 +272,8 @@ class SetupItemDropDown final : public SetupItem
                           std::string eventName, gcn::ListModel *const model,
                           std::string def, const bool mainConfig = true);
 
+        A_DELETE_COPY(SetupItemDropDown);
+
         ~SetupItemDropDown();
 
         void createControls();
@@ -295,6 +307,8 @@ class SetupItemSlider final : public SetupItem
                         const bool onTheFly = false,
                         const bool mainConfig = true);
 
+        A_DELETE_COPY(SetupItemSlider);
+
         ~SetupItemSlider();
 
         void createControls();
@@ -342,6 +356,8 @@ class SetupItemSlider2 final : public SetupItem
                          const bool mainConfig = true,
                          const bool doNotAlign = false);
 
+        A_DELETE_COPY(SetupItemSlider2);
+
         ~SetupItemSlider2();
 
         void createControls();
@@ -390,6 +406,8 @@ class SetupItemSliderList : public SetupItem
                             const bool onTheFly = false,
                             const bool mainConfig = true);
 
+        A_DELETE_COPY(SetupItemSliderList);
+
         ~SetupItemSliderList();
 
         void createControls();
@@ -422,6 +440,8 @@ class SetupItemSound final : public SetupItemSliderList
                        const int width = 150, const bool onTheFly = false,
                        const bool mainConfig = true);
 
+        A_DELETE_COPY(SetupItemSound);
+
         void action(const gcn::ActionEvent &event) override;
 
         void addMoreControls() override;
diff --git a/src/gui/widgets/setuptab.h b/src/gui/widgets/setuptab.h
index e47af8995..8d8715559 100644
--- a/src/gui/widgets/setuptab.h
+++ b/src/gui/widgets/setuptab.h
@@ -34,34 +34,36 @@
  */
 class SetupTab : public Container, public gcn::ActionListener
 {
-public:
-    SetupTab();
+    public:
+        SetupTab();
 
-    const std::string &getName() const
-    { return mName; }
+        A_DELETE_COPY(SetupTab);
 
-    /**
-     * Called when the Apply button is pressed in the setup window.
-     */
-    virtual void apply() = 0;
+        const std::string &getName() const
+        { return mName; }
 
-    /**
-     * Called when the Cancel button is pressed in the setup window.
-     */
-    virtual void cancel() = 0;
+        /**
+         * Called when the Apply button is pressed in the setup window.
+         */
+        virtual void apply() = 0;
 
-    virtual void externalUpdated();
+        /**
+         * Called when the Cancel button is pressed in the setup window.
+         */
+        virtual void cancel() = 0;
 
-protected:
-    /**
-     * Sets the name displayed on the tab. Should be set in the
-     * constructor of a subclass.
-     */
-    void setName(const std::string &name)
-    { mName = name; }
+        virtual void externalUpdated();
 
-private:
-    std::string mName;
+    protected:
+        /**
+         * Sets the name displayed on the tab. Should be set in the
+         * constructor of a subclass.
+         */
+        void setName(const std::string &name)
+        { mName = name; }
+
+    private:
+        std::string mName;
 };
 
 #endif
diff --git a/src/gui/widgets/setuptabscroll.h b/src/gui/widgets/setuptabscroll.h
index 947ca2b26..edc324306 100644
--- a/src/gui/widgets/setuptabscroll.h
+++ b/src/gui/widgets/setuptabscroll.h
@@ -37,6 +37,8 @@ class SetupTabScroll : public SetupTab
     public:
         SetupTabScroll();
 
+        A_DELETE_COPY(SetupTabScroll);
+
         ~SetupTabScroll();
 
         void addControl(SetupItem *const widget);
diff --git a/src/gui/widgets/shopitems.h b/src/gui/widgets/shopitems.h
index 840be4267..dc0b5cbf1 100644
--- a/src/gui/widgets/shopitems.h
+++ b/src/gui/widgets/shopitems.h
@@ -52,6 +52,8 @@ class ShopItems final : public gcn::ListModel
          */
         ShopItems(const bool mergeDuplicates = false);
 
+        A_DELETE_COPY(ShopItems);
+
         ~ShopItems();
 
         /**
diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h
index 906c6b3d3..87885064e 100644
--- a/src/gui/widgets/shoplistbox.h
+++ b/src/gui/widgets/shoplistbox.h
@@ -49,6 +49,8 @@ class ShopListBox final : public ListBox
         ShopListBox(gcn::ListModel *const listModel,
                     ShopItems *const shopListModel);
 
+        A_DELETE_COPY(ShopListBox);
+
         /**
          * Draws the list box.
          */
diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h
index 2551bdb17..02d22a283 100644
--- a/src/gui/widgets/shortcutcontainer.h
+++ b/src/gui/widgets/shortcutcontainer.h
@@ -46,6 +46,8 @@ class ShortcutContainer : public gcn::Widget,
          */
         ShortcutContainer();
 
+        A_DELETE_COPY(ShortcutContainer);
+
         /**
          * Destructor.
          */
diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h
index 3d304ad3a..6fdce1f94 100644
--- a/src/gui/widgets/slider.h
+++ b/src/gui/widgets/slider.h
@@ -46,6 +46,8 @@ class Slider final : public gcn::Slider
          */
         Slider(const double scaleStart, const double scaleEnd);
 
+        A_DELETE_COPY(Slider);
+
         /**
          * Destructor.
          */
diff --git a/src/gui/widgets/sliderlist.h b/src/gui/widgets/sliderlist.h
index f310ea27a..349ac5b86 100644
--- a/src/gui/widgets/sliderlist.h
+++ b/src/gui/widgets/sliderlist.h
@@ -41,6 +41,8 @@ class SliderList final : public Container,
                    gcn::ActionListener *const listener = nullptr,
                    std::string eventId = "");
 
+        A_DELETE_COPY(SliderList);
+
         ~SliderList();
 
         void updateAlpha();
diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h
index 09c60624a..f18d76c21 100644
--- a/src/gui/widgets/spellshortcutcontainer.h
+++ b/src/gui/widgets/spellshortcutcontainer.h
@@ -44,6 +44,8 @@ class SpellShortcutContainer final : public ShortcutContainer
          */
         SpellShortcutContainer(const unsigned number);
 
+        A_DELETE_COPY(SpellShortcutContainer);
+
         /**
          * Destructor.
          */
diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h
index 6519d5847..28ae9f392 100644
--- a/src/gui/widgets/tab.h
+++ b/src/gui/widgets/tab.h
@@ -39,6 +39,9 @@ class Tab : public gcn::Tab, public gcn::WidgetListener
 {
     public:
         Tab();
+
+        A_DELETE_COPY(Tab);
+
         ~Tab();
 
         /**
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 65eb09447..9edf46748 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -45,6 +45,8 @@ class TabbedArea final : public gcn::TabbedArea, public gcn::WidgetListener
          */
         TabbedArea();
 
+        A_DELETE_COPY(TabbedArea);
+
         ~TabbedArea();
 
         /**
diff --git a/src/gui/widgets/tablemodel.h b/src/gui/widgets/tablemodel.h
index 6af6d2425..ecc922dc7 100644
--- a/src/gui/widgets/tablemodel.h
+++ b/src/gui/widgets/tablemodel.h
@@ -110,6 +110,8 @@ class StaticTableModel final : public TableModel
 public:
     StaticTableModel(const int width, const int height);
 
+    A_DELETE_COPY(StaticTableModel);
+
     virtual ~StaticTableModel();
 
     /**
diff --git a/src/gui/widgets/tabstrip.h b/src/gui/widgets/tabstrip.h
index efdeda657..4b297a016 100644
--- a/src/gui/widgets/tabstrip.h
+++ b/src/gui/widgets/tabstrip.h
@@ -34,6 +34,8 @@ class TabStrip final : public WidgetGroup
 
         TabStrip(const int height, const int spacing = 0);
 
+        A_DELETE_COPY(TabStrip);
+
         gcn::Widget *createWidget(const std::string &name) override;
 
         void action(const gcn::ActionEvent &event) override;
diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h
index 36362e011..eea1a400c 100644
--- a/src/gui/widgets/textbox.h
+++ b/src/gui/widgets/textbox.h
@@ -40,6 +40,8 @@ class TextBox final : public gcn::TextBox
          */
         TextBox();
 
+        A_DELETE_COPY(TextBox);
+
         /**
          * Sets the text after wrapping it to the current width of the widget.
          */
diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h
index 97048ccba..205cb3fe3 100644
--- a/src/gui/widgets/textfield.h
+++ b/src/gui/widgets/textfield.h
@@ -47,6 +47,8 @@ class TextField : public gcn::TextField
                   std::string eventId = "",
                   const bool sendAlwaysEvents = false);
 
+        A_DELETE_COPY(TextField);
+
         ~TextField();
 
         /**
diff --git a/src/gui/widgets/textpreview.h b/src/gui/widgets/textpreview.h
index 0c127cba0..3b4d6dd65 100644
--- a/src/gui/widgets/textpreview.h
+++ b/src/gui/widgets/textpreview.h
@@ -35,6 +35,8 @@ class TextPreview final : public gcn::Widget
     public:
         TextPreview(const std::string &text);
 
+        A_DELETE_COPY(TextPreview);
+
         /**
          * Sets the color the text is printed in.
          *
diff --git a/src/gui/widgets/tradetab.h b/src/gui/widgets/tradetab.h
index 55e6550cb..1609fe997 100644
--- a/src/gui/widgets/tradetab.h
+++ b/src/gui/widgets/tradetab.h
@@ -33,6 +33,8 @@ class TradeTab final : public ChatTab
     public:
         TradeTab();
 
+        A_DELETE_COPY(TradeTab);
+
         ~TradeTab();
 
         int getType() const override
diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h
index e8c1da82f..8d758288a 100644
--- a/src/gui/widgets/vertcontainer.h
+++ b/src/gui/widgets/vertcontainer.h
@@ -39,6 +39,8 @@ class VertContainer final : public Container, public gcn::WidgetListener
         VertContainer(const int verticalItemSize, const bool resizable = true,
                       const int leftSpacing = 0);
 
+        A_DELETE_COPY(VertContainer);
+
         virtual void add2(gcn::Widget *const widget, const bool resizable,
                           const int spacing = -1);
 
diff --git a/src/gui/widgets/whispertab.h b/src/gui/widgets/whispertab.h
index 502d20efe..05def5818 100644
--- a/src/gui/widgets/whispertab.h
+++ b/src/gui/widgets/whispertab.h
@@ -33,6 +33,8 @@ class Channel;
 class WhisperTab final : public ChatTab
 {
     public:
+        A_DELETE_COPY(WhisperTab);
+
         const std::string &getNick() const
         { return mNick; }
 
diff --git a/src/gui/widgets/widgetgroup.h b/src/gui/widgets/widgetgroup.h
index 27d1a7357..10b145435 100644
--- a/src/gui/widgets/widgetgroup.h
+++ b/src/gui/widgets/widgetgroup.h
@@ -34,6 +34,8 @@ class WidgetGroup : public Container,
         WidgetGroup(const std::string &group, const int height,
                     const int spacing);
 
+        A_DELETE_COPY(WidgetGroup);
+
         virtual void addButton(std::string tag);
 
         virtual void addButton(std::string text, std::string tag);
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index 6739b5186..f97662534 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -61,6 +61,8 @@ class Window : public gcn::Window, private gcn::WidgetListener
         Window(const std::string &caption = "Window", const bool modal = false,
                Window *const parent = nullptr, std::string skin = "");
 
+        A_DELETE_COPY(Window);
+
         /**
          * Destructor. Deletes all the added widgets.
          */
-- 
cgit v1.2.3-70-g09d2