gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00
Code Issues Projects Releases Wiki Activity

reverted the last test commit (duh)

Browse Source
This commit is contained in:
dan
2004-07-16 18:50:58 +00:00
parent 109bb540ec
commit 474c4caf94
42 changed files with 1668 additions and 2053 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/dialog.c
View File

@@ -636,7 +636,6 @@ wIconChooserDialog(WScreen *scr, char **file, char *instance, char *class)
IconPanel *panel;
WMColor *color;
WMFont *boldFont;
Bool result;
panel = wmalloc(sizeof(IconPanel));
memset(panel, 0, sizeof(IconPanel));
@@ -785,7 +784,7 @@ wIconChooserDialog(WScreen *scr, char **file, char *instance, char *class)
/* check if the file the user selected is not the one that
* would be loaded by default with the current search path */
*file = WMGetListSelectedItem(panel->iconList)->text;
if (**file==0) {
if ((*file)[0]==0) {
wfree(*file);
*file = NULL;
} else {
@@ -804,8 +803,6 @@ wIconChooserDialog(WScreen *scr, char **file, char *instance, char *class)
*file = NULL;
}
result = panel->result;
WMReleaseFont(panel->normalfont);
WMUnmapWidget(panel->win);
@@ -818,7 +815,7 @@ wIconChooserDialog(WScreen *scr, char **file, char *instance, char *class)
XDestroyWindow(dpy, parent);
return result;
return panel->result;
}
@@ -865,10 +862,6 @@ typedef struct {
"Copyright \xa9 1997-2003 Alfredo K. Kojima <kojima@windowmaker.org>\n"\
"Copyright \xa9 1998-2003 Dan Pascu <dan@windowmaker.org>"
#define COPYRIGHT_TEXT_UTF8 \
"Copyright \xc2\xa9 1997-2003 Alfredo K. Kojima <kojima@windowmaker.org>\n"\
"Copyright \xc2\xa9 1998-2003 Dan Pascu <dan@windowmaker.org>"
static InfoPanel *thePanel = NULL;
@@ -1317,7 +1310,7 @@ wShowInfoPanel(WScreen *scr)
WMResizeWidget(panel->copyrL, 360, 40);
WMMoveWidget(panel->copyrL, 15, 185);
WMSetLabelTextAlignment(panel->copyrL, WALeft);
WMSetLabelText(panel->copyrL, COPYRIGHT_TEXT_UTF8);
WMSetLabelText(panel->copyrL, COPYRIGHT_TEXT);
/* we want the (c) character in the font, so don't use a FontSet here */
// fix this -Dan font = WMCreateFontWithFlags(scr->wmscreen, "SystemFont-11", WFNormalFont);
font = WMSystemFontOfSize(scr->wmscreen, 11);