Menu
▾
▴
[Planeshift-cvs] CVS: planeshift/src/common/paws pawscheckbox.cpp, 1.18, 1.19 pawsframedrawable.cpp, 1.1, 1.2 pawsframedrawable.h, 1.1, 1.2 pawslistbox.cpp, 1.58, 1.59 pawsmanager.cpp, 1.106, 1.107 pawsmenu.cpp, 1.18, 1.19 pawsmouse.h, 1.12, 1.13 pawstextwrap.cpp, 1.14, 1.15 pawstitle.cpp, 1.1, 1.2 psmousebinds.cpp, 1.20, 1.21
|
From: Xordan <mg...@us...> - 2007-09-14 23:59:52
|
Update of /cvsroot/planeshift/planeshift/src/common/paws In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16791/src/common/paws Modified Files: pawscheckbox.cpp pawsframedrawable.cpp pawsframedrawable.h pawslistbox.cpp pawsmanager.cpp pawsmenu.cpp pawsmouse.h pawstextwrap.cpp pawstitle.cpp psmousebinds.cpp Log Message: - More compile warning fixes. Index: pawscheckbox.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/paws/pawscheckbox.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** pawscheckbox.cpp 23 Aug 2007 05:28:11 -0000 1.18 --- pawscheckbox.cpp 14 Sep 2007 23:59:52 -0000 1.19 *************** *** 204,211 **** void pawsCheckBox::SetProperty(const char * ptr, double value) { if (!strcasecmp(ptr, "checked")) ! SetState(abs(value) > 0.5); else if (!strcasecmp(ptr, "greyed")) ! checkBox->SetEnabled(abs(value) <= 0.5); else pawsWidget::SetProperty(ptr, value); --- 204,212 ---- void pawsCheckBox::SetProperty(const char * ptr, double value) { + double absd = abs(value); if (!strcasecmp(ptr, "checked")) ! SetState(absd > 0.5); else if (!strcasecmp(ptr, "greyed")) ! checkBox->SetEnabled(absd <= 0.5); else pawsWidget::SetProperty(ptr, value); Index: pawsframedrawable.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/paws/pawsframedrawable.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pawsframedrawable.cpp 23 Aug 2007 05:28:11 -0000 1.1 --- pawsframedrawable.cpp 14 Sep 2007 23:59:52 -0000 1.2 *************** *** 178,181 **** --- 178,183 ---- break; } + case FDT_COUNT: + break; } } *************** *** 196,199 **** --- 198,203 ---- return csMax<int>(t, csMax<int>(m, b)); } + case FDT_COUNT: + break; } return 0; *************** *** 215,218 **** --- 219,224 ---- return csMax<int>(l, csMax<int>(m, r)); } + case FDT_COUNT: + break; } return 0; Index: pawsframedrawable.h =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/paws/pawsframedrawable.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pawsframedrawable.h 23 Aug 2007 05:28:11 -0000 1.1 --- pawsframedrawable.h 14 Sep 2007 23:59:52 -0000 1.2 *************** *** 126,128 **** }; ! #endif // PAWS_FRAME_DRAWABLE \ No newline at end of file --- 126,128 ---- }; ! #endif // PAWS_FRAME_DRAWABLE Index: pawslistbox.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/paws/pawslistbox.cpp,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** pawslistbox.cpp 18 Mar 2007 15:37:30 -0000 1.58 --- pawslistbox.cpp 14 Sep 2007 23:59:52 -0000 1.59 *************** *** 1004,1008 **** { pawsListBoxRow ** sortedRows; ! size_t i; if ((size_t)rownr >= rows.GetSize() || rownr < 0 || dest < 0 || (size_t)dest >= rows.GetSize() || dest == rownr ) --- 1004,1008 ---- { pawsListBoxRow ** sortedRows; ! int i; if ((size_t)rownr >= rows.GetSize() || rownr < 0 || dest < 0 || (size_t)dest >= rows.GetSize() || dest == rownr ) *************** *** 1013,1017 **** bool reorder = false; ! for ( i=0; i < rows.GetSize(); i++) { if((i == dest && dest < rownr) || (i == rownr && dest > rownr)) --- 1013,1017 ---- bool reorder = false; ! for ( i=0;(uint)i < rows.GetSize(); i++) { if((i == dest && dest < rownr) || (i == rownr && dest > rownr)) *************** *** 1046,1050 **** } ! for ( i=0; i < rows.GetSize(); i++) rows[i] = sortedRows[i]; delete [] sortedRows; --- 1046,1050 ---- } ! for ( i=0; (uint)i < rows.GetSize(); i++) rows[i] = sortedRows[i]; delete [] sortedRows; Index: pawsmanager.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/paws/pawsmanager.cpp,v retrieving revision 1.106 retrieving revision 1.107 diff -C2 -d -r1.106 -r1.107 *** pawsmanager.cpp 3 Sep 2007 02:33:26 -0000 1.106 --- pawsmanager.cpp 14 Sep 2007 23:59:52 -0000 1.107 *************** *** 1191,1194 **** --- 1191,1197 ---- temp_buffer.Format("%.2f",floatval); break; + case PAWS_DATA_STR: + case PAWS_DATA_UNKNOWN: + break; } return temp_buffer; *************** *** 1205,1208 **** --- 1208,1214 ---- case PAWS_DATA_INT: return intval; case PAWS_DATA_STR: return atof(str); + case PAWS_DATA_FLOAT: + case PAWS_DATA_UNKNOWN: + break; } return 0; *************** *** 1219,1222 **** --- 1225,1231 ---- case PAWS_DATA_FLOAT: return (int)floatval; case PAWS_DATA_STR: return atoi(str); + case PAWS_DATA_INT: + case PAWS_DATA_UNKNOWN: + break; } return 0; *************** *** 1239,1242 **** --- 1248,1254 ---- else return true; + case PAWS_DATA_BOOL: + case PAWS_DATA_UNKNOWN: + break; } return false; Index: pawsmenu.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/paws/pawsmenu.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** pawsmenu.cpp 16 Aug 2007 06:04:22 -0000 1.18 --- pawsmenu.cpp 14 Sep 2007 23:59:52 -0000 1.19 *************** *** 591,594 **** --- 591,597 ---- DestroyMenu(closeChildClosed); break; + case closeSiblingOpened: + case closeParentClosed: + break; } } Index: pawsmouse.h =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/paws/pawsmouse.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** pawsmouse.h 16 Aug 2007 06:04:22 -0000 1.12 --- pawsmouse.h 14 Sep 2007 23:59:52 -0000 1.13 *************** *** 69,72 **** --- 69,74 ---- { ImgSize size; + size.width = 0; + size.height = 0; if (cursorImage) { Index: pawstextwrap.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/paws/pawstextwrap.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** pawstextwrap.cpp 29 Apr 2007 20:28:06 -0000 1.14 --- pawstextwrap.cpp 14 Sep 2007 23:59:52 -0000 1.15 *************** *** 382,386 **** //if a is '-1', the char wasn't found so we grab to end of the line, //else we grab up to and including the found character ! if (a == -1) word = text.Slice(srcPos,text.Length()-srcPos); else --- 382,386 ---- //if a is '-1', the char wasn't found so we grab to end of the line, //else we grab up to and including the found character ! if (a == (size_t)-1) word = text.Slice(srcPos,text.Length()-srcPos); else *************** *** 407,411 **** srcPos += word.Length(); } ! else if (tempString.FindFirst(" ") != -1) { //If wordwrap->linebreak on same line, --- 407,411 ---- srcPos += word.Length(); } ! else if (tempString.FindFirst(" ") != (size_t)-1) { //If wordwrap->linebreak on same line, Index: pawstitle.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/paws/pawstitle.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pawstitle.cpp 23 Aug 2007 05:28:11 -0000 1.1 --- pawstitle.cpp 14 Sep 2007 23:59:52 -0000 1.2 *************** *** 112,116 **** int w = (int)width; if (scaleWidth) ! w = winWidth * width; int deltaX = screenFrame.xmin; --- 112,116 ---- int w = (int)width; if (scaleWidth) ! w = (int)(winWidth * width); int deltaX = screenFrame.xmin; *************** *** 138,141 **** --- 138,143 ---- titleButtons[a].buttonWidget->MoveTo(screenFrame.xmax - titleButtons[a].buttonWidget->ScreenFrame().Width() + titleButtons[a].offsetx, screenFrame.ymin + titleButtons[a].offsety); break; + case PTA_COUNT: + break; } } *************** *** 150,154 **** GetFont()->GetDimensions(text, w, h); ! int textx; int texty = screenFrame.ymin + (screenFrame.Height() - h)/2; switch (textAlign) --- 152,156 ---- GetFont()->GetDimensions(text, w, h); ! int textx = 0; int texty = screenFrame.ymin + (screenFrame.Height() - h)/2; switch (textAlign) *************** *** 163,166 **** --- 165,170 ---- textx = screenFrame.xmax - w; break; + case PTA_COUNT: + break; } textx += textOffsetx; Index: psmousebinds.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/common/paws/psmousebinds.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** psmousebinds.cpp 9 Feb 2007 21:50:26 -0000 1.20 --- psmousebinds.cpp 14 Sep 2007 23:59:52 -0000 1.21 *************** *** 387,391 **** csMouseEventData event; if (GetBind(action, event)) ! return (button == event.Button && modifiers == event.Modifiers); return false; --- 387,391 ---- csMouseEventData event; if (GetBind(action, event)) ! return ((uint)button == event.Button && (uint)modifiers == event.Modifiers); return false; |