diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/FbTk/EventManager.hh | 3 | ||||
-rw-r--r-- | src/FbTk/Font.hh | 1 | ||||
-rw-r--r-- | src/FbTk/ImageControl.hh | 1 | ||||
-rw-r--r-- | src/FbTk/Menu.hh | 3 | ||||
-rw-r--r-- | src/RootTheme.cc | 1 | ||||
-rw-r--r-- | src/RootTheme.hh | 1 |
6 files changed, 1 insertions, 9 deletions
diff --git a/src/FbTk/EventManager.hh b/src/FbTk/EventManager.hh index 6c9d419..067c923 100644 --- a/src/FbTk/EventManager.hh +++ b/src/FbTk/EventManager.hh | |||
@@ -58,14 +58,13 @@ public: | |||
58 | void unregisterEventHandler(Window win); | 58 | void unregisterEventHandler(Window win); |
59 | 59 | ||
60 | private: | 60 | private: |
61 | EventManager(): m_grabbing_keyboard(0) { } | 61 | EventManager() { } |
62 | ~EventManager(); | 62 | ~EventManager(); |
63 | void dispatch(Window win, XEvent &event, bool parent = false); | 63 | void dispatch(Window win, XEvent &event, bool parent = false); |
64 | 64 | ||
65 | typedef std::map<Window, EventHandler *> EventHandlerMap; | 65 | typedef std::map<Window, EventHandler *> EventHandlerMap; |
66 | EventHandlerMap m_eventhandlers; | 66 | EventHandlerMap m_eventhandlers; |
67 | EventHandlerMap m_parent; | 67 | EventHandlerMap m_parent; |
68 | EventHandler *m_grabbing_keyboard; | ||
69 | }; | 68 | }; |
70 | 69 | ||
71 | } //end namespace FbTk | 70 | } //end namespace FbTk |
diff --git a/src/FbTk/Font.hh b/src/FbTk/Font.hh index 8a0f05d..dfbdcd0 100644 --- a/src/FbTk/Font.hh +++ b/src/FbTk/Font.hh | |||
@@ -115,7 +115,6 @@ private: | |||
115 | FbTk::FontImp* m_fontimp; ///< font implementation | 115 | FbTk::FontImp* m_fontimp; ///< font implementation |
116 | std::string m_fontstr; ///< font name | 116 | std::string m_fontstr; ///< font name |
117 | 117 | ||
118 | int m_angle; ///< rotation angle | ||
119 | bool m_shadow; ///< shadow text | 118 | bool m_shadow; ///< shadow text |
120 | Color m_shadow_color; ///< shadow color | 119 | Color m_shadow_color; ///< shadow color |
121 | int m_shadow_offx; ///< offset y for shadow | 120 | int m_shadow_offx; ///< offset y for shadow |
diff --git a/src/FbTk/ImageControl.hh b/src/FbTk/ImageControl.hh index 747525b..39589f8 100644 --- a/src/FbTk/ImageControl.hh +++ b/src/FbTk/ImageControl.hh | |||
@@ -82,7 +82,6 @@ private: | |||
82 | Pixmap searchCache(unsigned int width, unsigned int height, const Texture &text, Orientation orient) const; | 82 | Pixmap searchCache(unsigned int width, unsigned int height, const Texture &text, Orientation orient) const; |
83 | 83 | ||
84 | void createColorTable(); | 84 | void createColorTable(); |
85 | bool m_dither; | ||
86 | Timer m_timer; | 85 | Timer m_timer; |
87 | 86 | ||
88 | Colormap m_colormap; | 87 | Colormap m_colormap; |
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh index bd830b4..5e1d98c 100644 --- a/src/FbTk/Menu.hh +++ b/src/FbTk/Menu.hh | |||
@@ -235,8 +235,6 @@ private: | |||
235 | 235 | ||
236 | int m_x_move; | 236 | int m_x_move; |
237 | int m_y_move; | 237 | int m_y_move; |
238 | int m_grab_x; | ||
239 | int m_grab_y; | ||
240 | 238 | ||
241 | // the menuitems are rendered in a grid with | 239 | // the menuitems are rendered in a grid with |
242 | // 'm_columns' (a minimum of 'm_min_columns') and | 240 | // 'm_columns' (a minimum of 'm_min_columns') and |
@@ -252,7 +250,6 @@ private: | |||
252 | // the corners | 250 | // the corners |
253 | std::auto_ptr<FbTk::Shape> m_shape; | 251 | std::auto_ptr<FbTk::Shape> m_shape; |
254 | 252 | ||
255 | Drawable m_root_pm; | ||
256 | static Menu *shown; ///< used for determining if there's a menu open at all | 253 | static Menu *shown; ///< used for determining if there's a menu open at all |
257 | static Menu *s_focused; ///< holds current input focused menu, so one can determine if a menu is focused | 254 | static Menu *s_focused; ///< holds current input focused menu, so one can determine if a menu is focused |
258 | bool m_need_update; | 255 | bool m_need_update; |
diff --git a/src/RootTheme.cc b/src/RootTheme.cc index a2aa4a8..46fe303 100644 --- a/src/RootTheme.cc +++ b/src/RootTheme.cc | |||
@@ -152,7 +152,6 @@ RootTheme::RootTheme(FbTk::ImageControl &image_control): | |||
152 | FbTk::Theme(image_control.screenNumber()), | 152 | FbTk::Theme(image_control.screenNumber()), |
153 | m_background(new BackgroundItem(*this, "background", "Background")), | 153 | m_background(new BackgroundItem(*this, "background", "Background")), |
154 | m_opgc(RootWindow(FbTk::App::instance()->display(), image_control.screenNumber())), | 154 | m_opgc(RootWindow(FbTk::App::instance()->display(), image_control.screenNumber())), |
155 | m_image_ctrl(image_control), | ||
156 | m_first(true) { | 155 | m_first(true) { |
157 | 156 | ||
158 | Display *disp = FbTk::App::instance()->display(); | 157 | Display *disp = FbTk::App::instance()->display(); |
diff --git a/src/RootTheme.hh b/src/RootTheme.hh index f39c264..f9b053d 100644 --- a/src/RootTheme.hh +++ b/src/RootTheme.hh | |||
@@ -56,7 +56,6 @@ public: | |||
56 | private: | 56 | private: |
57 | BackgroundItem *m_background;///< background image/texture | 57 | BackgroundItem *m_background;///< background image/texture |
58 | FbTk::GContext m_opgc; | 58 | FbTk::GContext m_opgc; |
59 | FbTk::ImageControl &m_image_ctrl; ///< image control for rendering background texture | ||
60 | bool m_first; | 59 | bool m_first; |
61 | }; | 60 | }; |
62 | 61 | ||