Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes for BC++

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-08-06 16:17:40 +00:00
parent 91c93c9927
commit ea4f5235fc
5 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/filesys.cpp
View File

@@ -52,7 +52,7 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
l2 = l; l2 = l;
for (int i = l-1; i >= 0; i--) { 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('#')) l2 = i + 1;
if (c == _T('.')) {ext = loc.Right(l2-i-1); break;} if (c == _T('.')) {ext = loc.Right(l2-i-1); break;}
if ((c == _T('/')) || (c == _T('\\')) || (c == _T(':'))) {return wxEmptyString;} 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; m_Path = location;
for (i = m_Path.Length()-1; i >= 0; i--) 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) if (is_dir == FALSE)
{ {
for (i = m_Path.Length()-1; i >= 0; i--) 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; i -= 2;
continue; continue;
@@ -180,7 +180,7 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
break; break;
} }
} }
else if (m_Path[i] == _T(':')) { else if (m_Path[(unsigned int) i] == _T(':')) {
pathpos = i; pathpos = i;
break; break;
} }
@@ -189,7 +189,7 @@ void wxFileSystem::ChangePathTo(const wxString& location, bool is_dir)
{ {
for (i = 0; i < (int) m_Path.Length(); i++) 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 << _T('/');
m_Path.Remove(i+1); m_Path.Remove(i+1);
@@ -222,10 +222,10 @@ wxFSFile* wxFileSystem::OpenFile(const wxString& location)
meta = 0; meta = 0;
for (i = 0; i < ln; i++) for (i = 0; i < ln; i++)
{ {
if (loc[i] == _T('\\')) loc.GetWritableChar(i) = _T('/'); // wanna be windows-safe if (loc[(unsigned int) i] == _T('\\')) loc.GetWritableChar(i) = _T('/'); // wanna be windows-safe
if (!meta) switch (loc[i]) 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; m_LastName = wxEmptyString;

2
src/common/http.cpp
View File

@@ -239,7 +239,7 @@ bool wxHTTP::BuildRequest(const wxString& path, wxHTTP_Req req)
token.NextToken(); token.NextToken();
tmp_str2 = token.NextToken(); tmp_str2 = token.NextToken();
switch (tmp_str2[0]) { switch (tmp_str2[(unsigned int) 0]) {
case _T('1'): case _T('1'):
/* INFORMATION / SUCCESS */ /* INFORMATION / SUCCESS */
break; break;

6
src/common/unzip.c
View File

@@ -12,7 +12,13 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "zlib.h" #include "zlib.h"
/* Not the right solution (paths in makefiles) but... */
#ifdef __BORLANDC__
#include "../common/unzip.h"
#else
#include "unzip.h" #include "unzip.h"
#endif
#ifdef STDC #ifdef STDC
# include <stddef.h> # include <stddef.h>

7
src/common/zipstream.cpp
View File

@@ -24,7 +24,14 @@
#include "wx/stream.h" #include "wx/stream.h"
#include "wx/wfstream.h" #include "wx/wfstream.h"
#include "wx/zipstream.h" #include "wx/zipstream.h"
/* Not the right solution (paths in makefiles) but... */
#ifdef __BORLANDC__
#include "../common/unzip.h"
#else
#include "unzip.h" #include "unzip.h"
#endif
wxZipInputStream::wxZipInputStream(const wxString& archive, const wxString& file) : wxInputStream() wxZipInputStream::wxZipInputStream(const wxString& archive, const wxString& file) : wxInputStream()
{ {

6
src/msw/makefile.b32
View File

@@ -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! # 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) $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
-erase $(LIBTARGET) -erase $(LIBTARGET)
tlib $(LIBTARGET) /P512 @&&! tlib $(LIBTARGET) /P1024 @&&!
+$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +) +$(OBJECTS:.obj =.obj +) +$(PERIPH_LIBS:.lib =.lib +)
! !