Changes for BC++

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

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index 503d691a03957c6a227dde2844ef7c468e7819ed..da3b6342f1274e8269018226d010da02f2845cb6 100644 (file)
--- a/src/common/filesys.cpp
+++ b/src/common/filesys.cpp
@@ -52,7 +52,7 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
 
     l2 = l;
     for (int i = l-1; i >= 0; i--) {
-        c = loc[i];
+        c = loc[(unsigned int) i];
         if (c == _T('#')) l2 = i + 1;
         if (c == _T('.')) {ext = loc.Right(l2-i-1); break;}
         if ((c == _T('/')) || (c == _T('\\')) || (c == _T(':'))) {return wxEmptyString;}
@@ -161,15 +161,15 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
     m_Path = location;
 
     for (i = m_Path.Length()-1; i >= 0; i--)
-        if (m_Path[i] == _T('\\')) m_Path.GetWritableChar(i) = _T('/');         // wanna be windows-safe
+        if (m_Path[(unsigned int) i] == _T('\\')) m_Path.GetWritableChar(i) = _T('/');         // wanna be windows-safe
 
     if (is_dir == FALSE) 
     {
         for (i = m_Path.Length()-1; i >= 0; i--) 
        {
-            if (m_Path[i] == _T('/')) 
+            if (m_Path[(unsigned int) i] == _T('/'))
            {
-                if ((i > 1) && (m_Path[i-1] == _T('/')) && (m_Path[i-2] == _T(':'))) 
+                if ((i > 1) && (m_Path[(unsigned int) (i-1)] == _T('/')) && (m_Path[(unsigned int) (i-2)] == _T(':')))
                {
                     i -= 2;
                     continue;
@@ -180,7 +180,7 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
                     break;
                 }
             }
-        else if (m_Path[i] == _T(':')) {
+        else if (m_Path[(unsigned int) i] == _T(':')) {
             pathpos = i;
         break;
         }
@@ -189,7 +189,7 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
        {
             for (i = 0; i < (int) m_Path.Length(); i++) 
            {
-                if (m_Path[i] == _T(':')) 
+                if (m_Path[(unsigned int) i] == _T(':'))
                {
                     //m_Path << _T('/');
                     m_Path.Remove(i+1);
@@ -222,10 +222,10 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
     meta = 0;
     for (i = 0; i < ln; i++) 
     {
-        if (loc[i] == _T('\\')) loc.GetWritableChar(i) = _T('/');         // wanna be windows-safe
-        if (!meta) switch (loc[i]) 
+        if (loc[(unsigned int) i] == _T('\\')) loc.GetWritableChar(i) = _T('/');         // wanna be windows-safe
+        if (!meta) switch (loc[(unsigned int) i])
        {
-            case _T('/') : case _T(':') : case _T('#') : meta = loc[i];
+            case _T('/') : case _T(':') : case _T('#') : meta = loc[(unsigned int) i];
         }
     }
     m_LastName = wxEmptyString;

diff --git a/src/common/http.cpp b/src/common/http.cpp
index e41bea9b08c85482786c899ee83303e03514b735..f9c7722269d8a2c66f09588d06dc676f658a8b40 100644 (file)
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -239,7 +239,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
   token.NextToken();
   tmp_str2 = token.NextToken();
 
-  switch (tmp_str2[0]) {
+  switch (tmp_str2[(unsigned int) 0]) {
   case _T('1'):
     /* INFORMATION / SUCCESS */
     break;

diff --git a/src/common/unzip.c b/src/common/unzip.c
index 5e4a178bfad4624bc863c18c447d84b1fe28dfad..08dd404643483812afb50b7f7ca9183a6bb5a3fe 100644 (file)
--- a/src/common/unzip.c
+++ b/src/common/unzip.c
@@ -12,7 +12,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include "zlib.h"
+
+/* Not the right solution (paths in makefiles) but... */
+#ifdef __BORLANDC__
+#include "../common/unzip.h"
+#else
 #include "unzip.h"
+#endif
 
 #ifdef STDC
 #  include <stddef.h>

diff --git a/src/common/zipstream.cpp b/src/common/zipstream.cpp
index 806dcc5160e86daa0c0333e2b18afa215603821b..31dc722b8dba5bad0c490ffb9858744d02693577 100644 (file)
--- a/src/common/zipstream.cpp
+++ b/src/common/zipstream.cpp
@@ -24,7 +24,14 @@
 #include "wx/stream.h"
 #include "wx/wfstream.h"
 #include "wx/zipstream.h"
+
+/* Not the right solution (paths in makefiles) but... */
+#ifdef __BORLANDC__
+#include "../common/unzip.h"
+#else
 #include "unzip.h"
+#endif
+
 
 wxZipInputStream::wxZipInputStream(const wxString& archive, const wxString& file) : wxInputStream()
 {

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index fe536cb6350a437e2de878a74505594af22cc24c..fff2c88e3fbbc010ceeb2a5490cee091650ea6cb 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,4 +1,6 @@
-# This file was automatically generated by tmake at 00:42, 1999/07/27
+
+
+# This file was automatically generated by tmake at 17:00, 1999/08/06
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -288,7 +290,7 @@ all:        all_libs all_execs
 
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
         -erase $(LIBTARGET)
-       tlib $(LIBTARGET) /P512 @&&!
+       tlib $(LIBTARGET) /P1024 @&&!
 +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
 !