diff options
Diffstat (limited to 'src/Window.hh')
-rw-r--r-- | src/Window.hh | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/Window.hh b/src/Window.hh index 700bd10..e7d2270 100644 --- a/src/Window.hh +++ b/src/Window.hh | |||
@@ -47,13 +47,13 @@ class FbWinFrameTheme; | |||
47 | class BScreen; | 47 | class BScreen; |
48 | class FbWinFrame; | 48 | class FbWinFrame; |
49 | class FocusControl; | 49 | class FocusControl; |
50 | class FbMenu; | ||
50 | 51 | ||
51 | namespace FbTk { | 52 | namespace FbTk { |
52 | class TextButton; | 53 | class TextButton; |
53 | class MenuTheme; | 54 | class MenuTheme; |
54 | class ImageControl; | 55 | class ImageControl; |
55 | class XLayer; | 56 | class XLayer; |
56 | class Menu; | ||
57 | } | 57 | } |
58 | 58 | ||
59 | /// Creates the window frame and handles any window event for it | 59 | /// Creates the window frame and handles any window event for it |
@@ -96,7 +96,7 @@ public: | |||
96 | ATTRIB_WORKSPACE = 0x10, ///< workspace | 96 | ATTRIB_WORKSPACE = 0x10, ///< workspace |
97 | ATTRIB_STACK = 0x20, ///< stack | 97 | ATTRIB_STACK = 0x20, ///< stack |
98 | ATTRIB_DECORATION = 0x40, ///< decorations | 98 | ATTRIB_DECORATION = 0x40, ///< decorations |
99 | ATTRIB_HIDDEN = 0x80, ///< hidden | 99 | ATTRIB_HIDDEN = 0x80 ///< hidden |
100 | }; | 100 | }; |
101 | 101 | ||
102 | /** | 102 | /** |
@@ -323,6 +323,12 @@ public: | |||
323 | * @param my position | 323 | * @param my position |
324 | */ | 324 | */ |
325 | void showMenu(int mx, int my); | 325 | void showMenu(int mx, int my); |
326 | |||
327 | /** popup window menu at specific location | ||
328 | * @param x | ||
329 | * @param y | ||
330 | */ | ||
331 | void popupMenu(int x, int y); | ||
326 | // popup menu on last button press position | 332 | // popup menu on last button press position |
327 | void popupMenu(); | 333 | void popupMenu(); |
328 | 334 | ||
@@ -351,7 +357,7 @@ public: | |||
351 | /// handle Subject notifications | 357 | /// handle Subject notifications |
352 | void update(FbTk::Subject *subj); | 358 | void update(FbTk::Subject *subj); |
353 | 359 | ||
354 | void applyDecorations(bool initial = false); | 360 | void applyDecorations(); |
355 | void toggleDecoration(); | 361 | void toggleDecoration(); |
356 | 362 | ||
357 | unsigned int decorationMask() const; | 363 | unsigned int decorationMask() const; |
@@ -433,8 +439,8 @@ public: | |||
433 | FbTk::FbWindow &fbWindow(); | 439 | FbTk::FbWindow &fbWindow(); |
434 | const FbTk::FbWindow &fbWindow() const; | 440 | const FbTk::FbWindow &fbWindow() const; |
435 | 441 | ||
436 | FbTk::Menu &menu(); | 442 | FbMenu &menu(); |
437 | const FbTk::Menu &menu() const; | 443 | const FbMenu &menu() const; |
438 | 444 | ||
439 | const FbTk::FbWindow &parent() const { return m_parent; } | 445 | const FbTk::FbWindow &parent() const { return m_parent; } |
440 | FbTk::FbWindow &parent() { return m_parent; } | 446 | FbTk::FbWindow &parent() { return m_parent; } |