Merge from default. Hope I did it right...

This commit is contained in:
Emil Martinec
2012-03-08 20:27:30 -06:00
parent 380728e1f0
commit f47b4b5bb0
262 changed files with 41736 additions and 37104 deletions

View File

@@ -137,7 +137,7 @@ void FileBrowserEntry::getIconSize (int& w, int& h) {
FileThumbnailButtonSet* FileBrowserEntry::getThumbButtonSet () {
return (FileThumbnailButtonSet*)buttonSet;
return (static_cast<FileThumbnailButtonSet*>(buttonSet));
}
void FileBrowserEntry::procParamsChanged (Thumbnail* thm, int whoChangedIt) {