(svn r13318) -Codechange: move some functions from gui.h/misc_gui.cpp to window_gui.h/window.cpp because they belong there.

This commit is contained in:
rubidium 2008-05-29 06:49:56 +00:00
parent 7f8f5fa52c
commit 27bca407de
4 changed files with 28 additions and 27 deletions

View File

@ -61,9 +61,6 @@ void ShowErrorMessage(StringID msg_1, StringID msg_2, int x, int y);
void ShowSmallMap();
void ShowExtraViewPortWindow(TileIndex tile = INVALID_TILE);
void SetVScrollCount(Window *w, int num);
void SetVScroll2Count(Window *w, int num);
void SetHScrollCount(Window *w, int num);
void BuildFileList();
void SetFiosType(const byte fiostype);

View File

@ -717,30 +717,6 @@ void CheckRedrawStationCoverage(const Window *w)
}
}
void SetVScrollCount(Window *w, int num)
{
w->vscroll.count = num;
num -= w->vscroll.cap;
if (num < 0) num = 0;
if (num < w->vscroll.pos) w->vscroll.pos = num;
}
void SetVScroll2Count(Window *w, int num)
{
w->vscroll2.count = num;
num -= w->vscroll2.cap;
if (num < 0) num = 0;
if (num < w->vscroll2.pos) w->vscroll2.pos = num;
}
void SetHScrollCount(Window *w, int num)
{
w->hscroll.count = num;
num -= w->hscroll.cap;
if (num < 0) num = 0;
if (num < w->hscroll.pos) w->hscroll.pos = num;
}
/* Delete a character at the caret position in a text buf.
* If backspace is set, delete the character before the caret,
* else delete the character after it. */

View File

@ -2068,6 +2068,30 @@ int PositionMainToolbar(Window *w)
return w->left;
}
void SetVScrollCount(Window *w, int num)
{
w->vscroll.count = num;
num -= w->vscroll.cap;
if (num < 0) num = 0;
if (num < w->vscroll.pos) w->vscroll.pos = num;
}
void SetVScroll2Count(Window *w, int num)
{
w->vscroll2.count = num;
num -= w->vscroll2.cap;
if (num < 0) num = 0;
if (num < w->vscroll2.pos) w->vscroll2.pos = num;
}
void SetHScrollCount(Window *w, int num)
{
w->hscroll.count = num;
num -= w->hscroll.cap;
if (num < 0) num = 0;
if (num < w->hscroll.pos) w->hscroll.pos = num;
}
/**
* Relocate all windows to fit the new size of the game application screen
* @param neww New width of the game application screen

View File

@ -562,6 +562,10 @@ void ResizeButtons(Window *w, byte left, byte right);
void ResizeWindowForWidget(Window *w, int widget, int delta_x, int delta_y);
void SetVScrollCount(Window *w, int num);
void SetVScroll2Count(Window *w, int num);
void SetHScrollCount(Window *w, int num);
/**
* Sets the enabled/disabled status of a widget.