icon fixes for theme data

[goodguy/history.git] / cinelerra-5.0 / cinelerra / theme.C

diff --git a/cinelerra-5.0/cinelerra/theme.C b/cinelerra-5.0/cinelerra/theme.C
index f3137a250e969e69b2299ffe9d0f57f85caff493..549dd11c3bc2f441b07231f30f50c947f568124f 100644 (file)
--- a/cinelerra-5.0/cinelerra/theme.C
+++ b/cinelerra-5.0/cinelerra/theme.C
@@ -94,9 +94,10 @@ Theme::Theme()
        preferences_category_overlap = 0;
 
        loadmode_w = 350;
+       czoom_w = 80;
 
 #include "data/about_png.h"
-       about_bg = new VFrame(about_png);
+       about_bg = new VFramePng(about_png);
 
        pane_color = BLACK;
        drag_pane_color = WHITE;
@@ -342,7 +343,7 @@ void Theme::build_transport(char *title,
        int third)
 {
        if(!png_overlay) return;
-       VFrame default_data(png_overlay);
+       VFramePng default_data(png_overlay);
        VFrame *data[3];
        data[0] = NEW_VFRAME;
        data[1] = NEW_VFRAME;
@@ -396,7 +397,7 @@ void Theme::build_patches(VFrame** &data,
        int region)
 {
        if(!png_overlay || !bg_data) return;
-       VFrame default_data(png_overlay);
+       VFramePng default_data(png_overlay);
        data = new VFrame*[5];
        data[0] = NEW_VFRAME;
        data[1] = NEW_VFRAME;
@@ -449,7 +450,7 @@ void Theme::build_button(VFrame** &data,
        VFrame *dn_vframe)
 {
        if(!png_overlay) return;
-       VFrame default_data(png_overlay);
+       VFramePng default_data(png_overlay);
 
        if(!up_vframe || !hi_vframe || !dn_vframe) return;
        data = new VFrame*[3];
@@ -472,7 +473,7 @@ void Theme::build_button(VFrame** &data,
        VFrame *at_vframe)
 {
        if(!png_overlay) return;
-       VFrame default_data(png_overlay);
+       VFramePng default_data(png_overlay);
 
        if(!up_vframe || !hi_vframe || !dn_vframe) return;
        data = new VFrame*[4];
@@ -503,7 +504,7 @@ void Theme::build_toggle(VFrame** &data,
                !checked_vframe || 
                !dn_vframe || 
                !checkedhi_vframe) return;
-       VFrame default_data(png_overlay);
+       VFramePng default_data(png_overlay);
        data = new VFrame*[5];
        data[0] = NEW_VFRAME;
        data[1] = NEW_VFRAME;
@@ -628,8 +629,6 @@ void Theme::draw_mwindow_bg(MWindowGUI *gui)
 
 void Theme::get_cwindow_sizes(CWindowGUI *gui, int cwindow_controls)
 {
-       czoom_w = 80;
-
        int edit_w = EditPanel::calculate_w(mwindow, 1, 14);
        int transport_w = PlayTransport::get_transport_width(mwindow) + toggle_margin;
        int zoom_w = ZoomPanel::calculate_w(czoom_w);