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
|
||||
performDragOperation(WMView *self, WMDraggingInfo *info, WMData *data)
|
||||
{
|
||||
char *colorName = WMDataBytes(data);
|
||||
char *colorName = (char*)WMDataBytes(data);
|
||||
WMColor *color;
|
||||
|
||||
color = WMCreateNamedColor(W_VIEW_SCREEN(self), colorName, True);
|
||||
|
||||
@@ -106,7 +106,7 @@ wmaker_SOURCES = \
|
||||
text.h
|
||||
|
||||
|
||||
CPPFLAGS = @CPPFLAGS@ @DFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"
|
||||
CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"
|
||||
|
||||
|
||||
INCLUDES = \
|
||||
|
||||
@@ -422,12 +422,12 @@ typedef struct WPreferences {
|
||||
|
||||
struct {
|
||||
unsigned int nodock:1; /* don't display the dock */
|
||||
unsigned int noclip:1; /* don't display the clip */
|
||||
unsigned int noclip:1; /* don't display the clip */
|
||||
unsigned int nocpp:1; /* don't use cpp */
|
||||
unsigned int noupdates:1; /* don't require ~/GNUstep (-static) */
|
||||
unsigned int noautolaunch:1; /* don't autolaunch apps */
|
||||
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 */
|
||||
} WPreferences;
|
||||
|
||||
|
||||
@@ -724,8 +724,8 @@ wScreenInit(int screen_number)
|
||||
|
||||
|
||||
/* will only be accounted for in PseudoColor */
|
||||
if (wPreferences.create_stdcmap) {
|
||||
rattr.standard_colormap_mode = RCreateStdColorma;
|
||||
if (wPreferences.flags.create_stdcmap) {
|
||||
rattr.standard_colormap_mode = RCreateStdColormap;
|
||||
} else {
|
||||
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 \
|
||||
wkdemenu.pl
|
||||
|
||||
INCLUDES = @DFLAGS@ -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
|
||||
@HEADER_SEARCH_PATH@
|
||||
INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib @HEADER_SEARCH_PATH@
|
||||
|
||||
# X_EXTRA_LIBS is for libproplist in systems that need -lsocket
|
||||
liblist= @LIBRARY_SEARCH_PATH@ @LIBPL@ @X_EXTRA_LIBS@
|
||||
|
||||
@@ -5,7 +5,7 @@ lib_LIBRARIES = libWMaker.a
|
||||
|
||||
include_HEADERS = WMaker.h
|
||||
|
||||
INCLUDES = @DFLAGS@ @XCFLAGS@
|
||||
INCLUDES = @XCFLAGS@
|
||||
|
||||
libWMaker_a_SOURCES = \
|
||||
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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user