Some manual updates; in MDI sample, child frames now have default size/position ...

[wxWidgets.git] / src / common / utilscmn.cpp

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 196f506ae727910acf8f3dc14a3fdb5e51791973..235b5c146028a1fe3854c41d6dd4a3f59e3e96e6 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

-#pragma implementation "utilscmn.h"
+#pragma implementation "utils.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -56,7 +56,7 @@
 #include "../common/glob.inc"
 #endif
 
 #include "../common/glob.inc"
 #endif
 

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

 #include "windows.h"
 #endif
 
 #include "windows.h"
 #endif
 


@@ -109,7 +109,7 @@ int strncasecmp(const char *str_1, const char *str_2, size_t maxchar)
 }
 #endif
 
 }
 #endif
 

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

 
 #ifndef __GNUWIN32__
 #define strcasecmp stricmp
 
 #ifndef __GNUWIN32__
 #define strcasecmp stricmp


@@ -134,7 +134,7 @@ extern "C"
   int strncasecmp (const char *, const char *, size_t);
 }
 #endif
   int strncasecmp (const char *, const char *, size_t);
 }
 #endif

-#endif                         /* __WINDOWS__ */
+#endif                         /* __WXMSW__ */

 
 
 char *
 
 
 char *


@@ -519,7 +519,7 @@ int wxDebugStreamBuf::overflow(int WXUNUSED(i))
   char *txt = new char[len+1];
   strncpy(txt, pbase(), len);
   txt[len] = '\0';
   char *txt = new char[len+1];
   strncpy(txt, pbase(), len);
   txt[len] = '\0';

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

   OutputDebugString((LPCSTR)txt);
 #else
   fprintf(stderr, txt);
   OutputDebugString((LPCSTR)txt);
 #else
   fprintf(stderr, txt);


@@ -535,7 +535,7 @@ int wxDebugStreamBuf::sync(void)
   char *txt = new char[len+1];
   strncpy(txt, pbase(), len);
   txt[len] = '\0';
   char *txt = new char[len+1];
   strncpy(txt, pbase(), len);
   txt[len] = '\0';

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

   OutputDebugString((LPCSTR)txt);
 #else
   fprintf(stderr, txt);
   OutputDebugString((LPCSTR)txt);
 #else
   fprintf(stderr, txt);