fix red

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17859 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 5 insertions, 5 deletions

diff --git a/apps/gui/buttonbar.c b/apps/gui/buttonbar.c
index 02be37a..abf1800 100644
--- a/apps/gui/buttonbar.c
+++ b/apps/gui/buttonbar.c
@@ -46,7 +46,7 @@ void gui_buttonbar_init(struct gui_buttonbar * buttonbar)
     {
         viewport_set_defaults(&bb_vp[i], i);
         bb_vp[i].font = FONT_SYSFIXED;
-        bb_vp[i].y = screens[i].height - BUTTONBAR_HEIGHT;
+        bb_vp[i].y = screens[i].lcdheight - BUTTONBAR_HEIGHT;
         bb_vp[i].height = BUTTONBAR_HEIGHT;
         bb_vp[i].drawmode = DRMODE_COMPLEMENT;
     }
@@ -65,7 +65,7 @@ static void gui_buttonbar_draw_button(struct gui_buttonbar * buttonbar, int num)
     struct screen * display = buttonbar->display;
     struct viewport vp = bb_vp[display->screen_type];
 
-    button_width = display->width/BUTTONBAR_MAX_BUTTONS;
+    button_width = display->lcdwidth/BUTTONBAR_MAX_BUTTONS;
     vp.width = button_width;
     vp.x = button_width * num;
     display->set_viewport(&vp);
diff --git a/apps/gui/color_picker.c b/apps/gui/color_picker.c
index 4ac4fa7..8db9ba9 100644
--- a/apps/gui/color_picker.c
+++ b/apps/gui/color_picker.c
@@ -360,11 +360,11 @@ static int touchpad_slider(struct rgb_pick *rgb, int *selected_slider)
     text_top     = MARGIN_TOP + display->char_height + TITLE_MARGIN_BOTTOM + SELECTOR_TB_MARGIN;
     slider_left  = MARGIN_LEFT + SELECTOR_WIDTH + SELECTOR_LR_MARGIN +
                    max_label_width + SLIDER_MARGIN_LEFT;
-    slider_width = display->width - slider_left - SLIDER_MARGIN_RIGHT -
+    slider_width = display->getwidth() - slider_left - SLIDER_MARGIN_RIGHT -
                    display->char_width*2 - SELECTOR_LR_MARGIN - SELECTOR_WIDTH -
                    MARGIN_RIGHT;
     display_three_rows =
-        display->height >= MARGIN_TOP             +
+        display->getheight() >= MARGIN_TOP        +
                            display->char_height*4 + /* Title + 3 sliders */
                            TITLE_MARGIN_BOTTOM    +
                            SELECTOR_TB_MARGIN*6   + /* 2 margins/slider  */
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c
index 8bbaa27..d92bccb 100644
--- a/apps/recorder/radio.c
+++ b/apps/recorder/radio.c
@@ -861,7 +861,7 @@ int radio_screen(void)
                     peak_meter_screen(&screens[i],0,
                                           STATUSBAR_HEIGHT + fh*(top_of_screen + 4), fh);
                     screens[i].update_rect(0, STATUSBAR_HEIGHT + fh*(top_of_screen + 4),
-                                           screens[i].width, fh);
+                                           screens[i].getwidth(), fh);
                     screens[i].set_viewport(NULL);
                 }
             }