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

Fix so OGL can build without wxBuffer

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-02-20 01:51:08 +00:00
parent ee74faf934
commit 59840ba3b1
1 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/src/ogl/mfutils.cpp
View File

@@ -30,6 +30,8 @@
#include <wx/ogl/mfutils.h> #include <wx/ogl/mfutils.h>
#include <stdio.h> #include <stdio.h>
static char _buf[1024]; // a temp buffer to use inplace of wxBuffer, which is deprecated.
static char hexArray[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', static char hexArray[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B',
'C', 'D', 'E', 'F' }; 'C', 'D', 'E', 'F' };
@@ -472,7 +474,7 @@ bool wxXMetaFile::ReadFile(char *file)
case META_DIBCREATEPATTERNBRUSH: case META_DIBCREATEPATTERNBRUSH:
{ {
wxMetaRecord *rec = new wxMetaRecord(META_DIBCREATEPATTERNBRUSH); wxMetaRecord *rec = new wxMetaRecord(META_DIBCREATEPATTERNBRUSH);
fread((void *)wxBuffer, sizeof(char), (int)((2*rdSize) - 6), handle); fread((void *)_buf, sizeof(char), (int)((2*rdSize) - 6), handle);
metaRecords.Append(rec); metaRecords.Append(rec);
gdiObjects.Append(rec); gdiObjects.Append(rec);
@@ -497,7 +499,7 @@ bool wxXMetaFile::ReadFile(char *file)
case META_CREATEPALETTE: case META_CREATEPALETTE:
{ {
wxMetaRecord *rec = new wxMetaRecord(META_CREATEPALETTE); wxMetaRecord *rec = new wxMetaRecord(META_CREATEPALETTE);
fread((void *)wxBuffer, sizeof(char), (int)((2*rdSize) - 6), handle); fread((void *)_buf, sizeof(char), (int)((2*rdSize) - 6), handle);
metaRecords.Append(rec); metaRecords.Append(rec);
gdiObjects.Append(rec); gdiObjects.Append(rec);
@@ -508,7 +510,7 @@ bool wxXMetaFile::ReadFile(char *file)
case META_CREATEBRUSH: case META_CREATEBRUSH:
{ {
wxMetaRecord *rec = new wxMetaRecord(META_CREATEBRUSH); wxMetaRecord *rec = new wxMetaRecord(META_CREATEBRUSH);
fread((void *)wxBuffer, sizeof(char), (int)((2*rdSize) - 6), handle); fread((void *)_buf, sizeof(char), (int)((2*rdSize) - 6), handle);
metaRecords.Append(rec); metaRecords.Append(rec);
gdiObjects.Append(rec); gdiObjects.Append(rec);
AddMetaRecordHandle(rec); AddMetaRecordHandle(rec);
@@ -518,7 +520,7 @@ bool wxXMetaFile::ReadFile(char *file)
case META_CREATEPATTERNBRUSH: case META_CREATEPATTERNBRUSH:
{ {
wxMetaRecord *rec = new wxMetaRecord(META_CREATEPATTERNBRUSH); wxMetaRecord *rec = new wxMetaRecord(META_CREATEPATTERNBRUSH);
fread((void *)wxBuffer, sizeof(char), (int)((2*rdSize) - 6), handle); fread((void *)_buf, sizeof(char), (int)((2*rdSize) - 6), handle);
metaRecords.Append(rec); metaRecords.Append(rec);
gdiObjects.Append(rec); gdiObjects.Append(rec);
AddMetaRecordHandle(rec); AddMetaRecordHandle(rec);
@@ -683,7 +685,7 @@ bool wxXMetaFile::ReadFile(char *file)
case META_CREATEBITMAPINDIRECT: case META_CREATEBITMAPINDIRECT:
{ {
wxMetaRecord *rec = new wxMetaRecord(META_CREATEBITMAPINDIRECT); wxMetaRecord *rec = new wxMetaRecord(META_CREATEBITMAPINDIRECT);
fread((void *)wxBuffer, sizeof(char), (int)((2*rdSize) - 6), handle); fread((void *)_buf, sizeof(char), (int)((2*rdSize) - 6), handle);
metaRecords.Append(rec); metaRecords.Append(rec);
gdiObjects.Append(rec); gdiObjects.Append(rec);
@@ -694,7 +696,7 @@ bool wxXMetaFile::ReadFile(char *file)
case META_CREATEBITMAP: case META_CREATEBITMAP:
{ {
wxMetaRecord *rec = new wxMetaRecord(META_CREATEBITMAP); wxMetaRecord *rec = new wxMetaRecord(META_CREATEBITMAP);
fread((void *)wxBuffer, sizeof(char), (int)((2*rdSize) - 6), handle); fread((void *)_buf, sizeof(char), (int)((2*rdSize) - 6), handle);
metaRecords.Append(rec); metaRecords.Append(rec);
gdiObjects.Append(rec); gdiObjects.Append(rec);
@@ -705,7 +707,7 @@ bool wxXMetaFile::ReadFile(char *file)
case META_CREATEREGION: case META_CREATEREGION:
{ {
wxMetaRecord *rec = new wxMetaRecord(META_CREATEREGION); wxMetaRecord *rec = new wxMetaRecord(META_CREATEREGION);
fread((void *)wxBuffer, sizeof(char), (int)((2*rdSize) - 6), handle); fread((void *)_buf, sizeof(char), (int)((2*rdSize) - 6), handle);
metaRecords.Append(rec); metaRecords.Append(rec);
gdiObjects.Append(rec); gdiObjects.Append(rec);
@@ -715,7 +717,7 @@ bool wxXMetaFile::ReadFile(char *file)
} }
default: default:
{ {
fread((void *)wxBuffer, sizeof(char), (int)((2*rdSize) - 6), handle); fread((void *)_buf, sizeof(char), (int)((2*rdSize) - 6), handle);
break; break;
} }
} }