X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcprogress.C;h=100ef766a381adb92402c02335c9fd82fbe72053;hb=b402ed7f93de4c98e6651483eb8561cf1c37ec9a;hp=92c3a222cc6e0f13c5e9bda9d911c9ef9b030f6b;hpb=318256a48938064b695268d03396977739ef4724;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/guicast/bcprogress.C b/cinelerra-5.1/guicast/bcprogress.C index 92c3a222..100ef766 100644 --- a/cinelerra-5.1/guicast/bcprogress.C +++ b/cinelerra-5.1/guicast/bcprogress.C @@ -2,21 +2,21 @@ /* * CINELERRA * Copyright (C) 2008 Adam Williams - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * */ #include @@ -25,7 +25,7 @@ #define PROGRESS_UP 0 #define PROGRESS_HI 1 -#include "colors.h" +#include "bccolors.h" #include "fonts.h" #include "bcprogress.h" #include "bcpixmap.h" @@ -87,8 +87,8 @@ int BC_ProgressBar::set_images() for(int i = 0; i < 2; i++) { - images[i] = new BC_Pixmap(parent_window, - get_resources()->progress_images[i], + images[i] = new BC_Pixmap(parent_window, + get_resources()->progress_images[i], PIXMAP_ALPHA); } return 0;