Author: mordante
Date: Wed Mar 2 22:40:41 2011
New Revision: 48719
URL: http://svn.gna.org/viewcvs/wesnoth?rev=48719&view=rev
Log:
Polishing the code a bit.
Modified:
trunk/src/gui/widgets/control.cpp
trunk/src/gui/widgets/control.hpp
Modified: trunk/src/gui/widgets/control.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/control.cpp?rev=48719&r1=48718&r2=48719&view=diff
==============================================================================
--- trunk/src/gui/widgets/control.cpp (original)
+++ trunk/src/gui/widgets/control.cpp Wed Mar 2 22:40:41 2011
@@ -44,7 +44,7 @@
, tooltip_()
, help_message_()
, canvas_(canvas_count)
- , config_(0)
+ , config_(NULL)
, renderer_()
, text_maximum_width_(0)
, text_alignment_(PANGO_ALIGN_LEFT)
@@ -192,7 +192,7 @@
/**
* @todo The value send should subtract the border size
- * and readd it after calculation to get the proper result.
+ * and read it after calculation to get the proper result.
*/
tpoint result = get_best_text_size(minimum, maximum);
DBG_GUI_L << LOG_HEADER
Modified: trunk/src/gui/widgets/control.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/control.hpp?rev=48719&r1=48718&r2=48719&view=diff
==============================================================================
--- trunk/src/gui/widgets/control.hpp (original)
+++ trunk/src/gui/widgets/control.hpp Wed Mar 2 22:40:41 2011
@@ -142,7 +142,7 @@
twidget* find_at(const tpoint& coordinate, const bool must_be_active)
{
return (twidget::find_at(coordinate, must_be_active)
- && (!must_be_active || get_active())) ? this : 0;
+ && (!must_be_active || get_active())) ? this : NULL;
}
/** Inherited from twidget. */
@@ -150,14 +150,14 @@
const bool must_be_active) const
{
return (twidget::find_at(coordinate, must_be_active)
- && (!must_be_active || get_active())) ? this : 0;
+ && (!must_be_active || get_active())) ? this : NULL;
}
/** Inherited from twidget.*/
twidget* find(const std::string& id, const bool must_be_active)
{
return (twidget::find(id, must_be_active)
- && (!must_be_active || get_active())) ? this : 0;
+ && (!must_be_active || get_active())) ? this : NULL;
}
/** Inherited from twidget.*/
@@ -165,7 +165,7 @@
const bool must_be_active) const
{
return (twidget::find(id, must_be_active)
- && (!must_be_active || get_active())) ? this : 0;
+ && (!must_be_active || get_active())) ? this : NULL;
}
/**
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
