aboutsummaryrefslogtreecommitdiff
path: root/src/Window.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/Window.hh')
-rw-r--r--src/Window.hh12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/Window.hh b/src/Window.hh
index 06e482b..73612d9 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.14 2002/03/23 15:14:45 fluxgen Exp $ 25// $Id: Window.hh,v 1.15 2002/04/03 23:01:04 fluxgen Exp $
26 26
27#ifndef WINDOW_HH 27#ifndef WINDOW_HH
28#define WINDOW_HH 28#define WINDOW_HH
@@ -146,8 +146,8 @@ public:
146 146
147 inline Windowmenu *getWindowmenu(void) { return windowmenu; } 147 inline Windowmenu *getWindowmenu(void) { return windowmenu; }
148 148
149 inline const char *getTitle(void) const { return client.title; } 149 inline const std::string &getTitle(void) const { return client.title; }
150 inline const char *getIconTitle(void) const { return client.icon_title; } 150 inline const std::string &getIconTitle(void) const { return client.icon_title; }
151 inline const int getXFrame(void) const { return frame.x; } 151 inline const int getXFrame(void) const { return frame.x; }
152 inline const int getYFrame(void) const { return frame.y; } 152 inline const int getYFrame(void) const { return frame.y; }
153 inline const int getXClient(void) const { return client.x; } 153 inline const int getXClient(void) const { return client.x; }
@@ -237,8 +237,8 @@ private:
237 *transient; // which window is our transient? 237 *transient; // which window is our transient?
238 Window window, window_group; 238 Window window, window_group;
239 239
240 char *title, *icon_title; 240 std::string title, icon_title;
241 int x, y, old_bw, title_len; 241 int x, y, old_bw;
242 unsigned int width, height, title_text_w, 242 unsigned int width, height, title_text_w,
243 min_width, min_height, max_width, max_height, width_inc, height_inc, 243 min_width, min_height, max_width, max_height, width_inc, height_inc,
244 min_aspect_x, min_aspect_y, max_aspect_x, max_aspect_y, 244 min_aspect_x, min_aspect_y, max_aspect_x, max_aspect_y,
@@ -384,8 +384,6 @@ protected:
384 void downsize(void); 384 void downsize(void);
385 void right_fixsize(int * = 0, int * = 0); 385 void right_fixsize(int * = 0, int * = 0);
386 void left_fixsize(int * = 0, int * = 0); 386 void left_fixsize(int * = 0, int * = 0);
387
388
389}; 387};
390 388
391 389