[Dcplusplus-commit] SF.net SVN: dcplusplus: [1033] dcplusplus/trunk

[<zou...@us...>]

Revision: 1033
          http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=1033&view=rev
Author:   zouzou123gen
Date:     2008-03-09 06:59:38 -0700 (Sun, 09 Mar 2008)

Log Message:
-----------
2 more translatable strings

Modified Paths:
--------------
    dcplusplus/trunk/dcpp/BufferedSocket.cpp
    dcplusplus/trunk/win32/CommandDlg.cpp
    dcplusplus/trunk/win32/CommandDlg.h

Modified: dcplusplus/trunk/dcpp/BufferedSocket.cpp
===================================================================
--- dcplusplus/trunk/dcpp/BufferedSocket.cpp	2008-03-08 09:44:38 UTC (rev 1032)
+++ dcplusplus/trunk/dcpp/BufferedSocket.cpp	2008-03-09 13:59:38 UTC (rev 1033)
@@ -145,7 +145,7 @@
 		return;
 	} else if(left == 0) {
 		// This socket has been closed...
-		throw SocketException(("Connection closed"));
+		throw SocketException(_("Connection closed"));
 	}
 	string::size_type pos = 0;
 	// always uncompressed data

Modified: dcplusplus/trunk/win32/CommandDlg.cpp
===================================================================
--- dcplusplus/trunk/win32/CommandDlg.cpp	2008-03-08 09:44:38 UTC (rev 1032)
+++ dcplusplus/trunk/win32/CommandDlg.cpp	2008-03-09 13:59:38 UTC (rev 1033)
@@ -52,7 +52,7 @@
 {
 	onInitDialog(std::tr1::bind(&CommandDlg::handleInitDialog, this));
 	onFocus(std::tr1::bind(&CommandDlg::handleFocus, this));
-	onRaw(std::tr1::bind(&CommandDlg::handleHelp, this, _1, _2), SmartWin::Message(WM_HELP));
+	onRaw(std::tr1::bind(&CommandDlg::handleHelp, this), SmartWin::Message(WM_HELP));
 }
 
 CommandDlg::~CommandDlg() {
@@ -200,7 +200,7 @@
 void CommandDlg::handleOKClicked() {
 	name = nameBox->getText();
 	if((type != 0) && (name.empty() || commandBox->getText().empty())) {
-		createMessageBox().show(_T("Name and command must not be empty"), _T(APPNAME) _T(" ") _T(VERSIONSTRING), WidgetMessageBox::BOX_OK, WidgetMessageBox::BOX_ICONEXCLAMATION);
+		createMessageBox().show(T_("Name and command must not be empty"), _T(APPNAME) _T(" ") _T(VERSIONSTRING), WidgetMessageBox::BOX_OK, WidgetMessageBox::BOX_ICONEXCLAMATION);
 		return;
 	}
 
@@ -274,7 +274,7 @@
 	}
 }
 
-LRESULT CommandDlg::handleHelp(WPARAM wParam, LPARAM lParam) {
+LRESULT CommandDlg::handleHelp() {
 	HtmlHelp(handle(), WinUtil::getHelpFile().c_str(), HH_HELP_CONTEXT, IDD_UCPAGE);
 	return 0;
 }

Modified: dcplusplus/trunk/win32/CommandDlg.h
===================================================================
--- dcplusplus/trunk/win32/CommandDlg.h	2008-03-08 09:44:38 UTC (rev 1032)
+++ dcplusplus/trunk/win32/CommandDlg.h	2008-03-09 13:59:38 UTC (rev 1033)
@@ -36,8 +36,6 @@
 	tstring getCommand() { return command; }
 	tstring getHub() { return hub; }
 
-	LRESULT handleHelp(WPARAM wParam, LPARAM lParam);
-	
 private:
 	WidgetRadioButtonPtr separator;
 	WidgetRadioButtonPtr raw;
@@ -63,8 +61,8 @@
 
 	bool handleInitDialog();
 	void handleFocus();
+	LRESULT handleHelp();
 	void handleTypeChanged();
-
 	void handleOKClicked();
 	void handleHelpClicked();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.