Merge branch 'master' into strippedstripped1.1.9.18

Conflicts:
	src/guichan/cliprectangle.cpp
	src/guichan/focushandler.cpp
	src/guichan/gui.cpp
	src/guichan/include/guichan/cliprectangle.hpp
	src/guichan/include/guichan/inputevent.hpp
	src/guichan/include/guichan/keyevent.hpp
	src/guichan/include/guichan/mouseevent.hpp
	src/guichan/include/guichan/widgets/button.hpp
	src/guichan/include/guichan/widgets/checkbox.hpp
	src/guichan/include/guichan/widgets/dropdown.hpp
	src/guichan/include/guichan/widgets/radiobutton.hpp
	src/guichan/include/guichan/widgets/slider.hpp
	src/guichan/include/guichan/widgets/tab.hpp
	src/guichan/include/guichan/widgets/tabbedarea.hpp
	src/guichan/include/guichan/widgets/textfield.hpp
	src/guichan/include/guichan/widgets/window.hpp
	src/guichan/inputevent.cpp
	src/guichan/keyevent.cpp
	src/guichan/mouseevent.cpp
	src/guichan/widget.cpp
	src/guichan/widgets/button.cpp
	src/guichan/widgets/checkbox.cpp
	src/guichan/widgets/dropdown.cpp
	src/guichan/widgets/radiobutton.cpp
	src/guichan/widgets/slider.cpp
	src/guichan/widgets/tab.cpp
	src/guichan/widgets/tabbedarea.cpp
	src/guichan/widgets/textfield.cpp
	src/guichan/widgets/window.cpp

1 files changed, 8 insertions, 2 deletions

diff --git a/src/gui/theme.h b/src/gui/theme.h
index fbc6f13da..92b2c8878 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -43,8 +43,8 @@ class Skin
 {
     public:
         Skin(ImageRect skin, Image *close, Image *stickyUp, Image *stickyDown,
-             const std::string &filePath,
-             const std::string &name = "");
+             const std::string &filePath, const std::string &name = "",
+             int padding = 3);
 
         ~Skin();
 
@@ -95,6 +95,9 @@ class Skin
          */
         void updateAlpha(float minimumOpacityAllowed = 0.0f);
 
+        int getPadding()
+        { return mPadding; }
+
         int instances;
 
     private:
@@ -104,6 +107,7 @@ class Skin
         Image *mCloseImage;        /**< Close Button Image */
         Image *mStickyImageUp;     /**< Sticky Button Image */
         Image *mStickyImageDown;   /**< Sticky Button Image */
+        int mPadding;
 };
 
 class Theme : public Palette, public ConfigListener
@@ -238,6 +242,8 @@ class Theme : public Palette, public ConfigListener
         Skin *load(const std::string &filename,
                    const std::string &defaultPath = getThemePath());
 
+        void unload(Skin *skin);
+
         /**
          * Updates the alpha values of all of the skins.
          */