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

diff --git a/include/wx/sckint.h b/include/wx/sckint.h
index 815d3e56a8cffd46c8b85a546a10098a21641e7e..8d90c4b133e289cb269ef3141435ab13cf664ae9 100644 (file)
--- a/include/wx/sckint.h
+++ b/include/wx/sckint.h
@@ -61,6 +61,8 @@ class SockRequest
 };
 
 class wxSocketInternal;
 };
 
 class wxSocketInternal;

+
+#if wxUSE_THREADS

 class SocketWaiter: public wxThread {
  public:
   SocketWaiter(wxSocketBase *socket, wxSocketInternal *internal);
 class SocketWaiter: public wxThread {
  public:
   SocketWaiter(wxSocketBase *socket, wxSocketInternal *internal);


@@ -100,6 +102,8 @@ class SocketRequester: public wxThread {
   wxSocketInternal *m_internal;
   int m_fd;
 };
   wxSocketInternal *m_internal;
   int m_fd;
 };

+#endif
+  // wxUSE_THREADS

 
 class wxSocketInternal {
  public:
 
 class wxSocketInternal {
  public:


@@ -126,11 +130,13 @@ class wxSocketInternal {
   SockRequest *WaitForReq();
   void EndRequest(SockRequest *req);
  public:
   SockRequest *WaitForReq();
   void EndRequest(SockRequest *req);
  public:

+  wxSocketBase *m_socket;
+#if wxUSE_THREADS

   wxMutex m_socket_locker, m_fd_locker, m_request_locker, m_end_requester;
   wxCondition m_socket_cond;
   wxMutex m_socket_locker, m_fd_locker, m_request_locker, m_end_requester;
   wxCondition m_socket_cond;

-  wxSocketBase *m_socket;

   SocketWaiter *m_thread_waiter;
   SocketRequester *m_thread_requester;
   SocketWaiter *m_thread_waiter;
   SocketRequester *m_thread_requester;

+#endif

   wxList m_requests;
   int m_fd;
   bool m_invalid_requester;
   wxList m_requests;
   int m_fd;
   bool m_invalid_requester;

diff --git a/src/jpeg/makefile.unx b/src/jpeg/makefile.unx
new file mode 100644 (file)
index 0000000..bcf905e
--- /dev/null
+++ b/src/jpeg/makefile.unx
@@ -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)
+

diff --git a/src/motif/makefile.unx b/src/motif/makefile.unx
index b664579b1927f4f1dc8e3fa858611e52b07f694a..807ecf703a0ffc389716bebc7b2d54bfe0af86e9 100644 (file)
--- a/src/motif/makefile.unx
+++ b/src/motif/makefile.unx
@@ -70,6 +70,7 @@ LIB_CPP_SRC=\
  ../common/wxchar.cpp \
  ../common/socket.cpp \
  ../common/sckaddr.cpp \
  ../common/wxchar.cpp \
  ../common/socket.cpp \
  ../common/sckaddr.cpp \

+ ../common/sckint.cpp \

  ../common/sckipc.cpp \
  ../common/protocol.cpp \
  ../common/ftp.cpp \
  ../common/sckipc.cpp \
  ../common/protocol.cpp \
  ../common/ftp.cpp \

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 2642297fd97bfd1fe596d0b39201add267560987..620a925f4e36f1329a1665c38f65c860ffa2e9b4 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -2161,7 +2161,7 @@ void wxWindow::SetValidator(const wxValidator& validator)
 {
     if ( m_windowValidator )
         delete m_windowValidator;
 {
     if ( m_windowValidator )
         delete m_windowValidator;

-    m_windowValidator = validator.Clone();
+    m_windowValidator = (wxValidator*) validator.Clone();

     
     if ( m_windowValidator )
         m_windowValidator->SetWindow(this) ;
     
     if ( m_windowValidator )
         m_windowValidator->SetWindow(this) ;