1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-29 09:52:29 +01:00

*** empty log message ***

This commit is contained in:
kojima
2000-05-21 16:15:56 +00:00
parent e7771be157
commit 71f735069a
4 changed files with 25 additions and 39 deletions

View File

@@ -5,14 +5,6 @@ AUTOMAKE_OPTIONS = no-dependencies
SUBDIRS = Resources SUBDIRS = Resources
LIBLIST= $(top_builddir)/wrlib/libwraster.la\
@LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ \
-lm @LIBPL@
#lib_LTLIBRARIES = libWINGs.la
lib_LIBRARIES = libWINGs.a libWUtil.a
#libWINGs_la_LDFLAGS = -version-info 1:1:0 #libWINGs_la_LDFLAGS = -version-info 1:1:0
@@ -23,38 +15,18 @@ bin_SCRIPTS = get-wings-flags get-wutil-flags
noinst_PROGRAMS = wtest wmquery wmfile fontl testmywidget testcolorpanel\ noinst_PROGRAMS = wtest wmquery wmfile fontl testmywidget testcolorpanel\
connect puzzle connect puzzle
lib_LIBRARIES = libWINGs.a libWUtil.a
LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la\
@LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ \
-lm @LIBPL@
testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h
testmywidget_LDADD = libWINGs.a $(LIBLIST)
puzzle_SOURCES = puzzle.c
puzzle_LDADD = libWINGs.a $(LIBLIST)
fontl_SOURCES = fontl.c
fontl_LDADD = libWINGs.a $(LIBLIST)
wtest_SOURCES = wtest.c
wtest_LDADD = libWINGs.a $(LIBLIST)
wtest_DEPENDENCIES = libWINGs.a wtest_DEPENDENCIES = libWINGs.a
wmfile_SOURCES = wmfile.c
wmfile_LDADD = libWINGs.a $(LIBLIST)
testcolorpanel_SOURCES = testcolorpanel.c
testcolorpanel_LDADD = libWINGs.a $(LIBLIST)
wmquery_SOURCES = wmquery.c
wmquery_LDADD = libWINGs.a $(LIBLIST)
connect_SOURCES = connect.c
connect_LDADD = libWUtil.a @LIBRARY_SEARCH_PATH@ @NETLIBS@ @LIBPL@ connect_LDADD = libWUtil.a @LIBRARY_SEARCH_PATH@ @NETLIBS@ @LIBPL@

View File

@@ -579,7 +579,6 @@ void WMSetUDObjectForKey(WMUserDefaults *database, proplist_t object,
void WMRemoveUDObjectForKey(WMUserDefaults *database, char *defaultName); void WMRemoveUDObjectForKey(WMUserDefaults *database, char *defaultName);
/* Free the returned string when no longer needed */
char *WMGetUDStringForKey(WMUserDefaults *database, char *defaultName); char *WMGetUDStringForKey(WMUserDefaults *database, char *defaultName);
int WMGetUDIntegerForKey(WMUserDefaults *database, char *defaultName); int WMGetUDIntegerForKey(WMUserDefaults *database, char *defaultName);

View File

@@ -97,12 +97,13 @@ WMCreateAlertPanel(WMScreen *scrPtr, WMWindow *owner,
panel->retKey = XKeysymToKeycode(scrPtr->display, XK_Return); panel->retKey = XKeysymToKeycode(scrPtr->display, XK_Return);
panel->escKey = XKeysymToKeycode(scrPtr->display, XK_Escape); panel->escKey = XKeysymToKeycode(scrPtr->display, XK_Escape);
if (owner) if (owner) {
panel->win = WMCreatePanelWithStyleForWindow(owner, "alertPanel", panel->win = WMCreatePanelWithStyleForWindow(owner, "alertPanel",
WMTitledWindowMask); WMTitledWindowMask);
else } else {
panel->win = WMCreateWindowWithStyle(scrPtr, "alertPanel", panel->win = WMCreateWindowWithStyle(scrPtr, "alertPanel",
WMTitledWindowMask); WMTitledWindowMask);
}
WMSetWindowInitialPosition(panel->win, WMSetWindowInitialPosition(panel->win,
(scrPtr->rootView->size.width - WMWidgetWidth(panel->win))/2, (scrPtr->rootView->size.width - WMWidgetWidth(panel->win))/2,

View File

@@ -975,6 +975,18 @@ void testDragAndDrop(WMScreen *scr)
#include "WUtil.h" #include "WUtil.h"
void testUD()
{
WMUserDefaults *defs;
char str[32];
defs = WMGetStandardUserDefaults();
sprintf(str, "TEST DATA");
puts(str);
WMSetUDStringForKey(defs, str, "testKey");
puts(str);
}
int main(int argc, char **argv) int main(int argc, char **argv)
@@ -986,6 +998,8 @@ int main(int argc, char **argv)
/* Initialize the application */ /* Initialize the application */
WMInitializeApplication("Test", &argc, argv); WMInitializeApplication("Test", &argc, argv);
testUD();
/* /*
* Open connection to the X display. * Open connection to the X display.
*/ */