wxUSE_THREADS in sckint.h; wxMotif Clone error fixed; JPEG makefile.unx for wxMotif

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-05-09 21:42:36 +00:00
parent ba9838b991
commit a50fb9c083
4 changed files with 45 additions and 2 deletions

36
src/jpeg/makefile.unx Normal file
View File

@@ -0,0 +1,36 @@
#
# File: makefile.unx
# Author: Julian Smart
# Created: 1999
# Updated:
# Copyright: (c) 1999
#
#
# Makefile for OGL library, Unix
include ../make.env
JPEGLIB=$(WXDIR)/lib/libjpeg$(GUISUFFIX).a
all: $(JPEGLIB)
# Define library objects
OBJECTS=\
jcomapi.o jutils.o jerror.o jmemmgr.o jmemnobs.o \
jcapimin.o jcapistd.o jctrans.o jcparam.o jdatadst.o \
jcinit.o jcmaster.o jcmarker.o jcmainct.o jcprepct.o \
jccoefct.o jccolor.o jcsample.o jchuff.o jcphuff.o \
jcdctmgr.o jfdctfst.o jfdctflt.o jfdctint.o \
jdapimin.o jdapistd.o jdtrans.o jdatasrc.o \
jdmaster.o jdinput.o jdmarker.o jdhuff.o jdphuff.o \
jdmainct.o jdcoefct.o jdpostct.o jddctmgr.o jidctfst.o \
jidctflt.o jidctint.o jidctred.o jdsample.o jdcolor.o \
jquant1.o jquant2.o jdmerge.o
$(JPEGLIB) : $(OBJECTS)
ar $(AROPTIONS) $@ $(OBJECTS)
$(RANLIB) $@
clean:
rm -f $(OBJECTS) $(JPEGLIB)

View File

@@ -70,6 +70,7 @@ LIB_CPP_SRC=\
../common/wxchar.cpp \
../common/socket.cpp \
../common/sckaddr.cpp \
../common/sckint.cpp \
../common/sckipc.cpp \
../common/protocol.cpp \
../common/ftp.cpp \

View File

@@ -2161,7 +2161,7 @@ void wxWindow::SetValidator(const wxValidator& validator)
{
if ( m_windowValidator )
delete m_windowValidator;
m_windowValidator = validator.Clone();
m_windowValidator = (wxValidator*) validator.Clone();
if ( m_windowValidator )
m_windowValidator->SetWindow(this) ;