[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src/widgets scrollbar.cpp textbox.cpp w...
From: |
Isaac Clerencia |
Subject: |
[Wesnoth-cvs-commits] wesnoth/src/widgets scrollbar.cpp textbox.cpp w... |
Date: |
Thu, 26 Aug 2004 07:58:25 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Isaac Clerencia <address@hidden> 04/08/26 11:53:53
Modified files:
src/widgets : scrollbar.cpp textbox.cpp widget.cpp
Log message:
Applied silene's patch to get rid of some warnings in src/widgets/,
#patch 3312 (second file)
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/scrollbar.cpp.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/textbox.cpp.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/widget.cpp.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
Patches:
Index: wesnoth/src/widgets/scrollbar.cpp
diff -u wesnoth/src/widgets/scrollbar.cpp:1.14
wesnoth/src/widgets/scrollbar.cpp:1.15
--- wesnoth/src/widgets/scrollbar.cpp:1.14 Tue Aug 24 01:12:03 2004
+++ wesnoth/src/widgets/scrollbar.cpp Thu Aug 26 11:53:53 2004
@@ -1,4 +1,4 @@
-/* $Id: scrollbar.cpp,v 1.14 2004/08/24 01:12:03 Sirp Exp $*/
+/* $Id: scrollbar.cpp,v 1.15 2004/08/26 11:53:53 isaaccp Exp $*/
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -37,10 +37,11 @@
namespace gui {
scrollbar::scrollbar(display& d, scrollable* callback)
- : mid_scaled_(NULL), groove_scaled_(NULL),
- widget(d), callback_(callback), highlight_(false), clicked_(false),
dragging_(false),
- grip_position_(0), grip_height_(0), enabled_(false), width_(0),
- minimum_grip_height_(0), groove_click_code_(0)
+ : widget(d), mid_scaled_(NULL), groove_scaled_(NULL),
+ callback_(callback), minimum_grip_height_(0), width_(0),
+ highlight_(false), clicked_(false), dragging_(false),
+ grip_position_(0), grip_height_(0), enabled_(false),
+ groove_click_code_(0)
{
static const surface img(image::get_image(scrollbar_mid,
image::UNSCALED));
Index: wesnoth/src/widgets/textbox.cpp
diff -u wesnoth/src/widgets/textbox.cpp:1.53
wesnoth/src/widgets/textbox.cpp:1.54
--- wesnoth/src/widgets/textbox.cpp:1.53 Sun Jul 18 19:02:25 2004
+++ wesnoth/src/widgets/textbox.cpp Thu Aug 26 11:53:53 2004
@@ -1,4 +1,4 @@
-/* $Id: textbox.cpp,v 1.53 2004/07/18 19:02:25 gruikya Exp $ */
+/* $Id: textbox.cpp,v 1.54 2004/08/26 11:53:53 isaaccp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -28,9 +28,9 @@
const int font_size = 16;
textbox::textbox(display& d, int width, const std::string& text, bool
editable, size_t max_size)
- : widget(d), text_(string_to_wstring(text)), text_pos_(0),
+ : widget(d), max_size_(max_size), text_(string_to_wstring(text)),
cursor_(text_.size()), selstart_(-1), selend_(-1),
- grabmouse_(false), editable_(editable), max_size_(max_size),
+ grabmouse_(false), text_pos_(0), editable_(editable),
show_cursor_(true), show_cursor_at_(0), text_image_(NULL),
scrollbar_(d,this),
uparrow_(d,"",gui::button::TYPE_PRESS,"uparrow-button"),
Index: wesnoth/src/widgets/widget.cpp
diff -u wesnoth/src/widgets/widget.cpp:1.17 wesnoth/src/widgets/widget.cpp:1.18
--- wesnoth/src/widgets/widget.cpp:1.17 Wed Jun 23 23:43:38 2004
+++ wesnoth/src/widgets/widget.cpp Thu Aug 26 11:53:53 2004
@@ -8,8 +8,9 @@
namespace gui {
widget::widget(const widget &o) :
- disp_(o.disp_), rect_(o.rect_), focus_(o.focus_), dirty_(o.dirty_),
needs_restore_(o.needs_restore_), hidden_(false), volatile_(o.volatile_),
- help_string_(o.help_string_), help_text_(o.help_text_)
+ events::handler(), disp_(o.disp_), rect_(o.rect_), focus_(o.focus_),
dirty_(o.dirty_),
+ needs_restore_(o.needs_restore_), hidden_(false),
volatile_(o.volatile_),
+ help_text_(o.help_text_), help_string_(o.help_string_)
{
bg_backup();
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/src/widgets scrollbar.cpp textbox.cpp w...,
Isaac Clerencia <=