linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2671
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Tue 2011-11-08 20:42:19 +0100
message:
  build fixes
modified:
  dwt/include/dwt/aspects/Help.h
  dwt/include/dwt/aspects/Painting.h
  win32/DCPlusPlus.rc


--
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/aspects/Help.h'
--- dwt/include/dwt/aspects/Help.h	2011-11-07 22:11:39 +0000
+++ dwt/include/dwt/aspects/Help.h	2011-11-08 19:42:19 +0000
@@ -76,12 +76,12 @@
 	void onHelp(std::function<void (WidgetType*, unsigned)> f) {
 		W().addCallback(Message(WM_HELP), [f, this](const MSG& msg, LRESULT& ret) -> bool {
 			LPHELPINFO lphi = reinterpret_cast<LPHELPINFO>(msg.lParam);
-			if(lphi->iContextType != HELPINFO_WINDOW)
+			if(!lphi || lphi->iContextType != HELPINFO_WINDOW)
 				return false;
 
 			HWND hWnd = reinterpret_cast<HWND>(lphi->hItemHandle);
 			// make sure this handle is ours
-			if(hWnd != H() && !::IsChild(H(), hWnd))
+			if(hWnd != this->H() && !::IsChild(this->H(), hWnd)) /// @todo why does GCC need a "this->"?
 				return false;
 
 			WidgetType* widget = hwnd_cast<WidgetType*>(hWnd);

=== modified file 'dwt/include/dwt/aspects/Painting.h'
--- dwt/include/dwt/aspects/Painting.h	2011-11-07 22:11:39 +0000
+++ dwt/include/dwt/aspects/Painting.h	2011-11-08 19:42:19 +0000
@@ -58,7 +58,7 @@
 	  */
 	void onPainting(std::function<void (PaintCanvas&)> f) {
 		W().addCallback(Message(WM_PAINT), [f, this](const MSG&, LRESULT&) -> bool {
-			PaintCanvas canvas(&W());
+			PaintCanvas canvas(&this->W()); /// @todo why does GCC need a "this->"?
 			f(canvas);
 			return true;
 		});

=== modified file 'win32/DCPlusPlus.rc'
--- win32/DCPlusPlus.rc	2011-10-15 22:58:51 +0000
+++ win32/DCPlusPlus.rc	2011-11-08 19:42:19 +0000
@@ -1,9 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
 #include "resource.h"
-#define WINVER 0x0501
-#define _WIN32_IE 0x0501
-#define _WIN32_WINNT 0x0501
 #include <winuser.h>
 #include <commctrl.h>
 /////////////////////////////////////////////////////////////////////////////