# HG changeset patch # User belugas # Date 1214533611 0 # Node ID 612fedc5267f5750d86f730ba5fe8b1747664672 # Parent 8feccda0f30a9062adee046c3b66a0935a25fb70 (svn r13644) -Fix(r13643): compare an apple with an apple. MSVC seems to not care, but some other compilers do. Thanks to glx :) diff -r 8feccda0f30a -r 612fedc5267f 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);