Compile fix for filefn.cpp

  doc update
  SGI threads use new constant names

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt
index f728dc008d01989769b2f4a49bcb9bdae26387e7..b022c9a1f6850096960ae0f107f4bfc9e4247f56 100644 (file)
--- a/docs/gtk/install.txt
+++ b/docs/gtk/install.txt
@@ -4,17 +4,10 @@
 If you compile wxWindows on Unix for the first time and don't 
 like to read install instructions just do (in the base dir):
 
 If you compile wxWindows on Unix for the first time and don't 
 like to read install instructions just do (in the base dir):
 

-./configure --without-threads

 make
 make

-
-and drink 10 coffees. Then you may log in as root and type
-
+su (PASSWORD)

 make install
 make install

-
-You can leave out the --without-threads option if you have 
-a NEW Linux distribution based on glibc (e.g. RedHat 5.1 or 
-Debian 2.0) or any other Unix that comes with Posix threads 
-or SGI threads.
+ldconfig

 
 Now create your super-application myfoo.app and compile anywhere 
 with
 
 Now create your super-application myfoo.app and compile anywhere 
 with


@@ -71,18 +64,15 @@ distributions have correct glibc 2 support:
  - Debian 2.0
  - Stampede
  - DLD 6.0
  - Debian 2.0
  - Stampede
  - DLD 6.0

+ - SuSE 6.0

  
  

-The next major version of SuSE will also support glibc 2,
-but version 5.X does not. Also Caldera and Slackware
-don't yet support glibc 2.
-

 On IRIX you can also use SGI threads if Posix-Threads
 are not present. The SGI threads will be detected by
 configure automatically.
 
 On IRIX you can also use SGI threads if Posix-Threads
 are not present. The SGI threads will be detected by
 configure automatically.
 

-You can always disable thread support by running 
+You can enable thread support by running 

 
 

-./configure "--without-threads"
+./configure "--with-threads"

 make clean
 make
   
 make clean
 make
   

diff --git a/docs/gtk/readme.txt b/docs/gtk/readme.txt
index 75cf00bdbfae420e22a99fc34d672f069fc99bf6..9c48b90956c9c0700a471d33efa94999a8c823b6 100644 (file)
--- a/docs/gtk/readme.txt
+++ b/docs/gtk/readme.txt
@@ -8,10 +8,11 @@ Information on how to install can be found in the file
 INSTALL.txt, but if you cannot wait, this should work on
 all systems
 
 INSTALL.txt, but if you cannot wait, this should work on
 all systems
 

-configure --without-threads
+configure

 make
 su (PASSWORD)
 make install
 make
 su (PASSWORD)
 make install

+ldconfig

 
 When you run into problems, please read the INSTALL.txt and
 follow those instructions. If you still don't have any success,
 
 When you run into problems, please read the INSTALL.txt and
 follow those instructions. If you still don't have any success,


@@ -22,7 +23,7 @@ DISTRIBUTION YOU USE AND WHAT ERROR WAS REPORTED. I know
 this has no effect, but I tried...
 
 This is the beta release which means that we have a feature
 this has no effect, but I tried...
 
 This is the beta release which means that we have a feature

-freeze. We'll move up to versin 2.0 rather soon and from then
+freeze. We'll move up to version 2.0 rather soon and from then

 on there will be no more binary incompatible changes. We might
 add more classes, but none that would alter the behaviour of
 the existing ones. The library produced by the install process
 on there will be no more binary incompatible changes. We might
 add more classes, but none that would alter the behaviour of
 the existing ones. The library produced by the install process

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 8131e55c3f906f6c4afe373e3daeb5a3a1fca041..b9c92f21f0c40b9fea38f4bef4ed93da811cedf6 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -41,6 +41,8 @@ typedef enum {
   wxFromEnd
 } wxSeekMode;
 
   wxFromEnd
 } wxSeekMode;
 

+WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
+

 // ----------------------------------------------------------------------------
 // functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // functions
 // ----------------------------------------------------------------------------

diff --git a/src/gtk/threadsgi.cpp b/src/gtk/threadsgi.cpp
index 556d032152d976572305aaf37bc8d5a902cb0413..8dcac3700054fd1dce12db8124643fd361053c98 100644 (file)
--- a/src/gtk/threadsgi.cpp
+++ b/src/gtk/threadsgi.cpp
@@ -66,24 +66,24 @@ wxMutexError wxMutex::Lock()
 {
   spin_lock(&(p_internal->p_mutex));
   m_locked++;
 {
   spin_lock(&(p_internal->p_mutex));
   m_locked++;

-  return MUTEX_NO_ERROR;
+  return wxMUTEX_NO_ERROR;

 }
 
 wxMutexError wxMutex::TryLock()
 {
   if (acquire_lock(&(p_internal->p_mutex)) != 0)
 }
 
 wxMutexError wxMutex::TryLock()
 {
   if (acquire_lock(&(p_internal->p_mutex)) != 0)

-    return MUTEX_BUSY;
+    return wxMUTEX_BUSY;

   m_locked++;
   m_locked++;

-  return MUTEX_NO_ERROR;
+  return wxMUTEX_NO_ERROR;

 }
 
 wxMutexError wxMutex::Unlock()
 {
   if (m_locked == 0)
 }
 
 wxMutexError wxMutex::Unlock()
 {
   if (m_locked == 0)

-    return MUTEX_UNLOCKED; 
+    return wxMUTEX_UNLOCKED; 

   release_lock(&(p_internal->p_mutex));
   m_locked--;
   release_lock(&(p_internal->p_mutex));
   m_locked--;

-  return MUTEX_NO_ERROR;
+  return wxMUTEX_NO_ERROR;

 }
 
 // GL: Don't know how it works on SGI. Wolfram ?
 }
 
 // GL: Don't know how it works on SGI. Wolfram ?


@@ -132,13 +132,13 @@ void wxThread::Exit(void* status)
 wxThreadError wxThread::Create()
 {
   if (p_internal->state != STATE_IDLE)
 wxThreadError wxThread::Create()
 {
   if (p_internal->state != STATE_IDLE)

-    return THREAD_RUNNING;
+    return wxTHREAD_RUNNING;

   p_internal->state = STATE_RUNNING;
   if (sproc(p_internal->SprocStart, PR_SALL, this) < 0) {
     p_internal->state = STATE_IDLE;
   p_internal->state = STATE_RUNNING;
   if (sproc(p_internal->SprocStart, PR_SALL, this) < 0) {
     p_internal->state = STATE_IDLE;

-    return THREAD_NO_RESOURCE;
+    return wxTHREAD_NO_RESOURCE;

   }
   }

-  return THREAD_NO_ERROR;
+  return wxTHREAD_NO_ERROR;

 }
 
 wxThreadError wxThread::Destroy()
 }
 
 wxThreadError wxThread::Destroy()


@@ -146,17 +146,17 @@ wxThreadError wxThread::Destroy()
   if (p_internal->state == STATE_RUNNING)
     p_internal->state = STATE_CANCELED;
 
   if (p_internal->state == STATE_RUNNING)
     p_internal->state = STATE_CANCELED;
 

-  return THREAD_NO_ERROR;
+  return wxTHREAD_NO_ERROR;

 }
 
 wxThreadError wxThread::Pause()
 {
 }
 
 wxThreadError wxThread::Pause()
 {

-  return THREAD_NO_ERROR;
+  return wxTHREAD_NO_ERROR;

 }
 
 wxThreadError wxThread::Resume()
 {
 }
 
 wxThreadError wxThread::Resume()
 {

-  return THREAD_NO_ERROR;
+  return wxTHREAD_NO_ERROR;

 }
 
 void *wxThread::Join()
 }
 
 void *wxThread::Join()

diff --git a/src/gtk1/threadsgi.cpp b/src/gtk1/threadsgi.cpp
index 556d032152d976572305aaf37bc8d5a902cb0413..8dcac3700054fd1dce12db8124643fd361053c98 100644 (file)
--- a/src/gtk1/threadsgi.cpp
+++ b/src/gtk1/threadsgi.cpp
@@ -66,24 +66,24 @@ wxMutexError wxMutex::Lock()
 {
   spin_lock(&(p_internal->p_mutex));
   m_locked++;
 {
   spin_lock(&(p_internal->p_mutex));
   m_locked++;

-  return MUTEX_NO_ERROR;
+  return wxMUTEX_NO_ERROR;

 }
 
 wxMutexError wxMutex::TryLock()
 {
   if (acquire_lock(&(p_internal->p_mutex)) != 0)
 }
 
 wxMutexError wxMutex::TryLock()
 {
   if (acquire_lock(&(p_internal->p_mutex)) != 0)

-    return MUTEX_BUSY;
+    return wxMUTEX_BUSY;

   m_locked++;
   m_locked++;

-  return MUTEX_NO_ERROR;
+  return wxMUTEX_NO_ERROR;

 }
 
 wxMutexError wxMutex::Unlock()
 {
   if (m_locked == 0)
 }
 
 wxMutexError wxMutex::Unlock()
 {
   if (m_locked == 0)

-    return MUTEX_UNLOCKED; 
+    return wxMUTEX_UNLOCKED; 

   release_lock(&(p_internal->p_mutex));
   m_locked--;
   release_lock(&(p_internal->p_mutex));
   m_locked--;

-  return MUTEX_NO_ERROR;
+  return wxMUTEX_NO_ERROR;

 }
 
 // GL: Don't know how it works on SGI. Wolfram ?
 }
 
 // GL: Don't know how it works on SGI. Wolfram ?


@@ -132,13 +132,13 @@ void wxThread::Exit(void* status)
 wxThreadError wxThread::Create()
 {
   if (p_internal->state != STATE_IDLE)
 wxThreadError wxThread::Create()
 {
   if (p_internal->state != STATE_IDLE)

-    return THREAD_RUNNING;
+    return wxTHREAD_RUNNING;

   p_internal->state = STATE_RUNNING;
   if (sproc(p_internal->SprocStart, PR_SALL, this) < 0) {
     p_internal->state = STATE_IDLE;
   p_internal->state = STATE_RUNNING;
   if (sproc(p_internal->SprocStart, PR_SALL, this) < 0) {
     p_internal->state = STATE_IDLE;

-    return THREAD_NO_RESOURCE;
+    return wxTHREAD_NO_RESOURCE;

   }
   }

-  return THREAD_NO_ERROR;
+  return wxTHREAD_NO_ERROR;

 }
 
 wxThreadError wxThread::Destroy()
 }
 
 wxThreadError wxThread::Destroy()


@@ -146,17 +146,17 @@ wxThreadError wxThread::Destroy()
   if (p_internal->state == STATE_RUNNING)
     p_internal->state = STATE_CANCELED;
 
   if (p_internal->state == STATE_RUNNING)
     p_internal->state = STATE_CANCELED;
 

-  return THREAD_NO_ERROR;
+  return wxTHREAD_NO_ERROR;

 }
 
 wxThreadError wxThread::Pause()
 {
 }
 
 wxThreadError wxThread::Pause()
 {

-  return THREAD_NO_ERROR;
+  return wxTHREAD_NO_ERROR;

 }
 
 wxThreadError wxThread::Resume()
 {
 }
 
 wxThreadError wxThread::Resume()
 {

-  return THREAD_NO_ERROR;
+  return wxTHREAD_NO_ERROR;

 }
 
 void *wxThread::Join()
 }
 
 void *wxThread::Join()