Author: mordante
Date: Tue Aug 30 21:41:15 2011
New Revision: 50955
URL: http://svn.gna.org/viewcvs/wesnoth?rev=50955&view=rev
Log:
Remove a deprecated function.
Modified:
trunk/src/gui/dialogs/dialog.cpp
trunk/src/gui/dialogs/dialog.hpp
trunk/src/gui/dialogs/mp_connect.cpp
trunk/src/gui/dialogs/mp_login.cpp
Modified: trunk/src/gui/dialogs/dialog.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/dialog.cpp?rev=50955&r1=50954&r2=50955&view=diff
==============================================================================
--- trunk/src/gui/dialogs/dialog.cpp (original)
+++ trunk/src/gui/dialogs/dialog.cpp Tue Aug 30 21:41:15 2011
@@ -185,24 +185,6 @@
return tdialog::register_text(id, mandatory, linked_variable);
}
-tfield_text* tdialog::register_text2(const std::string& id
- , const bool mandatory
- , std::string (*callback_load_value) ()
- , void (*callback_save_value) (const std::string& value)
- , const bool capture_focus)
-{
- assert(!capture_focus || focus_.empty());
-
- if(capture_focus) {
- focus_ = id;
- }
-
- return tdialog::register_text(id
- , mandatory
- , callback_load_value
- , callback_save_value);
-}
-
tfield_label* tdialog::register_label(const std::string& id
, const bool mandatory
, const std::string& text
Modified: trunk/src/gui/dialogs/dialog.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/dialog.hpp?rev=50955&r1=50954&r2=50955&view=diff
==============================================================================
--- trunk/src/gui/dialogs/dialog.hpp (original)
+++ trunk/src/gui/dialogs/dialog.hpp Tue Aug 30 21:41:15 2011
@@ -284,12 +284,6 @@
, std::string& linked_variable
, const bool capture_focus = false);
- tfield_text* register_text2(const std::string& id
- , const bool mandatory
- , std::string (*callback_load_value) () = NULL
- , void (*callback_save_value) (const std::string&
value) = NULL
- , const bool capture_focus = false);
-
/**
* Registers a new control as a label.
*
Modified: trunk/src/gui/dialogs/mp_connect.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/mp_connect.cpp?rev=50955&r1=50954&r2=50955&view=diff
==============================================================================
--- trunk/src/gui/dialogs/mp_connect.cpp (original)
+++ trunk/src/gui/dialogs/mp_connect.cpp Tue Aug 30 21:41:15 2011
@@ -158,7 +158,7 @@
}
tmp_connect::tmp_connect()
- : host_name_(register_text2("host_name"
+ : host_name_(register_text("host_name"
, true
, preferences::network_host
, preferences::set_network_host
Modified: trunk/src/gui/dialogs/mp_login.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/dialogs/mp_login.cpp?rev=50955&r1=50954&r2=50955&view=diff
==============================================================================
--- trunk/src/gui/dialogs/mp_login.cpp (original)
+++ trunk/src/gui/dialogs/mp_login.cpp Tue Aug 30 21:41:15 2011
@@ -64,13 +64,13 @@
tmp_login::tmp_login(const std::string& label, const bool focus_password)
{
register_label("login_label", false, label);
- register_text2("user_name"
+ register_text("user_name"
, true
, &preferences::login
, &preferences::set_login
, !focus_password);
- register_text2("password"
+ register_text("password"
, true
, &preferences::password
, NULL /* The password box returns '*' as value. */
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
