linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2540
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sat 2011-05-28 18:06:47 +0200
message:
  fixes for GCC
modified:
  dwt/include/dwt/Theme.h
  dwt/src/Theme.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/Theme.h'
--- dwt/include/dwt/Theme.h	2011-05-28 15:12:11 +0000
+++ dwt/include/dwt/Theme.h	2011-05-28 16:06:47 +0000
@@ -56,7 +56,8 @@
 	* drawing the transparent bits yourself.
 	* @param clip only draw within this rectangle (useful for partial painting from a PaintCanvas).
 	*/
-	void drawBackground(Canvas& canvas, int part, int state, const Rectangle& rect, bool drawParent = true, boost::optional<Rectangle> clip = 0);
+	void drawBackground(Canvas& canvas, int part, int state, const Rectangle& rect,
+		bool drawParent = true, boost::optional<Rectangle> clip = boost::optional<Rectangle>());
 	/**
 	* @param textFlags see the DrawText doc for possible values.
 	* @param color text color, or NaC for the default theme color.

=== modified file 'dwt/src/Theme.cpp'
--- dwt/src/Theme.cpp	2011-05-28 15:12:11 +0000
+++ dwt/src/Theme.cpp	2011-05-28 16:06:47 +0000
@@ -117,7 +117,7 @@
 
 void Theme::drawBackground(Canvas& canvas, int part, int state, const Rectangle& rect, bool drawParent, boost::optional<Rectangle> clip) {
 	::RECT rc = rect;
-	boost::optional<::RECT> rcClip(clip);
+	boost::optional<RECT> rcClip(clip);
 	if(drawParent && isBackgroundPartiallyTransparent(part, state)) {
 		DrawThemeParentBackground(w->handle(), canvas.handle(), clip ? &rcClip.get() : &rc);
 	}