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

wxResourceBuffer changed back to char*.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
2000-03-25 23:03:52 +00:00
parent 0166fed863
commit 659755d7c2
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/common/resource.cpp
View File

@@ -99,7 +99,7 @@ bool wxResourceParseIncludeFile(const wxString& f, wxResourceTable *table = (wxR
wxResourceTable *wxDefaultResourceTable = (wxResourceTable *) NULL; wxResourceTable *wxDefaultResourceTable = (wxResourceTable *) NULL;
wxChar *wxResourceBuffer = (wxChar *) NULL; char *wxResourceBuffer = (char *) NULL;
long wxResourceBufferSize = 0; long wxResourceBufferSize = 0;
long wxResourceBufferCount = 0; long wxResourceBufferCount = 0;
int wxResourceStringPtr = 0; int wxResourceStringPtr = 0;
@@ -1488,14 +1488,14 @@ bool wxReallocateResourceBuffer()
if (!wxResourceBuffer) if (!wxResourceBuffer)
{ {
wxResourceBufferSize = 1000; wxResourceBufferSize = 1000;
wxResourceBuffer = new wxChar[wxResourceBufferSize]; wxResourceBuffer = new char[wxResourceBufferSize];
return TRUE; return TRUE;
} }
if (wxResourceBuffer) if (wxResourceBuffer)
{ {
long newSize = wxResourceBufferSize + 1000; long newSize = wxResourceBufferSize + 1000;
wxChar *tmp = new wxChar[(int)newSize]; char *tmp = new char[(int)newSize];
wxStrncpy(tmp, wxResourceBuffer, (int)wxResourceBufferCount); strncpy(tmp, wxResourceBuffer, (int)wxResourceBufferCount);
delete[] wxResourceBuffer; delete[] wxResourceBuffer;
wxResourceBuffer = tmp; wxResourceBuffer = tmp;
wxResourceBufferSize = newSize; wxResourceBufferSize = newSize;
@@ -1882,12 +1882,12 @@ bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof,
if (strcmp(wxResourceBuffer, "#define") == 0) if (strcmp(wxResourceBuffer, "#define") == 0)
{ {
wxGetResourceToken(fd); wxGetResourceToken(fd);
char *name = copystring(wxResourceBuffer); wxChar *name = copystring(wxConvLibc.cMB2WX(wxResourceBuffer));
wxGetResourceToken(fd); wxGetResourceToken(fd);
char *value = copystring(wxResourceBuffer); wxChar *value = copystring(wxConvLibc.cMB2WX(wxResourceBuffer));
if (isalpha(value[0])) if (wxIsalpha(value[0]))
{ {
int val = (int)atol(value); int val = (int)wxAtol(value);
wxResourceAddIdentifier(name, val, table); wxResourceAddIdentifier(name, val, table);
} }
else else
@@ -1905,12 +1905,12 @@ bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof,
else if (strcmp(wxResourceBuffer, "#include") == 0) else if (strcmp(wxResourceBuffer, "#include") == 0)
{ {
wxGetResourceToken(fd); wxGetResourceToken(fd);
char *name = copystring(wxResourceBuffer); wxChar *name = copystring(wxConvLibc.cMB2WX(wxResourceBuffer));
char *actualName = name; wxChar *actualName = name;
if (name[0] == '"') if (name[0] == wxT('"'))
actualName = name + 1; actualName = name + 1;
int len = strlen(name); int len = wxStrlen(name);
if ((len > 0) && (name[len-1] == '"')) if ((len > 0) && (name[len-1] == wxT('"')))
name[len-1] = 0; name[len-1] = 0;
if (!wxResourceParseIncludeFile(actualName, table)) if (!wxResourceParseIncludeFile(actualName, table))
{ {
@@ -1923,7 +1923,7 @@ bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof,
{ {
wxChar buf[300]; wxChar buf[300];
wxStrcpy(buf, _("Found ")); wxStrcpy(buf, _("Found "));
wxStrncat(buf, wxResourceBuffer, 30); wxStrncat(buf, wxConvLibc.cMB2WX(wxResourceBuffer), 30);
wxStrcat(buf, _(", expected static, #include or #define\nwhilst parsing resource.")); wxStrcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));
wxLogWarning(buf); wxLogWarning(buf);
return FALSE; return FALSE;