1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00

fixed some compilation issues with gcc-2.9x

This commit is contained in:
dan
2004-10-31 00:57:25 +00:00
parent e53ddd046f
commit 3b46cf38cd
4 changed files with 9 additions and 5 deletions

View File

@@ -5,6 +5,8 @@ Changes since version 0.91.0:
- allow disable of switch panel when SwitchPanelImages=None
- added X Input Methods support in WINGs
- fixed issues with compiling on Solaris with openwin
- reduced minimum required version number for the Xft library to 2.1.0
- fixed some compilation issues with gcc-2.9x
Changes since version 0.90.0:

View File

@@ -535,7 +535,7 @@ else
exit 1
fi
minXFT="2.1.2"
minXFT="2.1.0"
goodxft="no"
dnl

View File

@@ -1074,6 +1074,9 @@ keyboardMenu(WMenu *menu)
break;
case XK_Return:
#ifdef XK_KP_Enter
case XK_KP_Enter:
#endif
done = 2;
break;

View File

@@ -383,17 +383,16 @@ updateIconImage(WScreen *scr, WWindow *wwin)
if (rc==Success && prop_return) {
unsigned int *data = (unsigned int *)prop_return;
unsigned int pos = 0, len = 0;
unsigned int best_pos = 0, best_tmp = ~0;
extern WPreferences wPreferences;
unsigned int pos = 0, len = 0, best_pos = 0, best_tmp = ~0;
unsigned int pref_size = wPreferences.icon_size;
unsigned int pref_sq = pref_size*pref_size;
unsigned int tmp;
char *src, *dst;
RImage *new_rimage;
do {
len = data[pos+0]*data[pos+1];
unsigned int tmp = pref_sq-len;
tmp = pref_sq-len;
if (tmp < best_tmp && tmp > 0) {
best_tmp = tmp;
best_pos = pos;