Applied a few OS/2 patches for wxGTK.

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

diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt
index c151ad30b099728c9ca2bb18123e03abdcb179b5..838b2bd4553d9c4a9a209d2169b2f8a31d5d27da 100644 (file)
--- a/docs/gtk/install.txt
+++ b/docs/gtk/install.txt
@@ -151,11 +151,11 @@ START-UP! Just always use egcs and be happy.
 
 Please send comments and question about the OS/2 installation
 to Andrea Venturoli <a.ventu@flashnet.it> and patches to
 
 Please send comments and question about the OS/2 installation
 to Andrea Venturoli <a.ventu@flashnet.it> and patches to

-make the installation work (better) to me (Robert Roebling).
+make to me (Robert Roebling) or the wxWindows mailing list.

 
 

-You'll need OS/2 Warp (4.00FP#6), X-Free86/2 (3.3.3), 
-gtk+ (?), emx (0.9d fix 1), flex (2.5.4), yacc (1.8), 
-korn shell (5.2.13), Autoconf (?),  GNU file utilities (3.6), 
+You'll need OS/2 Warp (4.00FP#6), X-Free86/2 (3.3.3 or newer), 
+GTK+ (1.2.1 or newer), emx (0.9d fix 1), flex (2.5.4), yacc (1.8), 
+korn shell (5.2.13), Autoconf (2.13),  GNU file utilities (3.6), 

 GNU text utilities (1.3), GNU shell utilites (1.12), m4 (1.4), 
 sed (2.05), grep (2.0), Awk (3.0.3), GNU Make (3.76.1).
 
 GNU text utilities (1.3), GNU shell utilites (1.12), m4 (1.4), 
 sed (2.05), grep (2.0), Awk (3.0.3), GNU Make (3.76.1).
 


@@ -163,11 +163,17 @@ Open an OS/2 prompt and switch to the directory above.
 First set some global environment variables we need:
 
 SET CXXFLAGS=-Zmtd -D__ST_MT_ERRNO__
 First set some global environment variables we need:
 
 SET CXXFLAGS=-Zmtd -D__ST_MT_ERRNO__

+SET CFLAGS=-Zmtd -D__ST_MT_ERRNO__

 SET OSTYPE=OS2X              
 SET COMSPEC=sh
 
 Notice you can choose whatever you want, if you don't like OS2X.
 
 SET OSTYPE=OS2X              
 SET COMSPEC=sh
 
 Notice you can choose whatever you want, if you don't like OS2X.
 

+After running configure, you'll have to apply to modifications manually
+to the created Makefile:
+- Replace all ":" with ";" in the VPATH variable
+- Replace "ley.yy.c" with "lexyy.c"
+

 * Building wxGTK on SGI
 --------------------------
 
 * Building wxGTK on SGI
 --------------------------
 

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 1ce22f39b9375395717234a4cab2fe6d531bf398..87b1f4f31d0681857d0aa180c8bfa8e168ac4ab1 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -109,15 +109,21 @@ wxFileData::wxFileData( const wxString &name, const wxString &fname )
 
     struct stat buff;
     stat( m_fileName.fn_str(), &buff );
 
     struct stat buff;
     stat( m_fileName.fn_str(), &buff );

+    
+#ifndef __EMX__

     struct stat lbuff;
     lstat( m_fileName.fn_str(), &lbuff );
     struct stat lbuff;
     lstat( m_fileName.fn_str(), &lbuff );

-
+    m_isLink = S_ISLNK( lbuff.st_mode );

     struct tm *t = localtime( &lbuff.st_mtime );
     struct tm *t = localtime( &lbuff.st_mtime );

+#else
+    m_isLink = FALSE;
+    struct tm *t = localtime( &buff.st_mtime );
+#endif
+

 //  struct passwd *user = getpwuid( buff.st_uid );
 //  struct group *grp = getgrgid( buff.st_gid );
 
     m_isDir = S_ISDIR( buff.st_mode );
 //  struct passwd *user = getpwuid( buff.st_uid );
 //  struct group *grp = getgrgid( buff.st_gid );
 
     m_isDir = S_ISDIR( buff.st_mode );

-    m_isLink = S_ISLNK( lbuff.st_mode );

     m_isExe = ((buff.st_mode & S_IXUSR ) == S_IXUSR );
 
     m_size = buff.st_size;
     m_isExe = ((buff.st_mode & S_IXUSR ) == S_IXUSR );
 
     m_size = buff.st_size;

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index c4a312efbd2e1fde56791f243e28055fcd75ab6a..018bf84ca2938af2614ea60b7f111cb6ebb90304 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -64,7 +64,7 @@
         #ifdef __SUN__
             int usleep(unsigned int usec);
         #else // !Sun
         #ifdef __SUN__
             int usleep(unsigned int usec);
         #else // !Sun

-        #ifdef __EMX
+        #ifdef __EMX__

             /* I copied this from the XFree86 diffs. AV. */
             #define INCL_DOSPROCESS
             #include <os2.h>
             /* I copied this from the XFree86 diffs. AV. */
             #define INCL_DOSPROCESS
             #include <os2.h>