Merged trunk development between revisions 2530 and 2618 to the 0.1.0 branch.

1 files changed, 21 insertions, 0 deletions

diff --git a/src/gui/window.cpp b/src/gui/window.cpp
index 9a07111f..2172baa8 100644
--- a/src/gui/window.cpp
+++ b/src/gui/window.cpp
@@ -63,6 +63,7 @@ Window::Window(const std::string& caption, bool modal, Window *parent):
     mModal(modal),
     mResizable(false),
     mMouseResize(false),
+    mSticky(false),
     mMinWinWidth(100),
     mMinWinHeight(28),
     mMaxWinWidth(INT_MAX),
@@ -243,6 +244,26 @@ bool Window::isResizable()
     return mResizable;
 }
 
+void Window::setSticky(bool sticky)
+{
+    mSticky = sticky;
+}
+
+bool Window::isSticky() {
+    return mSticky;
+}
+
+void Window::setVisible(bool visible) {
+    if(isSticky()) 
+    {
+        gcn::Window::setVisible(true);
+    } 
+    else 
+    {
+        gcn::Window::setVisible(visible);
+    }
+}
+
 void Window::scheduleDelete()
 {
     windowContainer->scheduleDelete(this);