rename variables

This commit is contained in:
dborth 2009-08-04 04:24:17 +00:00
parent 98e8be7ce9
commit a3740011e6
2 changed files with 13 additions and 13 deletions

View File

@ -922,7 +922,7 @@ class GuiFileBrowser : public GuiElement
GuiButton * arrowDownBtn; GuiButton * arrowDownBtn;
GuiButton * scrollbarBoxBtn; GuiButton * scrollbarBoxBtn;
GuiImage * bgGameSelectionImg; GuiImage * bgFileSelectionImg;
GuiImage * scrollbarImg; GuiImage * scrollbarImg;
GuiImage * arrowDownImg; GuiImage * arrowDownImg;
GuiImage * arrowDownOverImg; GuiImage * arrowDownOverImg;
@ -931,8 +931,8 @@ class GuiFileBrowser : public GuiElement
GuiImage * scrollbarBoxImg; GuiImage * scrollbarBoxImg;
GuiImage * scrollbarBoxOverImg; GuiImage * scrollbarBoxOverImg;
GuiImageData * bgGameSelection; GuiImageData * bgFileSelection;
GuiImageData * bgGameSelectionEntry; GuiImageData * bgFileSelectionEntry;
GuiImageData * gameFolder; GuiImageData * gameFolder;
GuiImageData * scrollbar; GuiImageData * scrollbar;
GuiImageData * arrowDown; GuiImageData * arrowDown;

View File

@ -36,12 +36,12 @@ GuiFileBrowser::GuiFileBrowser(int w, int h)
btnSoundOver = new GuiSound(button_over_pcm, button_over_pcm_size, SOUND_PCM); btnSoundOver = new GuiSound(button_over_pcm, button_over_pcm_size, SOUND_PCM);
btnSoundClick = new GuiSound(button_click_pcm, button_click_pcm_size, SOUND_PCM); btnSoundClick = new GuiSound(button_click_pcm, button_click_pcm_size, SOUND_PCM);
bgGameSelection = new GuiImageData(bg_game_selection_png); bgFileSelection = new GuiImageData(bg_game_selection_png);
bgGameSelectionImg = new GuiImage(bgGameSelection); bgFileSelectionImg = new GuiImage(bgFileSelection);
bgGameSelectionImg->SetParent(this); bgFileSelectionImg->SetParent(this);
bgGameSelectionImg->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE); bgFileSelectionImg->SetAlignment(ALIGN_LEFT, ALIGN_MIDDLE);
bgGameSelectionEntry = new GuiImageData(bg_game_selection_entry_png); bgFileSelectionEntry = new GuiImageData(bg_game_selection_entry_png);
gameFolder = new GuiImageData(folder_png); gameFolder = new GuiImageData(folder_png);
scrollbar = new GuiImageData(scrollbar_png); scrollbar = new GuiImageData(scrollbar_png);
@ -106,7 +106,7 @@ GuiFileBrowser::GuiFileBrowser(int w, int h)
fileListText[i]->SetPosition(5,0); fileListText[i]->SetPosition(5,0);
fileListText[i]->SetMaxWidth(380); fileListText[i]->SetMaxWidth(380);
fileListBg[i] = new GuiImage(bgGameSelectionEntry); fileListBg[i] = new GuiImage(bgFileSelectionEntry);
fileListFolder[i] = new GuiImage(gameFolder); fileListFolder[i] = new GuiImage(gameFolder);
fileList[i] = new GuiButton(380, 26); fileList[i] = new GuiButton(380, 26);
@ -128,7 +128,7 @@ GuiFileBrowser::~GuiFileBrowser()
delete arrowDownBtn; delete arrowDownBtn;
delete scrollbarBoxBtn; delete scrollbarBoxBtn;
delete bgGameSelectionImg; delete bgFileSelectionImg;
delete scrollbarImg; delete scrollbarImg;
delete arrowDownImg; delete arrowDownImg;
delete arrowDownOverImg; delete arrowDownOverImg;
@ -137,8 +137,8 @@ GuiFileBrowser::~GuiFileBrowser()
delete scrollbarBoxImg; delete scrollbarBoxImg;
delete scrollbarBoxOverImg; delete scrollbarBoxOverImg;
delete bgGameSelection; delete bgFileSelection;
delete bgGameSelectionEntry; delete bgFileSelectionEntry;
delete gameFolder; delete gameFolder;
delete scrollbar; delete scrollbar;
delete arrowDown; delete arrowDown;
@ -198,7 +198,7 @@ void GuiFileBrowser::Draw()
if(!this->IsVisible()) if(!this->IsVisible())
return; return;
bgGameSelectionImg->Draw(); bgFileSelectionImg->Draw();
for(int i=0; i<FILE_PAGESIZE; i++) for(int i=0; i<FILE_PAGESIZE; i++)
{ {