(svn r3336) byte -> WindowClass, uint16 -> WindowNumber

This commit is contained in:
tron 2005-12-24 15:01:17 +00:00
parent 955f06b9ac
commit f2db7e7245
5 changed files with 10 additions and 10 deletions

View File

@ -191,9 +191,9 @@ uint ConvertIntDate(uint date);
/* misc functions */
void MarkTileDirty(int x, int y);
void MarkTileDirtyByTile(TileIndex tile);
void InvalidateWindow(byte cls, WindowNumber number);
void InvalidateWindowWidget(byte cls, WindowNumber number, byte widget_index);
void InvalidateWindowClasses(byte cls);
void InvalidateWindow(WindowClass cls, WindowNumber number);
void InvalidateWindowWidget(WindowClass cls, WindowNumber number, byte widget_index);
void InvalidateWindowClasses(WindowClass cls);
void DeleteWindowById(WindowClass cls, WindowNumber number);
void DeleteWindowByClass(WindowClass cls);

2
gui.h
View File

@ -126,7 +126,7 @@ extern const byte _fios_colors[];
/* network gui */
void ShowNetworkGameWindow(void);
void ShowChatWindow(StringID str, StringID caption, int maxlen, int maxwidth, byte window_class, uint16 window_number);
void ShowChatWindow(StringID str, StringID caption, int maxlen, int maxwidth, WindowClass window_class, WindowNumber window_number);
/* bridge_gui.c */
void ShowBuildBridgeWindow(uint start, uint end, byte type);

View File

@ -1397,7 +1397,7 @@ static const WindowDesc _chat_window_desc = {
ChatWindowWndProc
};
void ShowChatWindow(StringID str, StringID caption, int maxlen, int maxwidth, byte window_class, uint16 window_number)
void ShowChatWindow(StringID str, StringID caption, int maxlen, int maxwidth, WindowClass window_class, WindowNumber window_number)
{
Window *w;

View File

@ -1553,7 +1553,7 @@ int GetMenuItemIndex(const Window *w, int x, int y)
return -1;
}
void InvalidateWindow(byte cls, WindowNumber number)
void InvalidateWindow(WindowClass cls, WindowNumber number)
{
const Window* w;
@ -1572,7 +1572,7 @@ void InvalidateWidget(const Window* w, byte widget_index)
SetDirtyBlocks(w->left + wi->left, w->top + wi->top, w->left + wi->right + 1, w->top + wi->bottom + 1);
}
void InvalidateWindowWidget(byte cls, WindowNumber number, byte widget_index)
void InvalidateWindowWidget(WindowClass cls, WindowNumber number, byte widget_index)
{
const Window* w;
@ -1583,7 +1583,7 @@ void InvalidateWindowWidget(byte cls, WindowNumber number, byte widget_index)
}
}
void InvalidateWindowClasses(byte cls)
void InvalidateWindowClasses(WindowClass cls)
{
const Window* w;

View File

@ -212,8 +212,8 @@ enum WindowKeyCodes {
typedef struct WindowDesc {
int16 left, top, width, height;
byte cls;
byte parent_cls;
WindowClass cls;
WindowClass parent_cls;
uint32 flags;
const Widget *widgets;
WindowProc *proc;