(svn r13644) -Fix(r13643): compare an apple with an apple. MSVC seems to not care, but some other compilers do.
authorbelugas
Fri, 27 Jun 2008 02:26:51 +0000
changeset 11087 70767706681a
parent 11086 64da2918edb5
child 11088 3c315ff5f36a
(svn r13644) -Fix(r13643): compare an apple with an apple. MSVC seems to not care, but some other compilers do.
Thanks to glx :)
src/toolbar_gui.cpp
--- a/src/toolbar_gui.cpp	Fri Jun 27 01:26:13 2008 +0000
+++ b/src/toolbar_gui.cpp	Fri Jun 27 02:26:51 2008 +0000
@@ -843,7 +843,7 @@
 
 	static const byte *arrangements[] = { arrange14, arrange15, arrange16, arrange17, arrange18, arrange19 };
 
-	uint max_icons = max(TBP_TOOLBAR_MINBUTTON, (w->width + TBP_BUTTONWIDTH / 2) / TBP_BUTTONWIDTH);
+	uint max_icons = max(TBP_TOOLBAR_MINBUTTON, (ToolBarProperties)((w->width + TBP_BUTTONWIDTH / 2) / TBP_BUTTONWIDTH));
 
 	assert(max_icons >= TBP_TOOLBAR_MINBUTTON && max_icons <= TBP_NORMAL_MAXBUTTON);