ioquake/jedi-academy
0
0
Fork 0
mirror of https://github.com/ioquake/jedi-academy.git synced 2024-11-10 07:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

use qWindow instead of Window to avoid a collision with X11 headers

Browse source
This commit is contained in:
Jonathan Gray 2013-04-22 22:38:31 +10:00
parent acc51ddf20
commit e9536dccbd
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/ui/ui_shared.cpp
View file

@ -78,7 +78,7 @@ void Menus_ShowItems(const char *menuName);
qboolean ParseRect(const char **p, rectDef_t *r);
const char *String_Alloc(const char *p);
void ToWindowCoords(float *x, float *y, windowDef_t *window);
void Window_Paint(Window *w, float fadeAmount, float fadeClamp, float fadeCycle);
void Window_Paint(qWindow *w, float fadeAmount, float fadeClamp, float fadeCycle);
int Item_ListBox_ThumbDrawPosition(itemDef_t *item);
int Item_ListBox_ThumbPosition(itemDef_t *item);
int Item_ListBox_MaxScroll(itemDef_t *item);
@ -220,7 +220,7 @@ Initializes a window structure ( windowDef_t ) with defaults
==================
*/
void Window_Init(Window *w)
void Window_Init(qWindow *w)
{
memset(w, 0, sizeof(windowDef_t));
w->borderSize = 1;
@ -8443,7 +8443,7 @@ void GradientBar_Paint(rectDef_t *rect, vec4_t color)
Window_Paint
=================
*/
void Window_Paint(Window *w, float fadeAmount, float fadeClamp, float fadeCycle)
void Window_Paint(qWindow *w, float fadeAmount, float fadeClamp, float fadeCycle)
{
//float bordersize = 0;
vec4_t color;

6
code/ui/ui_shared.h
View file

@ -349,7 +349,7 @@ typedef struct {
qhandle_t background; // background asset
} windowDef_t;
typedef windowDef_t Window;
typedef windowDef_t qWindow;
typedef struct {
vec4_t color; //
@ -382,7 +382,7 @@ typedef struct modelDef_s {
#define ITF_ISANYSABER (ITF_ISSABER|ITF_ISSABER2) //either saber
typedef struct itemDef_s {
Window window; // common positional, border, style, layout info
qWindow window; // common positional, border, style, layout info
UIRectangle textRect; // rectangle the text ( if any ) consumes
int type; // text, button, radiobutton, checkbox, textfield, listbox, combo
int alignment; // left center right
@ -435,7 +435,7 @@ typedef struct itemDef_s {
} itemDef_t;
typedef struct {
Window window;
qWindow window;
const char *font; // font
qboolean fullScreen; // covers entire screen
int itemCount; // number of items;