aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2004-05-02 21:06:27 (GMT)
committerfluxgen <fluxgen>2004-05-02 21:06:27 (GMT)
commit1f88db4fd64fb918ed5b6f0694b8ebb6dedc5f26 (patch)
tree5deeecc5f49b834fd14b20da095ad0916633b7bb
parentd4bfeb646063367a4537954203c92e71d7242a98 (diff)
downloadfluxbox_paul-1f88db4fd64fb918ed5b6f0694b8ebb6dedc5f26.zip
fluxbox_paul-1f88db4fd64fb918ed5b6f0694b8ebb6dedc5f26.tar.bz2
changed m_windowmenu to FbTk Menu ptr instead of FbMenu and we create it via MenuCreator
-rw-r--r--src/Window.hh14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Window.hh b/src/Window.hh
index 68aff79..a8c6a6b 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -22,12 +22,11 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Window.hh,v 1.112 2004/04/18 21:17:36 fluxgen Exp $ 25// $Id: Window.hh,v 1.113 2004/05/02 21:06:27 fluxgen Exp $
26 26
27#ifndef WINDOW_HH 27#ifndef WINDOW_HH
28#define WINDOW_HH 28#define WINDOW_HH
29 29
30#include "FbMenu.hh"
31#include "Timer.hh" 30#include "Timer.hh"
32#include "Subject.hh" 31#include "Subject.hh"
33#include "EventHandler.hh" 32#include "EventHandler.hh"
@@ -52,6 +51,7 @@ class TextButton;
52class MenuTheme; 51class MenuTheme;
53class ImageControl; 52class ImageControl;
54class XLayer; 53class XLayer;
54class Menu;
55} 55}
56 56
57/// Creates the window frame and handles any window event for it 57/// Creates the window frame and handles any window event for it
@@ -152,6 +152,8 @@ public:
152 } BlackboxAttributes; 152 } BlackboxAttributes;
153 153
154 typedef std::list<WinClient *> ClientList; 154 typedef std::list<WinClient *> ClientList;
155 // this should perhaps be a refcount??
156 typedef std::list<std::pair<const char *, FbTk::Menu *> > ExtraMenus;
155 157
156 /// create a window from a client 158 /// create a window from a client
157 FluxboxWindow(WinClient &client, 159 FluxboxWindow(WinClient &client,
@@ -298,11 +300,9 @@ public:
298 FbTk::FbWindow &fbWindow(); 300 FbTk::FbWindow &fbWindow();
299 const FbTk::FbWindow &fbWindow() const; 301 const FbTk::FbWindow &fbWindow() const;
300 302
301 FbTk::Menu &menu() { return m_windowmenu; } 303 FbTk::Menu &menu() { return *m_windowmenu.get(); }
302 const FbTk::Menu &menu() const { return m_windowmenu; } 304 const FbTk::Menu &menu() const { return *m_windowmenu.get(); }
303 305
304 // this should perhaps be a refcount??
305 typedef std::list<std::pair<const char *, FbTk::Menu *> > ExtraMenus;
306 306
307 // for extras to add menus. 307 // for extras to add menus.
308 // These menus will be marked internal, 308 // These menus will be marked internal,
@@ -451,7 +451,7 @@ private:
451 Display *display; /// display connection 451 Display *display; /// display connection
452 BlackboxAttributes m_blackbox_attrib; 452 BlackboxAttributes m_blackbox_attrib;
453 453
454 FbMenu m_windowmenu; 454 std::auto_ptr<FbTk::Menu> m_windowmenu;
455 455
456 timeval m_last_focus_time; 456 timeval m_last_focus_time;
457 457