rework crikey, fix uninited vars in listbox

[goodguy/history.git] / cinelerra-5.1 / guicast / bcscrollbar.C

diff --git a/cinelerra-5.1/guicast/bcscrollbar.C b/cinelerra-5.1/guicast/bcscrollbar.C
index bc2e4f990305b37beaba07f4c6bab180ba7ccef9..680341d0beebf0e990e1b74a5bf42c62670e9473 100644 (file)
--- a/cinelerra-5.1/guicast/bcscrollbar.C
+++ b/cinelerra-5.1/guicast/bcscrollbar.C
@@ -23,7 +23,7 @@
 #include "bcresources.h"
 #include "bcscrollbar.h"
 #include "clip.h"
-#include "colors.h"
+#include "bccolors.h"
 #include "vframe.h"
 
 #include <string.h>
@@ -117,30 +117,18 @@ int BC_ScrollBar::get_span(int orientation)
 
 int BC_ScrollBar::get_span()
 {
-       switch(orientation)
-       {
-               case SCROLL_HORIZ:
-                       return data[SCROLL_HANDLE_UP]->get_h();
-                       break;
-
-               case SCROLL_VERT:
-                       return data[SCROLL_HANDLE_UP]->get_w();
-                       break;
+       switch(orientation) {
+       case SCROLL_HORIZ: return data[SCROLL_HANDLE_UP]->get_h();
+       case SCROLL_VERT:  return data[SCROLL_HANDLE_UP]->get_w();
        }
        return 0;
 }
 
 int BC_ScrollBar::get_arrow_pixels()
 {
-       switch(orientation)
-       {
-               case SCROLL_HORIZ:
-                       return data[SCROLL_BACKARROW_UP]->get_w();
-                       break;
-
-               case SCROLL_VERT:
-                       return data[SCROLL_BACKARROW_UP]->get_h();
-                       break;
+       switch(orientation) {
+       case SCROLL_HORIZ: return data[SCROLL_BACKARROW_UP]->get_w();
+       case SCROLL_VERT:  return data[SCROLL_BACKARROW_UP]->get_h();
        }
        return 0;
 }