summaryrefslogtreecommitdiff
path: root/src/gui/theme.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-10 00:16:37 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-10 00:16:37 +0300
commite066ec2e038405621a7de50e4cd735e548eb488d (patch)
tree626e7ddacf867949a5380bfe528a332dffada5a4 /src/gui/theme.h
parent6d7af74bab17c03f1604e8351d397695286414ed (diff)
downloadmanaverse-e066ec2e038405621a7de50e4cd735e548eb488d.tar.gz
manaverse-e066ec2e038405621a7de50e4cd735e548eb488d.tar.bz2
manaverse-e066ec2e038405621a7de50e4cd735e548eb488d.tar.xz
manaverse-e066ec2e038405621a7de50e4cd735e548eb488d.zip
Delete copy constructor in some classes.
Diffstat (limited to 'src/gui/theme.h')
-rw-r--r--src/gui/theme.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/gui/theme.h b/src/gui/theme.h
index ee9352794..cbda2ee4d 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -42,11 +42,13 @@ class ProgressBar;
class Skin final
{
public:
- Skin(const ImageRect &skin, const ImageRect &images,
+ Skin(ImageRect *skin, const ImageRect *images,
const std::string &filePath, const std::string &name = "",
const int padding = 3, const int titlePadding = 4,
std::map<std::string, int> *const options = nullptr);
+ A_DELETE_COPY(Skin);
+
~Skin();
/**
@@ -67,7 +69,7 @@ class Skin final
* Returns the background skin.
*/
const ImageRect &getBorder() const
- { return mBorder; }
+ { return *mBorder; }
/**
* Returns the image used by a close button for this skin.
@@ -115,7 +117,7 @@ class Skin final
private:
std::string mFilePath; /**< File name path for the skin */
std::string mName; /**< Name of the skin to use */
- ImageRect mBorder; /**< The window border and background */
+ ImageRect *mBorder; /**< The window border and background */
Image *mCloseImage; /**< Close Button Image */
Image *mCloseImageHighlighted; /**< Highlighted close Button Image */
Image *mStickyImageUp; /**< Sticky Button Image */
@@ -128,6 +130,8 @@ class Skin final
class Theme final : public Palette, public ConfigListener
{
public:
+ A_DELETE_COPY(Theme);
+
static Theme *instance();
static void deleteInstance();
@@ -330,6 +334,7 @@ class Theme final : public Palette, public ConfigListener
private:
Theme();
+
~Theme();
Skin *readSkin(const std::string &filename0, const bool full);