mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-19 12:28:22 +01:00
*** empty log message ***
This commit is contained in:
@@ -457,7 +457,7 @@ prepareForDragOperation(WMView *self, WMDraggingInfo *info)
|
|||||||
static Bool
|
static Bool
|
||||||
performDragOperation(WMView *self, WMDraggingInfo *info, WMData *data)
|
performDragOperation(WMView *self, WMDraggingInfo *info, WMData *data)
|
||||||
{
|
{
|
||||||
char *colorName = WMDataBytes(data);
|
char *colorName = (char*)WMDataBytes(data);
|
||||||
WMColor *color;
|
WMColor *color;
|
||||||
|
|
||||||
color = WMCreateNamedColor(W_VIEW_SCREEN(self), colorName, True);
|
color = WMCreateNamedColor(W_VIEW_SCREEN(self), colorName, True);
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ wmaker_SOURCES = \
|
|||||||
text.h
|
text.h
|
||||||
|
|
||||||
|
|
||||||
CPPFLAGS = @CPPFLAGS@ @DFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"
|
CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"
|
||||||
|
|
||||||
|
|
||||||
INCLUDES = \
|
INCLUDES = \
|
||||||
|
|||||||
@@ -427,7 +427,7 @@ typedef struct WPreferences {
|
|||||||
unsigned int noupdates:1; /* don't require ~/GNUstep (-static) */
|
unsigned int noupdates:1; /* don't require ~/GNUstep (-static) */
|
||||||
unsigned int noautolaunch:1; /* don't autolaunch apps */
|
unsigned int noautolaunch:1; /* don't autolaunch apps */
|
||||||
unsigned int norestore:1; /* don't restore session */
|
unsigned int norestore:1; /* don't restore session */
|
||||||
unsigned int createstdcmap:1; /* create std colormap */
|
unsigned int create_stdcmap:1; /* create std colormap */
|
||||||
} flags; /* internal flags */
|
} flags; /* internal flags */
|
||||||
} WPreferences;
|
} WPreferences;
|
||||||
|
|
||||||
|
|||||||
@@ -724,8 +724,8 @@ wScreenInit(int screen_number)
|
|||||||
|
|
||||||
|
|
||||||
/* will only be accounted for in PseudoColor */
|
/* will only be accounted for in PseudoColor */
|
||||||
if (wPreferences.create_stdcmap) {
|
if (wPreferences.flags.create_stdcmap) {
|
||||||
rattr.standard_colormap_mode = RCreateStdColorma;
|
rattr.standard_colormap_mode = RCreateStdColormap;
|
||||||
} else {
|
} else {
|
||||||
rattr.standard_colormap_mode = RUseStdColormap;
|
rattr.standard_colormap_mode = RUseStdColormap;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,8 +10,7 @@ bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont wkdemenu.pl
|
|||||||
EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wsetfont directjpeg.c \
|
EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wsetfont directjpeg.c \
|
||||||
wkdemenu.pl
|
wkdemenu.pl
|
||||||
|
|
||||||
INCLUDES = @DFLAGS@ -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
|
INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib @HEADER_SEARCH_PATH@
|
||||||
@HEADER_SEARCH_PATH@
|
|
||||||
|
|
||||||
# X_EXTRA_LIBS is for libproplist in systems that need -lsocket
|
# X_EXTRA_LIBS is for libproplist in systems that need -lsocket
|
||||||
liblist= @LIBRARY_SEARCH_PATH@ @LIBPL@ @X_EXTRA_LIBS@
|
liblist= @LIBRARY_SEARCH_PATH@ @LIBPL@ @X_EXTRA_LIBS@
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ lib_LIBRARIES = libWMaker.a
|
|||||||
|
|
||||||
include_HEADERS = WMaker.h
|
include_HEADERS = WMaker.h
|
||||||
|
|
||||||
INCLUDES = @DFLAGS@ @XCFLAGS@
|
INCLUDES = @XCFLAGS@
|
||||||
|
|
||||||
libWMaker_a_SOURCES = \
|
libWMaker_a_SOURCES = \
|
||||||
menu.c \
|
menu.c \
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ x86_specific.o: x86_specific.c
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
INCLUDES = @DFLAGS@ @HEADER_SEARCH_PATH@
|
INCLUDES = @HEADER_SEARCH_PATH@
|
||||||
|
|
||||||
LIBLIST = $(top_builddir)/wrlib/libwraster.la @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ -lm
|
LIBLIST = $(top_builddir)/wrlib/libwraster.la @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ -lm
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user