linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2371
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-12-30 19:32:24 +0100
message:
  fix linking problems
modified:
  dwt/include/dwt/util/win32/ApiHelpers.h
  dwt/src/util/win32/ApiHelpers.cpp


--
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/include/dwt/util/win32/ApiHelpers.h'
--- dwt/include/dwt/util/win32/ApiHelpers.h	2010-12-26 18:16:35 +0000
+++ dwt/include/dwt/util/win32/ApiHelpers.h	2010-12-30 18:32:24 +0000
@@ -37,16 +37,8 @@
 
 namespace dwt { namespace util { namespace win32 {
 
-inline size_t getWindowTextLength(HWND hWnd) { return static_cast<size_t>(::SendMessage(hWnd, WM_GETTEXTLENGTH, 0, 0)); }
-
-inline tstring getWindowText(HWND hWnd) {
-	size_t textLength = getWindowTextLength(hWnd);
-	if (textLength == 0)
-		return tstring();
-	tstring retVal(textLength + 1, 0);
-	retVal.resize(::SendMessage(hWnd, WM_GETTEXT, static_cast<WPARAM>(textLength + 1), reinterpret_cast<LPARAM>(&retVal[0])));
-	return retVal;
-}
+size_t getWindowTextLength(HWND hWnd);
+tstring getWindowText(HWND hWnd);
 
 void updateStyle(HWND hwnd, int which, DWORD style, bool add);
 

=== modified file 'dwt/src/util/win32/ApiHelpers.cpp'
--- dwt/src/util/win32/ApiHelpers.cpp	2010-12-26 18:16:35 +0000
+++ dwt/src/util/win32/ApiHelpers.cpp	2010-12-30 18:32:24 +0000
@@ -33,6 +33,19 @@
 
 namespace dwt { namespace util { namespace win32 {
 
+size_t getWindowTextLength(HWND hWnd) {
+	return static_cast<size_t>(::SendMessage(hWnd, WM_GETTEXTLENGTH, 0, 0));
+}
+
+tstring getWindowText(HWND hWnd) {
+	size_t textLength = getWindowTextLength(hWnd);
+	if (textLength == 0)
+		return tstring();
+	tstring retVal(textLength + 1, 0);
+	retVal.resize(::SendMessage(hWnd, WM_GETTEXT, static_cast<WPARAM>(textLength + 1), reinterpret_cast<LPARAM>(&retVal[0])));
+	return retVal;
+}
+
 void updateStyle(HWND hwnd, int which, DWORD style, bool add) {
 	DWORD newStyle = ::GetWindowLong(hwnd, which);
 	bool mustUpdate = false;