linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2117
committer: poy <poy@xxxxxxxxxx>
branch nick: repo
timestamp: Sun 2010-03-28 19:50:53 +0200
message:
  fix compilation with VC++
modified:
  dwt/src/widgets/TextBox.cpp
  win32/stdafx.h


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription.

=== modified file 'dwt/src/widgets/TextBox.cpp'
--- dwt/src/widgets/TextBox.cpp	2010-03-26 22:49:37 +0000
+++ dwt/src/widgets/TextBox.cpp	2010-03-28 17:50:53 +0000
@@ -168,23 +168,28 @@
 	return ret;
 }
 
+// wrapper because sendMessage returns a value
+static inline void sendMessage_(TextBoxBase* box, UINT message) {
+	box->sendMessage(message);
+}
+
 void TextBoxBase::addCommands(MenuPtr menu) {
 	const bool writable = !hasStyle(ES_READONLY);
 	const bool text = !getText().empty();
 	const bool selection = !getSelection().empty();
 
 	if(writable) {
-		menu->appendItem(Texts::get(Texts::undo), std::tr1::bind(&TextBoxBase::sendMessage, this, WM_UNDO, 0, 0),
+		menu->appendItem(Texts::get(Texts::undo), std::tr1::bind(&sendMessage_, this, WM_UNDO),
 			IconPtr(), sendMessage(EM_CANUNDO));
 		menu->appendSeparator();
-		menu->appendItem(Texts::get(Texts::cut), std::tr1::bind(&TextBoxBase::sendMessage, this, WM_CUT, 0, 0),
+		menu->appendItem(Texts::get(Texts::cut), std::tr1::bind(&sendMessage_, this, WM_CUT),
 			IconPtr(), selection);
 	}
-	menu->appendItem(Texts::get(Texts::copy), std::tr1::bind(&TextBoxBase::sendMessage, this, WM_COPY, 0, 0),
+	menu->appendItem(Texts::get(Texts::copy), std::tr1::bind(&sendMessage_, this, WM_COPY),
 		IconPtr(), selection);
 	if(writable) {
-		menu->appendItem(Texts::get(Texts::paste), std::tr1::bind(&TextBoxBase::sendMessage, this, WM_PASTE, 0, 0));
-		menu->appendItem(Texts::get(Texts::del), std::tr1::bind(&TextBoxBase::sendMessage, this, WM_CLEAR, 0, 0),
+		menu->appendItem(Texts::get(Texts::paste), std::tr1::bind(&sendMessage_, this, WM_PASTE));
+		menu->appendItem(Texts::get(Texts::del), std::tr1::bind(&sendMessage_, this, WM_CLEAR),
 			IconPtr(), selection);
 	}
 	menu->appendSeparator();

=== modified file 'win32/stdafx.h'
--- win32/stdafx.h	2010-03-26 17:15:26 +0000
+++ win32/stdafx.h	2010-03-28 17:50:53 +0000
@@ -99,16 +99,16 @@
 #define _(String) gettext(String)
 #define gettext_noop(String) String
 #define N_(String) gettext_noop (String)
-#define T_(String) Text::toT(gettext(String))
+#define T_(String) dcpp::Text::toT(gettext(String))
 #define CT_(String) T_(String).c_str()
 #define F_(String) dcpp_fmt(gettext(String))
 #define FN_(String1,String2, N) dcpp_fmt(ngettext(String1, String2, N))
 #ifdef UNICODE
-#define TF_(String) dcpp_fmt(Text::toT(gettext(String)))
-#define TFN_(String1,String2, N) dcpp_fmt(Text::toT(ngettext(String1, String2, N)))
+#define TF_(String) dcpp_fmt(dcpp::Text::toT(gettext(String)))
+#define TFN_(String1,String2, N) dcpp_fmt(dcpp::Text::toT(ngettext(String1, String2, N)))
 #else
-#define TF_(String) dcpp_fmt(Text::toT(gettext(String)))
-#define TFN_(String1,String2, N) dcpp_fmt(Text::toT(ngettext(String1, String2, N)))
+#define TF_(String) dcpp_fmt(dcpp::Text::toT(gettext(String)))
+#define TFN_(String1,String2, N) dcpp_fmt(dcpp::Text::toT(ngettext(String1, String2, N)))
 #endif
 #endif