1
0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-09 23:34:14 +01:00

fixed bug

This commit is contained in:
kojima
2004-10-14 01:00:43 +00:00
parent 2b51c21ee5
commit 00e709cec4
2 changed files with 7 additions and 5 deletions

1
TODO
View File

@@ -13,7 +13,6 @@ To do before next release:
- figure out a better gnustep path for wprefs.app installation - figure out a better gnustep path for wprefs.app installation
- pick a good font fallback - pick a good font fallback
- figure a better fullscreen level - figure a better fullscreen level
- add default pixelsize if font doesn't define any size.
- clean up netwm hints on exit - clean up netwm hints on exit
- check whether window states are being saved/restored properly via netwm - check whether window states are being saved/restored properly via netwm
on restart/crash-restart (grep for XXX/TODO) on restart/crash-restart (grep for XXX/TODO)

View File

@@ -553,7 +553,7 @@ showData(_Panel *panel)
for (i= 0; i < WMGetPopUpButtonNumberOfItems(panel->optionP); i++) for (i= 0; i < WMGetPopUpButtonNumberOfItems(panel->optionP); i++)
{ {
char *ofont; char *ofont, *font;
item= WMGetPopUpButtonMenuItem(panel->optionP, i); item= WMGetPopUpButtonMenuItem(panel->optionP, i);
@@ -561,7 +561,10 @@ showData(_Panel *panel)
if (ofont) if (ofont)
wfree(ofont); wfree(ofont);
WMSetMenuItemRepresentedObject(item, GetStringForKey(fontOptions[i].option)); font= GetStringForKey(fontOptions[i].option);
if (font)
font= wstrdup(font);
WMSetMenuItemRepresentedObject(item, font);
} }
WMSetPopUpButtonSelectedItem(panel->optionP, 0); WMSetPopUpButtonSelectedItem(panel->optionP, 0);
@@ -581,7 +584,7 @@ storeData(_Panel *panel)
item= WMGetPopUpButtonMenuItem(panel->optionP, i); item= WMGetPopUpButtonMenuItem(panel->optionP, i);
font= WMGetMenuItemRepresentedObject(item); font= WMGetMenuItemRepresentedObject(item);
if (font) if (font && *font)
{ {
SetStringForKey(font, fontOptions[i].option); SetStringForKey(font, fontOptions[i].option);
} }