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

Fixed compilation by removing stream inclusion

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-12-28 18:36:25 +00:00
parent 9348cc035a
commit cd84d4a071
9 changed files with 24 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/src/ogl/basic.cpp
View File

@@ -30,12 +30,6 @@
#undef new #undef new
#endif #endif
#if wxUSE_IOSTREAMH
#include <iostream.h>
#else
#include <iostream>
#endif
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include <math.h> #include <math.h>

6
contrib/src/ogl/basic2.cpp
View File

@@ -30,12 +30,6 @@
#undef new #undef new
#endif #endif
#if wxUSE_IOSTREAMH
#include <iostream.h>
#else
#include <iostream>
#endif
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
#include <math.h> #include <math.h>

6
contrib/src/ogl/canvas.cpp
View File

@@ -30,12 +30,6 @@
#undef new #undef new
#endif #endif
#if wxUSE_IOSTREAMH
#include <iostream.h>
#else
#include <iostream>
#endif
#include <ctype.h> #include <ctype.h>
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>

6
contrib/src/ogl/lines.cpp
View File

@@ -31,12 +31,6 @@
#undef new #undef new
#endif #endif
#if wxUSE_IOSTREAMH
#include <iostream.h>
#else
#include <iostream>
#endif
#include <ctype.h> #include <ctype.h>
#include <math.h> #include <math.h>

5
contrib/src/ogl/misc.cpp
View File

@@ -32,11 +32,6 @@
#undef new #undef new
#endif #endif
#if wxUSE_IOSTREAMH
#include <iostream.h>
#else
#include <iostream>
#endif
#include <ctype.h> #include <ctype.h>
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>

11
contrib/src/ogl/ogldiag.cpp
View File

@@ -30,17 +30,6 @@
#undef new #undef new
#endif #endif
#if wxUSE_IOSTREAMH
#include <iostream.h>
#include <fstream.h>
#else
#include <iostream>
#include <fstream>
#ifdef _MSC_VER
//using namespace std;
#endif
#endif
#include <ctype.h> #include <ctype.h>
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>

5
contrib/src/ogl/oglmisc.cpp
View File

@@ -32,11 +32,6 @@
#undef new #undef new
#endif #endif
#if wxUSE_IOSTREAMH
#include <iostream.h>
#else
#include <iostream>
#endif
#include <ctype.h> #include <ctype.h>
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>

13
contrib/src/xrc/xmlres.cpp
View File

@@ -1182,10 +1182,21 @@ static XRCID_record *XRCID_Records[XRCID_TABLE_SIZE] = {NULL};
XRCID_record **rec_var = (oldrec == NULL) ? XRCID_record **rec_var = (oldrec == NULL) ?
&XRCID_Records[index] : &oldrec->next; &XRCID_Records[index] : &oldrec->next;
*rec_var = new XRCID_record; *rec_var = new XRCID_record;
(*rec_var)->id = ++XRCID_LastID;
(*rec_var)->key = wxStrdup(str_id); (*rec_var)->key = wxStrdup(str_id);
(*rec_var)->next = NULL; (*rec_var)->next = NULL;
wxChar *end;
int asint = wxStrtol(str_id, &end, 10);
if (*str_id && *end == 0)
{
// if str_id was integer, keep it verbosely:
(*rec_var)->id = asint;
}
else
{
(*rec_var)->id = ++XRCID_LastID;
}
return (*rec_var)->id; return (*rec_var)->id;
} }

13
src/xrc/xmlres.cpp
View File

@@ -1182,10 +1182,21 @@ static XRCID_record *XRCID_Records[XRCID_TABLE_SIZE] = {NULL};
XRCID_record **rec_var = (oldrec == NULL) ? XRCID_record **rec_var = (oldrec == NULL) ?
&XRCID_Records[index] : &oldrec->next; &XRCID_Records[index] : &oldrec->next;
*rec_var = new XRCID_record; *rec_var = new XRCID_record;
(*rec_var)->id = ++XRCID_LastID;
(*rec_var)->key = wxStrdup(str_id); (*rec_var)->key = wxStrdup(str_id);
(*rec_var)->next = NULL; (*rec_var)->next = NULL;
wxChar *end;
int asint = wxStrtol(str_id, &end, 10);
if (*str_id && *end == 0)
{
// if str_id was integer, keep it verbosely:
(*rec_var)->id = asint;
}
else
{
(*rec_var)->id = ++XRCID_LastID;
}
return (*rec_var)->id; return (*rec_var)->id;
} }