From 67a008937f043d89f6b25eade498d8977887e949 Mon Sep 17 00:00:00 2001 From: kojima Date: Wed, 17 Mar 1999 02:00:13 +0000 Subject: [PATCH] configure.in fix, WPrefs updates --- WPrefs.app/Appearance.c | 29 ++++++++++++++++++++++++++++- WPrefs.app/TexturePanel.c | 4 ++-- configure.in | 4 ++-- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/WPrefs.app/Appearance.c b/WPrefs.app/Appearance.c index a159d51b..2d068b44 100644 --- a/WPrefs.app/Appearance.c +++ b/WPrefs.app/Appearance.c @@ -45,6 +45,7 @@ typedef struct _Panel { /* texture list */ WMLabel *texL; WMList *texLs; + WMLabel *texsL; WMButton *newB; WMButton *editB; @@ -695,6 +696,9 @@ changePage(WMWidget *w, void *data) { _Panel *panel = (_Panel*)data; int section; + WMListItem *item; + TextureListItem *titem; + char *str; section = WMGetPopUpButtonSelectedItem(panel->secP); @@ -702,6 +706,15 @@ changePage(WMWidget *w, void *data) WMSetListPosition(panel->texLs, panel->textureIndex[section] - WMGetListNumberOfRows(panel->texLs)/2); + + item = WMGetListItem(panel->texLs, panel->textureIndex[section]); + + titem = (TextureListItem*)item->clientData; + + str = wmalloc(strlen(titem->title) + strlen(titem->texture) + 4); + sprintf(str, "%s: %s", titem->title, titem->texture); + WMSetLabelText(panel->texsL, str); + free(str); } @@ -736,6 +749,7 @@ textureDoubleClick(WMWidget *w, void *data) int i, section; WMListItem *item; TextureListItem *titem; + char *str; /* unselect old texture */ section = WMGetPopUpButtonSelectedItem(panel->secP); @@ -756,6 +770,11 @@ textureDoubleClick(WMWidget *w, void *data) panel->textureIndex[section] = i; WMRedisplayWidget(panel->texLs); + + str = wmalloc(strlen(titem->title) + strlen(titem->texture) + 4); + sprintf(str, "%s: %s", titem->title, titem->texture); + WMSetLabelText(panel->texsL, str); + free(str); } @@ -941,6 +960,12 @@ createPanel(Panel *p) */ WMSetPopUpButtonAction(panel->secP, changePage, panel); + + panel->texsL = WMCreateLabel(panel->frame); + WMResizeWidget(panel->texsL, 260, 20); + WMMoveWidget(panel->texsL, 15, 205); + WMSetLabelWraps(panel->texsL, False); + /* texture list */ font = WMBoldSystemFontOfSize(scr, 12); @@ -968,7 +993,7 @@ createPanel(Panel *p) WMHangData(panel->texLs, panel); WMSetListAction(panel->texLs, textureClick, panel); WMSetListDoubleAction(panel->texLs, textureDoubleClick, panel); - + /* command buttons */ font = WMSystemFontOfSize(scr, 10); @@ -1024,6 +1049,8 @@ createPanel(Panel *p) showData(panel); + changePage(panel->secP, panel); + fillTextureList(panel->texLs); panel->texturePanel = CreateTexturePanel(panel->win); diff --git a/WPrefs.app/TexturePanel.c b/WPrefs.app/TexturePanel.c index 3abdbfac..99efde95 100644 --- a/WPrefs.app/TexturePanel.c +++ b/WPrefs.app/TexturePanel.c @@ -707,8 +707,8 @@ ShowTexturePanel(TexturePanel *panel) Display *dpy = WMScreenDisplay(WMWidgetScreen(panel->win)); WMSetWindowUPosition(panel->win, - WidthOfScreen(DefaultScreenOfDisplay(dpy)), - HeightOfScreen(DefaultScreenOfDisplay(dpy))); + WidthOfScreen(DefaultScreenOfDisplay(dpy))/2, + HeightOfScreen(DefaultScreenOfDisplay(dpy))/2); WMMapWidget(panel->win); } diff --git a/configure.in b/configure.in index c64d468a..06f958eb 100644 --- a/configure.in +++ b/configure.in @@ -102,6 +102,8 @@ AC_CHECK_FUNCS(gethostname select poll strerror strncasecmp setpgid atexit) dnl Loading of dynamic libraries at runtime dnl ======================================= +DLLIBS="" + AC_CHECK_FUNC(dlopen, [HAVEDL="yes"], AC_CHECK_LIB(dl, dlopen, [DLLIBS="-ldl" HAVEDL="yes"], DLLIBS="" )) @@ -169,8 +171,6 @@ dnl AM_GNU_GETTEXT INTLIBS="" -DLLIBS="" - AC_CHECK_FUNC(gettext, [HAVEGETTEXT="yes"], AC_CHECK_LIB(intl, gettext, [INTLIBS="-lintl" HAVEGETTEXT="yes"], -- 2.11.4.GIT