aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-01-10 00:47:59 (GMT)
committerfluxgen <fluxgen>2003-01-10 00:47:59 (GMT)
commit3328de262c82795baf18507542f77981a4367766 (patch)
treec0de388a265352d485d253da065cddfa700b1688
parent24be5654f416c049fe131b9c62994fc45c0b3718 (diff)
downloadfluxbox_pavel-3328de262c82795baf18507542f77981a4367766.zip
fluxbox_pavel-3328de262c82795baf18507542f77981a4367766.tar.bz2
removed debugmsg and adjusted for FbTk ImageControl
-rw-r--r--src/FbTk/Menu.cc10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 72721a7..451f620 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -22,7 +22,7 @@
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: Menu.cc,v 1.3 2003/01/09 16:45:21 fluxgen Exp $ 25// $Id: Menu.cc,v 1.4 2003/01/10 00:47:59 fluxgen Exp $
26 26
27//use GNU extensions 27//use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -31,7 +31,7 @@
31 31
32#include "Menu.hh" 32#include "Menu.hh"
33 33
34#include "../ImageControl.hh" 34#include "ImageControl.hh"
35#include "MenuTheme.hh" 35#include "MenuTheme.hh"
36#include "App.hh" 36#include "App.hh"
37#include "EventManager.hh" 37#include "EventManager.hh"
@@ -50,7 +50,7 @@ namespace FbTk {
50 50
51static Menu *shown = 0; 51static Menu *shown = 0;
52 52
53Menu::Menu(MenuTheme &tm, int screen_num, BImageControl &imgctrl): 53Menu::Menu(MenuTheme &tm, int screen_num, ImageControl &imgctrl):
54 m_theme(tm), 54 m_theme(tm),
55 m_screen_num(screen_num), 55 m_screen_num(screen_num),
56 m_image_ctrl(imgctrl), 56 m_image_ctrl(imgctrl),
@@ -105,9 +105,7 @@ Menu::Menu(MenuTheme &tm, int screen_num, BImageControl &imgctrl):
105 XSetWindowAttributes attrib; 105 XSetWindowAttributes attrib;
106 attrib.override_redirect = True; 106 attrib.override_redirect = True;
107 attrib.event_mask = ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | KeyPressMask | ExposureMask; 107 attrib.event_mask = ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | KeyPressMask | ExposureMask;
108#ifdef DEBUG 108
109 cerr<<__FILE__<<": Creating menu("<<menu.width<<", "<<menu.height<<")"<<endl;
110#endif // DEBUG
111 //create menu window 109 //create menu window
112 menu.window = XCreateWindow(m_display, RootWindow(m_display, screen_num), 110 menu.window = XCreateWindow(m_display, RootWindow(m_display, screen_num),
113 menu.x, menu.y, menu.width, menu.height, // pos and size 111 menu.x, menu.y, menu.width, menu.height, // pos and size