fix for wxuse_iostreamh

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

diff --git a/utils/tex2rtf/src/texutils.cpp b/utils/tex2rtf/src/texutils.cpp
index 5de8abcae7fbe0feb2a3d2126d505206db492a55..ea888383fecde892e86f4853f5d98236a3434d96 100644 (file)
--- a/utils/tex2rtf/src/texutils.cpp
+++ b/utils/tex2rtf/src/texutils.cpp
@@ -402,7 +402,11 @@ void WriteTexReferences(char *filename)
 
 void ReadTexReferences(char *filename)
 {
 
 void ReadTexReferences(char *filename)
 {

+#if !wxUSE_IOSTREAMH && __WXMSW__
+  ifstream istr(filename, ios::in);
+#else

   ifstream istr(filename, ios::nocreate | ios::in);
   ifstream istr(filename, ios::nocreate | ios::in);

+#endif  

   if (istr.bad()) return;
 
   char label[100];
   if (istr.bad()) return;
 
   char label[100];


@@ -566,7 +570,11 @@ void BibReadValue(istream& istr, char *buffer, bool ignoreBraces = TRUE,
 bool ReadBib(char *filename)
 {
   char buf[300];
 bool ReadBib(char *filename)
 {
   char buf[300];

+#if !wxUSE_IOSTREAMH && __WXMSW__
+  ifstream istr(filename, ios::in);
+#else  

   ifstream istr(filename, ios::nocreate | ios::in);
   ifstream istr(filename, ios::nocreate | ios::in);

+#endif  

   if (istr.bad()) return FALSE;
 
   BibLine = 1;
   if (istr.bad()) return FALSE;
 
   BibLine = 1;


@@ -1283,7 +1291,11 @@ char *RegisterSetting(char *settingName, char *settingValue, bool interactive)
 
 bool ReadCustomMacros(char *filename)
 {
 
 bool ReadCustomMacros(char *filename)
 {

+#if !wxUSE_IOSTREAMH && __WXMSW__
+  ifstream istr(filename, ios::in);
+#else  

   ifstream istr(filename, ios::nocreate | ios::in);
   ifstream istr(filename, ios::nocreate | ios::in);

+#endif  

   if (istr.bad()) return FALSE;
 
   CustomMacroList.Clear();
   if (istr.bad()) return FALSE;
 
   CustomMacroList.Clear();