aboutsummaryrefslogtreecommitdiff
path: root/src/Window.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-10-19 10:56:30 (GMT)
committerfluxgen <fluxgen>2002-10-19 10:56:30 (GMT)
commit5b62ce19cb80e01bb04e0c3de80f94a600386118 (patch)
treebff4778ecc9b5927a9310bca053c8ace90157cc7 /src/Window.hh
parent834576a531616f6f39ad0b9d6937492916395044 (diff)
downloadfluxbox_pavel-5b62ce19cb80e01bb04e0c3de80f94a600386118.zip
fluxbox_pavel-5b62ce19cb80e01bb04e0c3de80f94a600386118.tar.bz2
auto_ptr for windowmenu
Diffstat (limited to 'src/Window.hh')
-rw-r--r--src/Window.hh10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Window.hh b/src/Window.hh
index 2edb294..68281f8 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -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: Window.hh,v 1.33 2002/10/11 10:18:43 fluxgen Exp $ 25// $Id: Window.hh,v 1.34 2002/10/19 10:53:10 fluxgen Exp $
26 26
27#ifndef WINDOW_HH 27#ifndef WINDOW_HH
28#define WINDOW_HH 28#define WINDOW_HH
@@ -41,6 +41,7 @@
41 41
42#include <vector> 42#include <vector>
43#include <string> 43#include <string>
44#include <memory>
44 45
45#define PropMwmHintsElements 3 46#define PropMwmHintsElements 3
46 47
@@ -123,8 +124,9 @@ public:
123 const Window &getFrameWindow() const { return frame.window; } 124 const Window &getFrameWindow() const { return frame.window; }
124 const Window &getClientWindow() const { return client.window; } 125 const Window &getClientWindow() const { return client.window; }
125 126
126 Windowmenu *getWindowmenu() { return windowmenu; } 127 Windowmenu *getWindowmenu() { return m_windowmenu.get(); }
127 128 const Windowmenu *getWindowmenu() const { return m_windowmenu.get(); }
129
128 const std::string &getTitle() const { return client.title; } 130 const std::string &getTitle() const { return client.title; }
129 const std::string &getIconTitle() const { return client.icon_title; } 131 const std::string &getIconTitle() const { return client.icon_title; }
130 int getXFrame() const { return frame.x; } 132 int getXFrame() const { return frame.x; }
@@ -245,7 +247,7 @@ private:
245 BaseDisplay::BlackboxAttributes blackbox_attrib; 247 BaseDisplay::BlackboxAttributes blackbox_attrib;
246 248
247 Time lastButtonPressTime; 249 Time lastButtonPressTime;
248 Windowmenu *windowmenu; 250 std::auto_ptr<Windowmenu> m_windowmenu;
249 251
250 timeval lastFocusTime; 252 timeval lastFocusTime;
251 253