merged with embedded-tab-branch

1 files changed, 10 insertions, 5 deletions

diff --git a/src/FbWinFrame.hh b/src/FbWinFrame.hh
index 841ad40..e6bd585 100644
--- a/src/FbWinFrame.hh
+++ b/src/FbWinFrame.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: FbWinFrame.hh,v 1.4 2003/02/15 01:54:18 fluxgen Exp $
+// $Id: FbWinFrame.hh,v 1.5 2003/04/14 14:38:21 fluxgen Exp $
 
 #ifndef FBWINFRAME_HH
 #define FBWINFRAME_HH
@@ -85,10 +85,15 @@ public:
     void addRightButton(FbTk::Button *btn);
     /// remove all buttons from titlebar
     void removeAllButtons();
+    /// adds a button to label window
+    void addLabelButton(FbTk::Button &btn);
+    /// removes a specific button from label window
+    void removeLabelButton(FbTk::Button &btn);
+
     /// attach a client window for client area
     void setClientWindow(Window win);
-    /// same as above but with FbWindow, NOT IMPLEMENTED!
-    void setClientWindow(FbTk::FbWindow win);
+    /// same as above but with FbWindow
+    void setClientWindow(FbTk::FbWindow &win);
     /// remove attached client window
     void removeClient();
     /// redirect events to another eventhandler
@@ -143,6 +148,7 @@ public:
     inline FbTk::FbWindow &gripRight() { return m_grip_right; }
     inline bool focused() const { return m_focused; }
     inline bool isShaded() const { return m_shaded; }
+    inline const FbWinFrameTheme &theme() const { return m_theme; }
     /// @return titlebar height
     unsigned int titleHeight() const;
     /// @return size of button
@@ -186,12 +192,11 @@ private:
         m_grip_left; ///< left grip
     FbTk::FbWindow m_handle; ///< handle between grips
     FbTk::FbWindow m_clientarea; ///< window that holds client window @see setClientWindow
-    Window m_clientwin; ///< client window in clientarea
     //@}
     typedef std::vector<FbTk::Button *> ButtonList;
     ButtonList m_buttons_left, ///< buttons to the left
         m_buttons_right; ///< buttons to the right
-    
+    ButtonList m_labelbuttons; ///< holds buttons inside label window
     std::string m_titletext; ///< text to be displayed int m_label
     int m_bevel;  ///< bevel between titlebar items and titlebar
     bool m_use_titlebar; ///< if we should use titlebar