_MSC_VER => __VISUALC__ change

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index eefebd53edc72d6643b24ff3ee3e5196a3d05db7..fd5cd7c6447558cd1a6e392f7abaf361df634943 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DEFS_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DEFS_H_


@@ -21,27 +21,54 @@
 #include "wx/setup.h"
 #include "wx/version.h"
 
 #include "wx/setup.h"
 #include "wx/version.h"
 

-// Helps SGI compilation, apparently
-#if defined(__SGI__)
-#if defined(__GNUG__)
-#define __need_wchar_t
-#else
-/* Note I use the term __SGI_CC__ for both cc and CC, its not a good idea to
- * mix gcc and cc/CC, the name mangling is different */
-#define __SGI_CC__
-#endif
-#endif
+// ----------------------------------------------------------------------------
+// compiler and OS identification
+// ----------------------------------------------------------------------------

 
 

-#if defined(sun) || defined(__SUN__)
-# if !defined(__GNUG__)
-#  ifndef __SUNCC__
-#   define __SUNCC__
-#  endif
-# endif
-#endif
+// OS
+#if defined(__HPUX__) || defined(____SVR4____) || defined(__LINUX__) || defined(__sgi ) || defined(__unix__)
+    #ifndef __UNIX__
+        #define __UNIX__
+    #endif // Unix
+
+    // Helps SGI compilation, apparently
+    #ifdef __SGI__
+        #ifdef __GNUG__
+            #define __need_wchar_t
+        #else // !gcc
+            // Note I use the term __SGI_CC__ for both cc and CC, its not a good
+            // idea to mix gcc and cc/CC, the name mangling is different
+            #define __SGI_CC__
+        #endif // gcc/!gcc
+    #endif  // SGI
+
+    #if defined(sun) || defined(__SUN__)
+        #ifndef __GNUG__
+            #ifndef __SUNCC__
+                #define __SUNCC__
+            #endif // Sun CC
+        #endif
+    #endif // Sun
+#else   // Windows
+    #ifndef __WINDOWS__
+        #define __WINDOWS__
+    #endif  // Windows
+
+    // define another standard symbol for Microsoft Visual C++: the standard one
+    // (_MSC_VER) is also defined by Metrowerks compiler
+    #if defined(_MSC_VER) && !defined(__MWERKS__)
+        #define __VISUALC__
+    #elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
+        #define __BORLANDC__
+      #elif defined(__WATCOMC__)
+    //#define __WATCOMC__
+    #elif defined(__SC__)
+        #define __SYMANTECC__
+    #endif  // compiler
+#endif  // OS

 
 // suppress some Visual C++ warnings
 
 // suppress some Visual C++ warnings

-#ifdef _MSC_VER
+#ifdef __VISUALC__

 #   pragma warning(disable:4244)    // cobversion from double to float
 #   pragma warning(disable:4100)    // unreferenced formal parameter
 #endif
 #   pragma warning(disable:4244)    // cobversion from double to float
 #   pragma warning(disable:4100)    // unreferenced formal parameter
 #endif


@@ -124,9 +151,9 @@
     typedef unsigned int bool;
 #elif defined(__SALFORDC__)
     typedef unsigned int bool;
     typedef unsigned int bool;
 #elif defined(__SALFORDC__)
     typedef unsigned int bool;

-#elif defined(_MSC_VER) && (_MSC_VER <= 1000)
+#elif defined(__VISUALC__) && (__VISUALC__ <= 1000)

     typedef unsigned int bool;
     typedef unsigned int bool;

-#elif defined(_MSC_VER) && (_MSC_VER == 1020)
+#elif defined(__VISUALC__) && (__VISUALC__ == 1020)

     #define bool unsigned int
 #elif defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
     typedef unsigned int bool;
     #define bool unsigned int
 #elif defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
     typedef unsigned int bool;


@@ -144,7 +171,7 @@
     #endif // Sun CC
 #endif
 
     #endif // Sun CC
 #endif
 

-#if ( defined(_MSC_VER) && (_MSC_VER <= 800) ) || defined(__GNUWIN32__) || (defined(__BORLANDC__) && defined(__WIN16__)) || defined(__SC__) || defined(__SALFORDC__)
+#if ( defined(__VISUALC__) && (__VISUALC__ <= 800) ) || defined(__GNUWIN32__) || (defined(__BORLANDC__) && defined(__WIN16__)) || defined(__SC__) || defined(__SALFORDC__)

 // Not a good idea, because later system files (e.g. windows.h)
 // may try to define it. Use wxByte instead.
 // #define byte unsigned char
 // Not a good idea, because later system files (e.g. windows.h)
 // may try to define it. Use wxByte instead.
 // #define byte unsigned char


@@ -281,30 +308,6 @@ enum  ErrCode
 WXDLLEXPORT_DATA(extern const bool) wxTrue;
 WXDLLEXPORT_DATA(extern const bool) wxFalse;
 
 WXDLLEXPORT_DATA(extern const bool) wxTrue;
 WXDLLEXPORT_DATA(extern const bool) wxFalse;
 

-// ----------------------------------------------------------------------------
-// compiler and OS identification
-// ----------------------------------------------------------------------------
-
-// OS
-#if     defined(__HPUX__) || defined(____SVR4____) || defined(__LINUX__) || defined(__sgi ) || defined(__unix__)
-  #ifndef __UNIX__
-    #define __UNIX__
-  #endif
-#endif
-
-#ifndef __UNIX__                     // Windows
-  #if   defined(_MSC_VER)
-    #define __VISUALC__
-  #elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
-    #define __BORLANDC__
-  #elif defined(__WATCOMC__)
-    //#define __WATCOMC__
-  #elif defined(__SC__)
-    #define __SYMANTECC__
-  #endif  // compiler
-
-#endif  // OS
-

 // ----------------------------------------------------------------------------
 // compiler specific settings
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // compiler specific settings
 // ----------------------------------------------------------------------------


@@ -315,25 +318,18 @@ WXDLLEXPORT_DATA(extern const bool) wxFalse;
   #pragma warning(disable: 4514) // unreferenced inline func has been removed
 /*
   you might be tempted to disable this one also: triggered by CHECK and FAIL
   #pragma warning(disable: 4514) // unreferenced inline func has been removed
 /*
   you might be tempted to disable this one also: triggered by CHECK and FAIL

-  macros in debug.h, but it's, overall, is a rather useful one, so I leave it
-  and will try to find some way to disable this warning just for CHECK/FAIL.
-  Anyone?
+  macros in debug.h, but it's, overall, a rather useful one, so I leave it and
+  will try to find some way to disable this warning just for CHECK/FAIL. Anyone?

 */
   #pragma warning(disable: 4127) // conditional expression is constant
 */
   #pragma warning(disable: 4127) // conditional expression is constant

-

 #endif  // VC++
 
 #endif  // VC++
 

-#if _MSC_VER > 1010
-#undef try
-#undef except
-#undef finally
-#define except(x) catch(...)
-#elif defined(__MWERKS__)
-#undef try
-#undef except
-#undef finally
-#define except(x) catch(...)
-#endif
+#if defined(__MWERKS__)
+    #undef try
+    #undef except
+    #undef finally
+    #define except(x) catch(...)
+#endif // Metrowerks

 
 // where should i put this? we need to make sure of this as it breaks
 // the <iostream> code.
 
 // where should i put this? we need to make sure of this as it breaks
 // the <iostream> code.


@@ -402,20 +398,20 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 /*
  * Frame/dialog style flags
  */
 /*
  * Frame/dialog style flags
  */

-#define wxSTAY_ON_TOP       0x8000
-#define wxICONIZE           0x4000
-#define wxMINIMIZE          wxICONIZE
-#define wxMAXIMIZE          0x2000
-#define wxTHICK_FRAME       0x1000
-#define wxSYSTEM_MENU       0x0800
-#define wxMINIMIZE_BOX      0x0400
-#define wxMAXIMIZE_BOX      0x0200
-#define wxTINY_CAPTION_HORIZ 0x0100
-#define wxTINY_CAPTION_VERT 0x0080
-#define wxRESIZE_BOX        wxMAXIMIZE_BOX
-#define wxRESIZE_BORDER            0x0040
-#define wxDIALOG_MODAL      0x0020
-#define wxDIALOG_MODELESS   0x0000
+#define wxSTAY_ON_TOP           0x8000
+#define wxICONIZE               0x4000
+#define wxMINIMIZE              wxICONIZE
+#define wxMAXIMIZE              0x2000
+#define wxTHICK_FRAME           0x1000
+#define wxSYSTEM_MENU           0x0800
+#define wxMINIMIZE_BOX          0x0400
+#define wxMAXIMIZE_BOX          0x0200
+#define wxTINY_CAPTION_HORIZ    0x0100
+#define wxTINY_CAPTION_VERT     0x0080
+#define wxRESIZE_BOX            wxMAXIMIZE_BOX
+#define wxRESIZE_BORDER         0x0040
+#define wxDIALOG_MODAL          0x0020
+#define wxDIALOG_MODELESS       0x0000

 
 #define wxDEFAULT_FRAME_STYLE    (wxRESIZE_BORDER | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN)
 
 
 #define wxDEFAULT_FRAME_STYLE    (wxRESIZE_BORDER | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION | wxCLIP_CHILDREN)
 


@@ -423,7 +419,7 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
 #define wxDEFAULT_FRAME wxDEFAULT_FRAME_STYLE
 #endif
 
 #define wxDEFAULT_FRAME wxDEFAULT_FRAME_STYLE
 #endif
 

-#define wxDEFAULT_DIALOG_STYLE (wxSYSTEM_MENU|wxCAPTION|wxTHICK_FRAME)
+#define wxDEFAULT_DIALOG_STYLE  (wxSYSTEM_MENU|wxCAPTION|wxTHICK_FRAME)

 
 /*
  * Subwindow style flags
 
 /*
  * Subwindow style flags


@@ -671,7 +667,7 @@ enum {
   wxCROSS_HATCH,
   wxHORIZONTAL_HATCH,
   wxVERTICAL_HATCH,
   wxCROSS_HATCH,
   wxHORIZONTAL_HATCH,
   wxVERTICAL_HATCH,

-#define IS_HATCH(s)    ((s)>=wxBDIAGONAL_HATCH && (s)<=wxVERTICAL_HATCH)
+#define IS_HATCH(s)    ((s)>=wxBDIAGONAL_HATCH && (s)<=wxVERTICAL_HATCH)

 
   wxJOIN_BEVEL =     120,
   wxJOIN_MITER,
 
   wxJOIN_BEVEL =     120,
   wxJOIN_MITER,


@@ -684,7 +680,7 @@ enum {
 
 
 // Logical ops
 
 
 // Logical ops

-typedef enum 
+typedef enum

 {
   wxCLEAR,      // 0
   wxXOR,        // src XOR dst
 {
   wxCLEAR,      // 0
   wxXOR,        // src XOR dst


@@ -715,10 +711,10 @@ typedef enum
 #define  wxWINDING_RULE    2
 
 // ToolPanel in wxFrame
 #define  wxWINDING_RULE    2
 
 // ToolPanel in wxFrame

-#define        wxTOOL_TOP         1
-#define        wxTOOL_BOTTOM      2
-#define        wxTOOL_LEFT        3
-#define        wxTOOL_RIGHT       4
+#define    wxTOOL_TOP       1
+#define    wxTOOL_BOTTOM       2
+#define    wxTOOL_LEFT       3
+#define    wxTOOL_RIGHT       4

 
 // Dialog specifiers/return values
 
 
 // Dialog specifiers/return values
 


@@ -784,13 +780,13 @@ enum wxDataFormat
 
 /* Virtual keycodes */
 
 
 /* Virtual keycodes */
 

-enum wxKeyCode 
+enum wxKeyCode

 {
  WXK_BACK    =   8,
  WXK_TAB     =   9,
 {
  WXK_BACK    =   8,
  WXK_TAB     =   9,

- WXK_RETURN  = 13,
- WXK_ESCAPE  = 27,
- WXK_SPACE   = 32,
+ WXK_RETURN  =    13,
+ WXK_ESCAPE  =    27,
+ WXK_SPACE   =    32,

  WXK_DELETE  = 127,
 
  WXK_START   = 300,
  WXK_DELETE  = 127,
 
  WXK_START   = 300,


@@ -866,25 +862,25 @@ enum wxKeyCode
 
 /* OS mnemonics -- Identify the running OS (useful for Windows)
  * [Not all platforms are currently available or supported] */
 
 /* OS mnemonics -- Identify the running OS (useful for Windows)
  * [Not all platforms are currently available or supported] */

-enum 
+enum

 {
   wxUNKNOWN_PLATFORM,
 {
   wxUNKNOWN_PLATFORM,

-  wxCURSES,     /* Text-only CURSES */
-  wxXVIEW_X,   /* Sun's XView OpenLOOK toolkit */
-  wxMOTIF_X,   /* OSF Motif 1.x.x */
-  wxCOSE_X,    /* OSF Common Desktop Environment */
-  wxNEXTSTEP,  /* NeXTStep */
-  wxMACINTOSH, /* Apple System 7 */
-  wxGTK,       /* GTK */
-  wxQT,                /* Qt */
-  wxGEOS,      /* GEOS */
-  wxOS2_PM,    /* OS/2 Workplace */
-  wxWINDOWS,   /* Windows or WfW */
-  wxPENWINDOWS,        /* Windows for Pen Computing */
-  wxWINDOWS_NT,        /* Windows NT */
-  wxWIN32S,    /* Windows 32S API */
-  wxWIN95,     /* Windows 95 */
-  wxWIN386     /* Watcom 32-bit supervisor modus */
+  wxCURSES,                 // Text-only CURSES
+  wxXVIEW_X,                // Sun's XView OpenLOOK toolkit
+  wxMOTIF_X,                // OSF Motif 1.x.x
+  wxCOSE_X,                 // OSF Common Desktop Environment
+  wxNEXTSTEP,               // NeXTStep
+  wxMACINTOSH,              // Apple System 7
+  wxGTK,                    // GTK
+  wxQT,                     // Qt
+  wxGEOS,                   // GEOS
+  wxOS2_PM,                 // OS/2 Workplace
+  wxWINDOWS,                // Windows or WfW
+  wxPENWINDOWS,             // Windows for Pen Computing
+  wxWINDOWS_NT,             // Windows NT
+  wxWIN32S,                 // Windows 32S API
+  wxWIN95,                  // Windows 95
+  wxWIN386                  // Watcom 32-bit supervisor modus

 };
 
 /* Printing */
 };
 
 /* Printing */

diff --git a/include/wx/docview.h b/include/wx/docview.h
index ba1b413a12808bfcb516a46b5c4c956320adb869..d38e19be9219f5255d8bc87056f68bdcd44a5cb4 100644 (file)
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DOCH__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DOCH__


@@ -44,7 +44,7 @@ class WXDLLEXPORT wxConfigBase;
 #else
 #  include <istream>
 #  include <ostream>
 #else
 #  include <istream>
 #  include <ostream>

-#  ifdef _MSC_VER
+#  ifdef __VISUALC__

       using namespace std;
 #  endif
 #endif
       using namespace std;
 #  endif
 #endif

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index 3c7836428893b9ab6e9d105aace7e121c823c08f..1067e88f5eeb56369ee28b702497fc33e0edc5b0 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -29,16 +29,12 @@
 typedef long off_t;
 #endif
 
 typedef long off_t;
 #endif
 

-#ifdef    _MSC_VER
-  #define   off_t       _off_t
-#endif
-
-#if defined(__BORLANDC__) && defined(__WIN16__)
-typedef long off_t;
-#endif
-
-#if defined(__SC__)
-typedef long off_t;
+#if defined(__VISUALC__) || defined(__MWERKS__)
+    typedef _off_t off_t;
+#elif defined(__BORLANDC__) && defined(__WIN16__)
+    typedef long off_t;
+#elif defined(__SC__)
+    typedef long off_t;

 #endif
 
 const off_t wxInvalidOffset = (off_t)-1;
 #endif
 
 const off_t wxInvalidOffset = (off_t)-1;

diff --git a/include/wx/ioswrap.h b/include/wx/ioswrap.h
new file mode 100644 (file)
index 0000000..ce0b153
--- /dev/null
+++ b/include/wx/ioswrap.h
@@ -0,0 +1,20 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        ioswrap.h
+// Purpose:     includes the correct iostream headers for current compiler
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     03.02.99
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Licence:     wxWindows license
+///////////////////////////////////////////////////////////////////////////////
+
+#if wxUSE_IOSTREAMH
+    // N.B. BC++ doesn't have istream.h, ostream.h
+#   include <iostream.h>
+#else
+#   include <iostream>
+#   if defined(__VISUALC__) || defined(__MWERKS__)
+        using namespace std;
+#   endif
+#endif

diff --git a/include/wx/log.h b/include/wx/log.h
index ec849d8df93ab4708310a2825614f13028795649..db595e7664c1c59cf1c46ca4ffebfc4f15277209 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -57,13 +57,13 @@ class WXDLLEXPORT wxLogFrame;
 class WXDLLEXPORT wxFrame;
 
 #if wxUSE_IOSTREAMH
 class WXDLLEXPORT wxFrame;
 
 #if wxUSE_IOSTREAMH

-// N.B. BC++ doesn't have istream.h, ostream.h
-#  include <iostream.h>
+    // N.B. BC++ doesn't have istream.h, ostream.h
+#   include <iostream.h>

 #else
 #else

-#  include <ostream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
+#   include <ostream>
+#   if defined(__VISUALC__) || defined(__MWERKS__)
+        using namespace std;
+#   endif

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------

diff --git a/include/wx/memory.h b/include/wx/memory.h
index 841ea9e410b61642e39944f545766b70d35d4dbf..f9977849b58878608b2f073155338aabd5706d22 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MEMORYH__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_MEMORYH__


@@ -29,13 +29,13 @@
 #include <stddef.h>
 
 #if wxUSE_IOSTREAMH
 #include <stddef.h>
 
 #if wxUSE_IOSTREAMH

-// N.B. BC++ doesn't have istream.h, ostream.h
-#  include <iostream.h>
+    // N.B. BC++ doesn't have istream.h, ostream.h
+#   include <iostream.h>

 #else
 #else

-#  include <ostream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
+#   include <ostream>
+#   if defined(__VISUALC__) || defined(__MWERKS__)
+        using namespace std;
+#   endif

 #endif
 
 #ifdef __WXDEBUG__
 #endif
 
 #ifdef __WXDEBUG__


@@ -49,15 +49,15 @@ void wxDebugFree(void * buf, bool isVect = FALSE);
 // Undefine temporarily (new is #defined in object.h) because we want to
 // declare some new operators.
 #ifdef new
 // Undefine temporarily (new is #defined in object.h) because we want to
 // declare some new operators.
 #ifdef new

-#undef new
+    #undef new

 #endif
 
 #if defined(__SUNCC__)
 #endif
 
 #if defined(__SUNCC__)

-#define wxUSE_ARRAY_MEMORY_OPERATORS 0
-#elif !( defined (_MSC_VER) && (_MSC_VER <= 1020) ) || defined( __MWERKS__)
-#define wxUSE_ARRAY_MEMORY_OPERATORS 1
+    #define wxUSE_ARRAY_MEMORY_OPERATORS 0
+#elif !( defined (__VISUALC__) && (__VISUALC__ <= 1020) ) || defined( __MWERKS__)
+    #define wxUSE_ARRAY_MEMORY_OPERATORS 1

 #else
 #else

-#define wxUSE_ARRAY_MEMORY_OPERATORS 0
+    #define wxUSE_ARRAY_MEMORY_OPERATORS 0

 #endif
 
 // Added JACS 25/11/98: needed for some compilers
 #endif
 
 // Added JACS 25/11/98: needed for some compilers


@@ -76,9 +76,9 @@ void operator delete[] (void * buf);
 #endif
 
 // VC++ 6.0
 #endif
 
 // VC++ 6.0

-#if _MSC_VER >= 1200
-void operator delete(void *buf, char*, int);
-void operator delete[](void *buf, char*, int);
+#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
+    void operator delete(void *buf, char*, int);
+    void operator delete[](void *buf, char*, int);

 #endif
 
 #endif
 #endif
 
 #endif

diff --git a/include/wx/msw/msvcrt.h b/include/wx/msw/msvcrt.h
index 289756e3fe927a7994857a2f4b71e190f2524252..ee7db39355381dff20721fb374ebe64f12505c2b 100644 (file)
--- a/include/wx/msw/msvcrt.h
+++ b/include/wx/msw/msvcrt.h
@@ -19,12 +19,14 @@
 #ifndef _MSW_MSVCRT_H_
 #define _MSW_MSVCRT_H_
 
 #ifndef _MSW_MSVCRT_H_
 #define _MSW_MSVCRT_H_
 

-// use debug CRT functions for memory leak detections in VC++ if we're not
-// using wxWindows own methods
-#if defined(__WXDEBUG__) && defined(_MSC_VER) && !wxUSE_GLOBAL_MEMORY_OPERATORS && !defined(__NO_VC_CRTDBG__)
-    #define wxUSE_VC_CRTDBG
-#else
-    #undef wxUSE_VC_CRTDBG
+// use debug CRT functions for memory leak detections in VC++ 5.0+ in debug
+// builds
+#undef wxUSE_VC_CRTDBG
+#if defined(__WXDEBUG__) && defined(__VISUALC__) && (__VISUALC__ >= 1000)
+    // it doesn't combine well with wxWin own memory debugging methods
+    #if !wxUSE_GLOBAL_MEMORY_OPERATORS && !defined(__NO_VC_CRTDBG__)
+        #define wxUSE_VC_CRTDBG
+    #endif

 #endif
 
 #ifdef wxUSE_VC_CRTDBG
 #endif
 
 #ifdef wxUSE_VC_CRTDBG


@@ -46,4 +48,5 @@
     #define wxCrtSetDbgFlag(flag)
 #endif // wxUSE_VC_CRTDBG
 
     #define wxCrtSetDbgFlag(flag)
 #endif // wxUSE_VC_CRTDBG
 

-#endif // _MSW_MSVCRT_H_
\ No newline at end of file
+#endif // _MSW_MSVCRT_H_
+

diff --git a/include/wx/msw/ole/oleutils.h b/include/wx/msw/ole/oleutils.h
index 2335dd5468df969b2f9f894ea07a2777ddcc7408..9809d398e0003e31755f98f391ae9e99c17b39b2 100644 (file)
--- a/include/wx/msw/ole/oleutils.h
+++ b/include/wx/msw/ole/oleutils.h
@@ -2,7 +2,7 @@
 // Name:        oleutils.h
 // Purpose:     OLE helper routines, OLE debugging support &c
 // Author:      Vadim Zeitlin
 // Name:        oleutils.h
 // Purpose:     OLE helper routines, OLE debugging support &c
 // Author:      Vadim Zeitlin

-// Modified by: 
+// Modified by:

 // Created:     19.02.1998
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     19.02.1998
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>


@@ -44,7 +44,7 @@ bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount);
 // ============================================================================
 
 /*
 // ============================================================================
 
 /*

-   The most dumb implementation of IUnknown methods. We don't support 
+   The most dumb implementation of IUnknown methods. We don't support

    aggregation nor containment, but for 99% of cases this simple
    implementation is quite enough.
 
    aggregation nor containment, but for 99% of cases this simple
    implementation is quite enough.
 


@@ -121,11 +121,10 @@ bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount);
 // Debugging support
 // ============================================================================
 
 // Debugging support
 // ============================================================================
 

-#if defined(__WXDEBUG__) && defined(_MSC_VER) && (_MSC_VER > 1000)
-// ----------------------------------------------------------------------------
-// 
-// ----------------------------------------------------------------------------
-
+// VZ: I don't know it's not done for compilers other than VC++ but I leave it
+//     as is. Please note, though, that tracing OLE interface calls may be
+//     incredibly useful when debugging OLE programs.
+#if defined(__WXDEBUG__) && defined(__VISUALC__) && (__VISUALC__ >= 1000)

 // ----------------------------------------------------------------------------
 // All OLE specific log functions have DebugTrace level (as LogTrace)
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // All OLE specific log functions have DebugTrace level (as LogTrace)
 // ----------------------------------------------------------------------------


@@ -143,4 +142,5 @@ void wxLogRelease(const char *szInterface, ULONG cRef);
   #define   wxLogRelease(szInterface, cRef)
 #endif  //WXDEBUG
 
   #define   wxLogRelease(szInterface, cRef)
 #endif  //WXDEBUG
 

-#endif  //_WX_OLEUTILS_H
\ No newline at end of file
+#endif  //_WX_OLEUTILS_H
+

diff --git a/include/wx/object.h b/include/wx/object.h
index b914b190dc62031c0d9abc305f9e2cfb074a2889..abd725a3f2953e6782dd5029450a6d1cb6483845 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_OBJECTH__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_OBJECTH__


@@ -40,13 +40,13 @@ class WXDLLEXPORT wxHashTable;
 class WXDLLEXPORT wxObject_Serialize;
 
 #if wxUSE_IOSTREAMH
 class WXDLLEXPORT wxObject_Serialize;
 
 #if wxUSE_IOSTREAMH

-// N.B. BC++ doesn't have istream.h, ostream.h
-#  include <iostream.h>
+    // N.B. BC++ doesn't have istream.h, ostream.h
+#   include <iostream.h>

 #else
 #else

-#  include <ostream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
+#   include <ostream>
+#   if defined(__VISUALC__) || defined(__MWERKS__)
+        using namespace std;
+#   endif

 #endif
 
 /*
 #endif
 
 /*


@@ -61,7 +61,7 @@ class WXDLLEXPORT wxClassInfo
    wxClassInfo(char *cName, char *baseName1, char *baseName2, int sz, wxObjectConstructorFn fn);
 
    wxObject *CreateObject(void);
    wxClassInfo(char *cName, char *baseName1, char *baseName2, int sz, wxObjectConstructorFn fn);
 
    wxObject *CreateObject(void);

-   
+

    inline char *GetClassName(void) const { return m_className; }
    inline char *GetBaseClassName1(void) const { return m_baseClassName1; }
    inline char *GetBaseClassName2(void) const { return m_baseClassName2; }
    inline char *GetClassName(void) const { return m_className; }
    inline char *GetBaseClassName1(void) const { return m_baseClassName1; }
    inline char *GetBaseClassName2(void) const { return m_baseClassName2; }


@@ -87,7 +87,7 @@ public:
    char*                    m_baseClassName2;
    int                      m_objectSize;
    wxObjectConstructorFn    m_objectConstructor;
    char*                    m_baseClassName2;
    int                      m_objectSize;
    wxObjectConstructorFn    m_objectConstructor;

-   
+

    // Pointers to base wxClassInfos: set in InitializeClasses
    // called from wx_main.cc
    wxClassInfo*             m_baseInfo1;
    // Pointers to base wxClassInfos: set in InitializeClasses
    // called from wx_main.cc
    wxClassInfo*             m_baseInfo1;


@@ -198,13 +198,12 @@ class WXDLLEXPORT wxObject
   void operator delete (void * buf);
 
 // VC++ 6.0
   void operator delete (void * buf);
 
 // VC++ 6.0

-#if _MSC_VER >= 1200
+#if defined(__VISUALC__) && (__VISUALC__ >= 1200)

   void operator delete(void *buf, char*, int);
 #endif
 
   void operator delete(void *buf, char*, int);
 #endif
 

-  // Cause problems for VC++
-// #ifndef _MSC_VER
-#if !defined(_MSC_VER) && wxUSE_ARRAY_MEMORY_OPERATORS
+    // Causes problems for VC++
+#if wxUSE_ARRAY_MEMORY_OPERATORS && !defined(__VISUALC__)

   void * operator new[] (size_t size, char * fileName = NULL, int lineNum = 0);
   void operator delete[] (void * buf);
 #endif
   void * operator new[] (size_t size, char * fileName = NULL, int lineNum = 0);
   void operator delete[] (void * buf);
 #endif


@@ -216,7 +215,7 @@ class WXDLLEXPORT wxObject
 #endif
 */
 
 #endif
 */
 

-#endif
+#endif // Debug & memory tracing

 
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
   virtual void Dump(ostream& str);
 
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
   virtual void Dump(ostream& str);

diff --git a/include/wx/string.h b/include/wx/string.h
index 541332d4ae42e655cec9bf6911eb25daa952013b..d385f10b615b645e2ee991c2a32e005f7048e825 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -16,15 +16,10 @@
 #pragma interface "string.h"
 #endif
 
 #pragma interface "string.h"
 #endif
 

-/* Dependencies (should be included before this header):
- *         string.h
- *         stdio.h
- *         stdarg.h
- *         limits.h
- */

 #ifdef __WXMAC__
 #ifdef __WXMAC__

-#include <ctype.h>
+    #include <ctype.h>

 #endif
 #endif

+

 #include <string.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdarg.h>


@@ -32,11 +27,12 @@
 #include <stdlib.h>
 
 #ifndef  WX_PRECOMP
 #include <stdlib.h>
 
 #ifndef  WX_PRECOMP

-  #include "wx/defs.h"     // Robert Roebling
+  #include "wx/defs.h"
+

   #ifdef    WXSTRING_IS_WXOBJECT
     #include "wx/object.h"
   #endif
   #ifdef    WXSTRING_IS_WXOBJECT
     #include "wx/object.h"
   #endif

-#endif
+#endif // !PCH

 
 #include "wx/debug.h"
 
 
 #include "wx/debug.h"
 


@@ -83,7 +79,7 @@ inline size_t WXDLLEXPORT Strlen(const char *psz)
 // portable strcasecmp/_stricmp
 inline int WXDLLEXPORT Stricmp(const char *psz1, const char *psz2)
 {
 // portable strcasecmp/_stricmp
 inline int WXDLLEXPORT Stricmp(const char *psz1, const char *psz2)
 {

-#if     defined(_MSC_VER)
+#if     defined(__VISUALC__) || defined(__MWERKS__)

   return _stricmp(psz1, psz2);
 #elif     defined(__SC__)
   return _stricmp(psz1, psz2);
   return _stricmp(psz1, psz2);
 #elif     defined(__SC__)
   return _stricmp(psz1, psz2);


@@ -645,7 +641,7 @@ public:
   size_t find(const wxString& str, size_t nStart = 0) const;
 
   // VC++ 1.5 can't cope with this syntax.
   size_t find(const wxString& str, size_t nStart = 0) const;
 
   // VC++ 1.5 can't cope with this syntax.

-#if !(defined(_MSC_VER) && !defined(__WIN32__))
+#if !defined(__VISUALC__) || defined(__WIN32__)

     // find first n characters of sz
   size_t find(const char* sz, size_t nStart = 0, size_t n = npos) const;
 #endif
     // find first n characters of sz
   size_t find(const char* sz, size_t nStart = 0, size_t n = npos) const;
 #endif


@@ -661,7 +657,7 @@ public:
   size_t rfind(const wxString& str, size_t nStart = npos) const;
 
   // VC++ 1.5 can't cope with this syntax.
   size_t rfind(const wxString& str, size_t nStart = npos) const;
 
   // VC++ 1.5 can't cope with this syntax.

-#if ! (defined(_MSC_VER) && !defined(__WIN32__))
+#if !defined(__VISUALC__) || defined(__WIN32__)

     // as find, but from the end
   size_t rfind(const char* sz, size_t nStart = npos,
           size_t n = npos) const;
     // as find, but from the end
   size_t rfind(const char* sz, size_t nStart = npos,
           size_t n = npos) const;


@@ -854,19 +850,7 @@ wxString WXDLLEXPORT operator+(const char *psz, const wxString& string);
 
 #ifdef wxSTD_STRING_COMPATIBILITY
 
 
 #ifdef wxSTD_STRING_COMPATIBILITY
 

-// forward declare iostream
-// Known not to work with wxUSE_IOSTREAMH set to 0, so
-// replacing with includes (on advice of ungod@pasdex.com.au)
-// class WXDLLEXPORT istream;
-#if wxUSE_IOSTREAMH
-// N.B. BC++ doesn't have istream.h, ostream.h
-#include <iostream.h>
-#else
-#include <istream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
-#endif
+#include "wx/ioswrap.h"

 
 WXDLLEXPORT istream& operator>>(istream& is, wxString& str);
 
 
 WXDLLEXPORT istream& operator>>(istream& is, wxString& str);
 

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 483e0caf07c84f753d2a600b07bbaa018d356633..037cfc61b2f7522146b646d65410110519fd1c3e 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UTILSH__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UTILSH__


@@ -23,14 +23,7 @@
 #include "wx/filefn.h"
 #include "wx/process.h"
 
 #include "wx/filefn.h"
 #include "wx/process.h"
 

-#if wxUSE_IOSTREAMH
-#include <iostream.h>
-#else
-#include <iostream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
-#endif
+#include "wx/ioswrap.h"

 
 #ifdef __X__
 #ifndef __VMS__
 
 #ifdef __X__
 #ifndef __VMS__

diff --git a/include/wx/variant.h b/include/wx/variant.h
index 4956e3283acf7ee9ad87b22d2819dd206ae6af36..a52b72239cdd6617e278a3878204ea359fcfaf6b 100644 (file)
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -6,7 +6,7 @@
 // Created:     10/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Created:     10/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c)

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VARIANT_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VARIANT_H_


@@ -22,18 +22,11 @@
 #include "wx/list.h"
 
 #if wxUSE_TIMEDATE
 #include "wx/list.h"
 
 #if wxUSE_TIMEDATE

-#include "wx/time.h"
-#include "wx/date.h"
-#endif
+    #include "wx/time.h"
+    #include "wx/date.h"
+#endif // time/date

 
 

-#if wxUSE_IOSTREAMH
-#include <iostream.h>
-#else
-#include <iostream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
-#endif
+#include "wx/ioswrap.h"

 
 /*
  * wxVariantData stores the actual data in a wxVariant object,
 
 /*
  * wxVariantData stores the actual data in a wxVariant object,

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 9083a4c7bfd8f71773c6b520b2edba6410649eee..b2e27e27964423bf91544832b9450bbff0104119 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -22,11 +22,11 @@
 #endif
 
 // only do Unicode for Windows (VC++), for now
 #endif
 
 // only do Unicode for Windows (VC++), for now

-#if defined(_MSC_VER) && defined(__WIN32__)
+#if defined(__VISUALC__) && defined(__WIN32__)

 
 #include <tchar.h>
 typedef  _TCHAR      wxChar;
 
 #include <tchar.h>
 typedef  _TCHAR      wxChar;

-typedef  _TSCHAR        wxSChar;
+typedef  _TSCHAR     wxSChar;

 typedef  _TUCHAR     wxUChar;
 
    // ctype.h functions
 typedef  _TUCHAR     wxUChar;
 
    // ctype.h functions


@@ -120,11 +120,11 @@ typedef  _TUCHAR     wxUChar;
 #error   "Please define your compiler's Unicode conventions in wxChar.h"
 #endif
 
 #error   "Please define your compiler's Unicode conventions in wxChar.h"
 #endif
 

-typedef char           wxChar;
-typedef signed char            wxSChar;
-typedef unsigned char  wxUChar;
+typedef char            wxChar;
+typedef signed char     wxSChar;
+typedef unsigned char   wxUChar;

 
 

-#define _T(x)          x
+#define _T(x)           x

 
    // ctype.h functions
 #define  wxIsalnum   isalnum
 
    // ctype.h functions
 #define  wxIsalnum   isalnum


@@ -212,7 +212,7 @@ inline bool WXDLLEXPORT wxIsEmpty(const wxChar *p) { return !p || !*p; }
 
 /// safe version of strlen() (returns 0 if passed NULL pointer)
 inline size_t  WXDLLEXPORT wxStrlen(const wxChar *psz)
 
 /// safe version of strlen() (returns 0 if passed NULL pointer)
 inline size_t  WXDLLEXPORT wxStrlen(const wxChar *psz)

-#if defined(_MSC_VER)
+#if defined(__VISUALC__)

    { return psz ? _tcslen(psz) : 0; }
 #else
    { return psz ? strlen(psz) : 0; }
    { return psz ? _tcslen(psz) : 0; }
 #else
    { return psz ? strlen(psz) : 0; }


@@ -220,7 +220,7 @@ inline size_t  WXDLLEXPORT wxStrlen(const wxChar *psz)
 
 /// portable strcasecmp/_stricmp
 inline int WXDLLEXPORT wxStricmp(const wxChar *, const wxChar *)
 
 /// portable strcasecmp/_stricmp
 inline int WXDLLEXPORT wxStricmp(const wxChar *, const wxChar *)

-#if defined(_MSC_VER)
+#if defined(__VISUALC__)

    { return _tcsicmp(psz1, psz2); }
 #elif defined(__BORLANDC__)
    { return stricmp(psz1, psz2); }
    { return _tcsicmp(psz1, psz2); }
 #elif defined(__BORLANDC__)
    { return stricmp(psz1, psz2); }


@@ -239,7 +239,7 @@ inline int WXDLLEXPORT wxStricmp(const wxChar *, const wxChar *)
 
     return c1 - c2;
   */
 
     return c1 - c2;
   */

-  
+

   #error  "Please define string case-insensitive compare for your OS/compiler"
 #endif  // OS/compiler
 
   #error  "Please define string case-insensitive compare for your OS/compiler"
 #endif  // OS/compiler
 

diff --git a/include/wx/wxexpr.h b/include/wx/wxexpr.h
index 76aad36b0d36114d0dcd30b80749c8159022d870..613726f8416d47826de6ebbf12aec46671bf40fc 100644 (file)
--- a/include/wx/wxexpr.h
+++ b/include/wx/wxexpr.h
@@ -21,14 +21,7 @@
 #include "wx/defs.h"
 #include "wx/string.h"
 
 #include "wx/defs.h"
 #include "wx/string.h"
 

-#if wxUSE_IOSTREAMH
-#include <iostream.h>
-#else
-#include <iostream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
-#endif
+#include "wx/ioswrap.h"

 
 #include "wx/list.h"
 #include "wx/hash.h"
 
 #include "wx/list.h"
 #include "wx/hash.h"

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index b1a93f2493be898a4e6de14b73d4fecc27732ee1..eff6f75395b835e006ab132c775bd4e0008c570e 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -6,19 +6,19 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c)

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // check if to use precompiled headers
 /////////////////////////////////////////////////////////////////////////////
 
 // check if to use precompiled headers

-#if (defined(__BORLANDC__) || defined(_MSC_VER) || defined(__WATCOMC__)) && defined(__WXMSW__)
-#if !NOPCH
-#define WX_PRECOMP
-#endif
+#if (defined(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__)
+    #if !NOPCH
+        #define WX_PRECOMP
+    #endif

 #endif
 
 // For some reason, this must be defined for common dialogs to work.
 #ifdef __WATCOMC__
 #endif
 
 // For some reason, this must be defined for common dialogs to work.
 #ifdef __WATCOMC__

-#define INCLUDE_COMMDLG_H      1
+#define INCLUDE_COMMDLG_H  1

 #endif
 
 // include the wx definitions
 #endif
 
 // include the wx definitions

diff --git a/src/common/docmdi.cpp b/src/common/docmdi.cpp
index 0379f04ff8850eb12ac03a87b31d88231f8db534..e188c03a1238b26521bb90a7fe4840df4ce7c64f 100644 (file)
--- a/src/common/docmdi.cpp
+++ b/src/common/docmdi.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index ae846c0c8fdac6793336c59e6a17bce2a063c2f2..47fc1beea027c5fe807bec6c6b0d14acb25814c2 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -51,15 +51,12 @@
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
 

+#include "wx/ioswrap.h"
+

 #if wxUSE_IOSTREAMH
 #if wxUSE_IOSTREAMH

-#include <iostream.h>
-#include <fstream.h>
+    #include <fstream.h>

 #else
 #else

-#include <iostream>
-#include <fstream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
+    #include <fstream>

 #endif
 
 #if !USE_SHARED_LIBRARY
 #endif
 
 #if !USE_SHARED_LIBRARY

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 604aaa207794cfe6ef14a4bbe59de4e4c10cf8cf..127a04feb4f4e1d4920188c2ee66aa3067b5e0c0 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -15,7 +15,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__

-#pragma implementation "file.h"
+    #pragma implementation "file.h"

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


@@ -23,7 +23,7 @@
 #include "wx/defs.h"
 
 #ifdef __BORLANDC__
 #include "wx/defs.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 // standard
 #endif
 
 // standard


@@ -55,37 +55,34 @@
 
   #include  <windows.h>     // for GetTempFileName
 #elif (defined(__UNIX__) || defined(__GNUWIN32__))
 
   #include  <windows.h>     // for GetTempFileName
 #elif (defined(__UNIX__) || defined(__GNUWIN32__))

-  #include  <unistd.h>
-#ifdef __GNUWIN32__
-  #include <windows.h>
-#endif
+    #include  <unistd.h>
+    #ifdef __GNUWIN32__
+        #include <windows.h>
+    #endif

 #elif (defined(__WXSTUBS__))
 #elif (defined(__WXSTUBS__))

-  // Have to ifdef this for different environments
-  #include <io.h>
+    // Have to ifdef this for different environments
+    #include <io.h>

 #elif (defined(__WXMAC__))
 #elif (defined(__WXMAC__))

-  int access( const char *path, int mode ) { return 0 ; }
-  char* mktemp( char * path ) { return path ;}
-  #include  <unistd.h>
-  #include  <unix.h>
-  #define   W_OK        2
-  #define   R_OK        4
+    int access( const char *path, int mode ) { return 0 ; }
+    char* mktemp( char * path ) { return path ;}
+    #include  <unistd.h>
+    #include  <unix.h>
+    #define   W_OK        2
+    #define   R_OK        4

 #else
 #else

-  #error  "Please specify the header with file functions declarations."
+    #error  "Please specify the header with file functions declarations."

 #endif  //Win/UNIX
 
 #include  <stdio.h>       // SEEK_xxx constants
 #include  <fcntl.h>       // O_RDONLY &c
 
 #ifndef __MWERKS__
 #endif  //Win/UNIX
 
 #include  <stdio.h>       // SEEK_xxx constants
 #include  <fcntl.h>       // O_RDONLY &c
 
 #ifndef __MWERKS__

-#include  <sys/types.h>   // needed for stat
-#include  <sys/stat.h>    // stat
+    #include  <sys/types.h>   // needed for stat
+    #include  <sys/stat.h>    // stat

 #endif
 
 // Microsoft compiler loves underscores, feed them to it
 #endif
 
 // Microsoft compiler loves underscores, feed them to it

-#ifdef    _MSC_VER
-
-  #ifndef __MWERKS__
-
+#ifdef  __VISUALC__

   // functions
   #define   open        _open
   #define   close       _close
   // functions
   #define   open        _open
   #define   close       _close


@@ -100,7 +97,7 @@
   #define   stat        _stat
 
   // constants
   #define   stat        _stat
 
   // constants

-  
+

   #define   O_RDONLY    _O_RDONLY
   #define   O_WRONLY    _O_WRONLY
   #define   O_RDWR      _O_RDWR
   #define   O_RDONLY    _O_RDONLY
   #define   O_WRONLY    _O_WRONLY
   #define   O_RDWR      _O_RDWR


@@ -110,16 +107,11 @@
 
   #define   S_IFDIR     _S_IFDIR
   #define   S_IFREG     _S_IFREG
 
   #define   S_IFDIR     _S_IFDIR
   #define   S_IFREG     _S_IFREG

-  
-  #endif
-
-  #define   W_OK        2
-  #define   R_OK        4

 #else
   #define   tell(fd)    lseek(fd, 0, SEEK_CUR)
 #else
   #define   tell(fd)    lseek(fd, 0, SEEK_CUR)

-#endif  //_MSC_VER
+#endif  // VC++

 
 

-#ifdef __BORLANDC__
+#if defined(__BORLANDC__) || defined(_MSC_VER)

   #define   W_OK        2
   #define   R_OK        4
 #endif
   #define   W_OK        2
   #define   R_OK        4
 #endif


@@ -129,9 +121,8 @@
   #define   O_BINARY    (0)
 #endif  //__UNIX__
 
   #define   O_BINARY    (0)
 #endif  //__UNIX__
 

-

 #ifdef __SALFORDC__
 #ifdef __SALFORDC__

-#include <unix.h>
+    #include <unix.h>

 #endif
 
 // wxWindows
 #endif
 
 // wxWindows


@@ -141,13 +132,13 @@
 #include  <wx/log.h>
 
 #ifndef MAX_PATH
 #include  <wx/log.h>
 
 #ifndef MAX_PATH

-#define MAX_PATH 512
+    #define MAX_PATH 512

 #endif
 
 #ifdef __WXMAC__
 #endif
 
 #ifdef __WXMAC__

-char gwxMacFileName[ MAX_PATH ] ;
-char gwxMacFileName2[ MAX_PATH ] ;
-char gwxMacFileName3[ MAX_PATH ] ;
+    char gwxMacFileName[ MAX_PATH ] ;
+    char gwxMacFileName2[ MAX_PATH ] ;
+    char gwxMacFileName3[ MAX_PATH ] ;

 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================


@@ -213,7 +204,7 @@ bool wxFile::Create(const char *szFileName, bool bOverwrite, int accessMode)
   // if bOverwrite we create a new file or truncate the existing one,
   // otherwise we only create the new file and fail if it already exists
 #ifdef __SALFORDC__
   // if bOverwrite we create a new file or truncate the existing one,
   // otherwise we only create the new file and fail if it already exists
 #ifdef __SALFORDC__

-  int fd = open(szFileName, O_WRONLY | O_CREAT | 
+  int fd = open(szFileName, O_WRONLY | O_CREAT |

                 (bOverwrite ? O_TRUNC : O_EXCL));
 #else
   int fd = open(szFileName, O_WRONLY | O_CREAT |
                 (bOverwrite ? O_TRUNC : O_EXCL));
 #else
   int fd = open(szFileName, O_WRONLY | O_CREAT |


@@ -330,7 +321,7 @@ size_t wxFile::Write(const void *pBuf, size_t nCount)
 bool wxFile::Flush()
 {
   if ( IsOpened() ) {
 bool wxFile::Flush()
 {
   if ( IsOpened() ) {

-    #if (defined(_MSC_VER) && !defined(__MWERKS__)) || wxHAVE_FSYNC
+    #if defined(__VISUALC__) || wxHAVE_FSYNC

         if ( fsync(m_fd) == -1 )
         {
             wxLogSysError(_("can't flush file descriptor %d"), m_fd);
         if ( fsync(m_fd) == -1 )
         {
             wxLogSysError(_("can't flush file descriptor %d"), m_fd);


@@ -399,9 +390,9 @@ off_t wxFile::Length() const
 {
   wxASSERT( IsOpened() );
 
 {
   wxASSERT( IsOpened() );
 

-  #if defined(  _MSC_VER ) && !defined( __MWERKS__ )
+  #ifdef __VISUALC__

     int iRc = _filelength(m_fd);
     int iRc = _filelength(m_fd);

-  #else
+  #else // !VC++

     int iRc = tell(m_fd);
     if ( iRc != -1 ) {
       // @ have to use const_cast :-(
     int iRc = tell(m_fd);
     if ( iRc != -1 ) {
       // @ have to use const_cast :-(


@@ -416,8 +407,7 @@ off_t wxFile::Length() const
 
       iRc = iLen;
     }
 
       iRc = iLen;
     }

-
-  #endif  //_MSC_VER
+  #endif  // VC++

 
   if ( iRc == -1 ) {
     wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd);
 
   if ( iRc == -1 ) {
     wxLogSysError(_("can't find length of file on file descriptor %d"), m_fd);

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index e828319ae0913c893c5baca622430c24d81793ff..c220105aba4885ae2099d7570ff2648fbd8096e8 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -29,7 +29,7 @@
 #include <wx/intl.h>
 
 // there are just too many of those...
 #include <wx/intl.h>
 
 // there are just too many of those...

-#ifdef _MSC_VER
+#ifdef __VISUALC__

     #pragma warning(disable:4706)   // assignment within conditional expression
 #endif // VC++
 
     #pragma warning(disable:4706)   // assignment within conditional expression
 #endif // VC++
 


@@ -38,11 +38,13 @@
 #include <stdlib.h>
 #include <string.h>
 #if !defined(__WATCOMC__)
 #include <stdlib.h>
 #include <string.h>
 #if !defined(__WATCOMC__)

-#if !(defined(_MSC_VER) && (_MSC_VER > 800))
-#include <errno.h>
-#endif
+    #if !(defined(_MSC_VER) && (_MSC_VER > 800))
+        #include <errno.h>
+    #endif

 #endif
 #endif

+

 #include <time.h>
 #include <time.h>

+

 #ifndef __MWERKS__
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifndef __MWERKS__
 #include <sys/types.h>
 #include <sys/stat.h>


@@ -117,9 +119,9 @@ void wxPathList::AddEnvList (const wxString& envVariable)
 {
   static const char PATH_TOKS[] =
 #ifdef __WINDOWS__
 {
   static const char PATH_TOKS[] =
 #ifdef __WINDOWS__

-       " ;"; // Don't seperate with colon in DOS (used for drive)
+        " ;"; // Don't seperate with colon in DOS (used for drive)

 #else
 #else

-       " :;";
+        " :;";

 #endif
 
   char *val = getenv (WXSTRINGCAST envVariable);
 #endif
 
   char *val = getenv (WXSTRINGCAST envVariable);


@@ -129,14 +131,14 @@ void wxPathList::AddEnvList (const wxString& envVariable)
       char *token = strtok (s, PATH_TOKS);
 
       if (token)
       char *token = strtok (s, PATH_TOKS);
 
       if (token)

-       {
-         Add (copystring (token));
-         while (token)
-           {
-             if ((token = strtok ((char *) NULL, PATH_TOKS)) != NULL)
-               Add (wxString(token));
-           }
-       }
+        {
+          Add (copystring (token));
+          while (token)
+            {
+              if ((token = strtok ((char *) NULL, PATH_TOKS)) != NULL)
+                Add (wxString(token));
+            }
+        }

       delete[]s;
     }
 }
       delete[]s;
     }
 }


@@ -151,7 +153,7 @@ void wxPathList::EnsureFileAccessible (const wxString& path)
   if (path_only)
   {
       if (!Member (wxString(path_only)))
   if (path_only)
   {
       if (!Member (wxString(path_only)))

-           Add (wxString(path_only));
+            Add (wxString(path_only));

   }
 }
 
   }
 }
 


@@ -163,13 +165,13 @@ bool wxPathList::Member (const wxString& path)
       if (
 #if defined(__WINDOWS__) || defined(__VMS__) || defined (__WXMAC__)
       // Case INDEPENDENT
       if (
 #if defined(__WINDOWS__) || defined(__VMS__) || defined (__WXMAC__)
       // Case INDEPENDENT

-         path.CompareTo (path2, wxString::ignoreCase) == 0
+          path.CompareTo (path2, wxString::ignoreCase) == 0

 #else
 #else

-      // Case sensitive File System 
-         path.CompareTo (path2) == 0
+      // Case sensitive File System
+          path.CompareTo (path2) == 0

 #endif
 #endif

-       )
-       return TRUE;
+        )
+        return TRUE;

   }
   return FALSE;
 }
   }
   return FALSE;
 }


@@ -198,11 +200,11 @@ wxString wxPathList::FindValidPath (const wxString& file)
 #endif
       if (wxFileExists (wxBuffer))
       {
 #endif
       if (wxFileExists (wxBuffer))
       {

-       return wxString(wxBuffer);      // Found!
+        return wxString(wxBuffer);        // Found!

       }
       }

-    }                          // for()
+    }                                // for()

 
 

-  return wxString("");                 // Not found
+  return wxString("");                        // Not found

 }
 
 wxString wxPathList::FindAbsoluteValidPath (const wxString& file)
 }
 
 wxString wxPathList::FindAbsoluteValidPath (const wxString& file)


@@ -232,7 +234,7 @@ wxString wxPathList::FindAbsoluteValidPath (const wxString& file)
   }
 }
 
   }
 }
 

-bool 
+bool

 wxFileExists (const wxString& filename)
 {
 #ifdef __GNUWIN32__ // (fix a B20 bug)
 wxFileExists (const wxString& filename)
 {
 #ifdef __GNUWIN32__ // (fix a B20 bug)


@@ -241,11 +243,11 @@ wxFileExists (const wxString& filename)
   else
     return TRUE;
 #elif defined(__WXMAC__)
   else
     return TRUE;
 #elif defined(__WXMAC__)

-       struct stat stbuf;
-       strcpy( gwxMacFileName , filename ) ;
-       wxUnix2MacFilename( gwxMacFileName ) ;
-       if (gwxMacFileName && stat ((char *)(const char *)gwxMacFileName, &stbuf) == 0)
-       return TRUE;
+          struct stat stbuf;
+        strcpy( gwxMacFileName , filename ) ;
+        wxUnix2MacFilename( gwxMacFileName ) ;
+          if (gwxMacFileName && stat ((char *)(const char *)gwxMacFileName, &stbuf) == 0)
+            return TRUE;

     return FALSE ;
 #else
 
     return FALSE ;
 #else
 


@@ -273,7 +275,7 @@ bool wxFileExists(const char *pszFileName)
 }
 */
 
 }
 */
 

-bool 
+bool

 wxIsAbsolutePath (const wxString& filename)
 {
   if (filename != "")
 wxIsAbsolutePath (const wxString& filename)
 {
   if (filename != "")


@@ -286,8 +288,8 @@ wxIsAbsolutePath (const wxString& filename)
       /* MSDOS */
       || filename[0] == '\\' || (isalpha (filename[0]) && filename[1] == ':')
 #endif
       /* MSDOS */
       || filename[0] == '\\' || (isalpha (filename[0]) && filename[1] == ':')
 #endif

-       )
-       return TRUE;
+        )
+        return TRUE;

     }
   return FALSE;
 }
     }
   return FALSE;
 }


@@ -297,7 +299,7 @@ wxIsAbsolutePath (const wxString& filename)
  * IF one exists. Inserts zero into buffer.
  *
  */
  * IF one exists. Inserts zero into buffer.
  *
  */

- 
+

 void wxStripExtension(char *buffer)
 {
   int len = strlen(buffer);
 void wxStripExtension(char *buffer)
 {
   int len = strlen(buffer);


@@ -346,35 +348,35 @@ char *wxRealPath (char *path)
       p = &path[2];
     for (; *p; p++)
       {
       p = &path[2];
     for (; *p; p++)
       {

-       if (*p == SEP)
-         {
-           if (p[1] == '.' && p[2] == '.' && (p[3] == SEP || p[3] == '\0'))
-             {
+        if (*p == SEP)
+          {
+            if (p[1] == '.' && p[2] == '.' && (p[3] == SEP || p[3] == '\0'))
+              {

                 char *q;
                 char *q;

-               for (q = p - 1; q >= path && *q != SEP; q--);
-               if (q[0] == SEP && (q[1] != '.' || q[2] != '.' || q[3] != SEP)
-                   && (q - 1 <= path || q[-1] != SEP))
-                 {
-                   strcpy (q, p + 3);
-                   if (path[0] == '\0')
-                     {
-                       path[0] = SEP;
-                       path[1] = '\0';
-                     }
+                for (q = p - 1; q >= path && *q != SEP; q--);
+                if (q[0] == SEP && (q[1] != '.' || q[2] != '.' || q[3] != SEP)
+                    && (q - 1 <= path || q[-1] != SEP))
+                  {
+                    strcpy (q, p + 3);
+                    if (path[0] == '\0')
+                      {
+                        path[0] = SEP;
+                        path[1] = '\0';
+                      }

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-                   /* Check that path[2] is NULL! */
-                   else if (path[1] == ':' && !path[2])
-                     {
-                       path[2] = SEP;
-                       path[3] = '\0';
-                     }
-#endif
-                   p = q - 1;
-                 }
-             }
-           else if (p[1] == '.' && (p[2] == SEP || p[2] == '\0'))
-             strcpy (p, p + 2);
-         }
+                    /* Check that path[2] is NULL! */
+                    else if (path[1] == ':' && !path[2])
+                      {
+                        path[2] = SEP;
+                        path[3] = '\0';
+                      }
+#endif
+                    p = q - 1;
+                  }
+              }
+            else if (p[1] == '.' && (p[2] == SEP || p[2] == '\0'))
+              strcpy (p, p + 2);
+          }

       }
   }
   return path;
       }
   }
   return path;


@@ -393,10 +395,10 @@ char *wxCopyAbsolutePath(const wxString& filename)
     char ch = buf[strlen(buf) - 1];
 #ifdef __WXMSW__
     if (ch != '\\' && ch != '/')
     char ch = buf[strlen(buf) - 1];
 #ifdef __WXMSW__
     if (ch != '\\' && ch != '/')

-       strcat(buf, "\\");
+        strcat(buf, "\\");

 #else
     if (ch != '/')
 #else
     if (ch != '/')

-       strcat(buf, "/");
+        strcat(buf, "/");

 #endif
     strcat(buf, wxBuffer);
     return copystring( wxRealPath(buf) );
 #endif
     strcat(buf, wxBuffer);
     return copystring( wxRealPath(buf) );


@@ -410,19 +412,19 @@ char *wxCopyAbsolutePath(const wxString& filename)
    ~user/ => user's home dir
    If the environment variable a = "foo" and b = "bar" then:
    Unix:
    ~user/ => user's home dir
    If the environment variable a = "foo" and b = "bar" then:
    Unix:

-       $a      =>      foo
-       $a$b    =>      foobar
-       $a.c    =>      foo.c
-       xxx$a   =>      xxxfoo
-       ${a}!   =>      foo!
-       $(b)!   =>      bar!
-       \$a     =>      \$a
+        $a        =>        foo
+        $a$b        =>        foobar
+        $a.c        =>        foo.c
+        xxx$a        =>        xxxfoo
+        ${a}!        =>        foo!
+        $(b)!        =>        bar!
+        \$a        =>        \$a

    MSDOS:
    MSDOS:

-       $a      ==>     $a
-       $(a)    ==>     foo
-       $(a)$b  ==>     foo$b
-       $(a)$(b)==>     foobar
-       test.$$ ==>     test.$$
+        $a        ==>        $a
+        $(a)        ==>        foo
+        $(a)$b        ==>        foo$b
+        $(a)$(b)==>        foobar
+        test.$$        ==>        test.$$

  */
 
 /* input name in name, pathname output to buf. */
  */
 
 /* input name in name, pathname output to buf. */


@@ -431,7 +433,7 @@ char *wxExpandPath(char *buf, const char *name)
 {
     register char  *d, *s, *nm;
     char            lnm[_MAXPATHLEN];
 {
     register char  *d, *s, *nm;
     char            lnm[_MAXPATHLEN];

-    int                                q;
+    int                                q;

 
     // Some compilers don't like this line.
 //    const char      trimchars[] = "\n \t";
 
     // Some compilers don't like this line.
 //    const char      trimchars[] = "\n \t";


@@ -449,17 +451,17 @@ char *wxExpandPath(char *buf, const char *name)
 #endif
     buf[0] = '\0';
     if (name == NULL || *name == '\0')
 #endif
     buf[0] = '\0';
     if (name == NULL || *name == '\0')

-       return buf;
+        return buf;

     nm = copystring(name); // Make a scratch copy
     char *nm_tmp = nm;
 
     /* Skip leading whitespace and cr */
     while (strchr((char *)trimchars, *nm) != NULL)
     nm = copystring(name); // Make a scratch copy
     char *nm_tmp = nm;
 
     /* Skip leading whitespace and cr */
     while (strchr((char *)trimchars, *nm) != NULL)

-       nm++;
+        nm++;

     /* And strip off trailing whitespace and cr */
     s = nm + (q = strlen(nm)) - 1;
     while (q-- && strchr((char *)trimchars, *s) != NULL)
     /* And strip off trailing whitespace and cr */
     s = nm + (q = strlen(nm)) - 1;
     while (q-- && strchr((char *)trimchars, *s) != NULL)

-       *s = '\0';
+        *s = '\0';

 
     s = nm;
     d = lnm;
 
     s = nm;
     d = lnm;


@@ -472,37 +474,37 @@ char *wxExpandPath(char *buf, const char *name)
     /* Expand inline environment variables */
     while ((*d++ = *s)) {
 #ifndef __WXMSW__
     /* Expand inline environment variables */
     while ((*d++ = *s)) {
 #ifndef __WXMSW__

-       if (*s == '\\') {
-           if ((*(d - 1) = *++s)) {
-               s++;
-               continue;
-           } else
-               break;
-       } else
+        if (*s == '\\') {
+            if ((*(d - 1) = *++s)) {
+                s++;
+                continue;
+            } else
+                break;
+        } else

 #endif
 #ifdef __WXMSW__
 #endif
 #ifdef __WXMSW__

-       if (*s++ == '$' && (*s == '{' || *s == ')'))
+        if (*s++ == '$' && (*s == '{' || *s == ')'))

 #else
 #else

-       if (*s++ == '$')
-#endif
-       {
-           register char  *start = d;
-           register int   braces = (*s == '{' || *s == '(');
-           register char  *value;
-           while ((*d++ = *s))
-               if (braces ? (*s == '}' || *s == ')') : !(isalnum(*s) || *s == '_') )
-                   break;
-               else
-                   s++;
-           *--d = 0;
-           value = getenv(braces ? start + 1 : start);
-           if (value) {
-               for ((d = start - 1); (*d++ = *value++););
-               d--;
-               if (braces && *s)
-                   s++;
-           }
-       }
+        if (*s++ == '$')
+#endif
+        {
+            register char  *start = d;
+            register int   braces = (*s == '{' || *s == '(');
+            register char  *value;
+            while ((*d++ = *s))
+                if (braces ? (*s == '}' || *s == ')') : !(isalnum(*s) || *s == '_') )
+                    break;
+                else
+                    s++;
+            *--d = 0;
+            value = getenv(braces ? start + 1 : start);
+            if (value) {
+                for ((d = start - 1); (*d++ = *value++););
+                d--;
+                if (braces && *s)
+                    s++;
+            }
+        }

     }
 
     /* Expand ~ and ~user */
     }
 
     /* Expand ~ and ~user */


@@ -510,41 +512,41 @@ char *wxExpandPath(char *buf, const char *name)
     s = "";
     if (nm[0] == '~' && !q)
     {
     s = "";
     if (nm[0] == '~' && !q)
     {

-       /* prefix ~ */
-       if (nm[1] == SEP || nm[1] == 0)
-        {      /* ~/filename */
-           if ((s = wxGetUserHome("")) != NULL) {
-               if (*++nm)
-                   nm++;
-           }
+        /* prefix ~ */
+        if (nm[1] == SEP || nm[1] == 0)
+        {        /* ~/filename */
+            if ((s = wxGetUserHome("")) != NULL) {
+                if (*++nm)
+                    nm++;
+            }

         } else
         } else

-        {              /* ~user/filename */
-           register char  *nnm;
-           register char  *home;
-           for (s = nm; *s && *s != SEP; s++);
-           int was_sep; /* MATTHEW: Was there a separator, or NULL? */
+        {                /* ~user/filename */
+            register char  *nnm;
+            register char  *home;
+            for (s = nm; *s && *s != SEP; s++);
+            int was_sep; /* MATTHEW: Was there a separator, or NULL? */

             was_sep = (*s == SEP);
             was_sep = (*s == SEP);

-           nnm = *s ? s + 1 : s;
-           *s = 0;
-           if ((home = wxGetUserHome(wxString(nm + 1))) == NULL) {
+            nnm = *s ? s + 1 : s;
+            *s = 0;
+            if ((home = wxGetUserHome(wxString(nm + 1))) == NULL) {

                if (was_sep) /* replace only if it was there: */
                if (was_sep) /* replace only if it was there: */

-                 *s = SEP;
-               s = "";
-           } else {
-               nm = nnm;
-               s = home;
-           }
-       }
+                   *s = SEP;
+                s = "";
+            } else {
+                nm = nnm;
+                s = home;
+            }
+        }

     }
 
     d = buf;
     if (s && *s) { /* MATTHEW: s could be NULL if user '~' didn't exist */
     }
 
     d = buf;
     if (s && *s) { /* MATTHEW: s could be NULL if user '~' didn't exist */

-       /* Copy home dir */
-       while ('\0' != (*d++ = *s++))
-         /* loop */;
-       // Handle root home
-       if (d - 1 > buf && *(d - 2) != SEP)
-         *(d - 1) = SEP;
+        /* Copy home dir */
+        while ('\0' != (*d++ = *s++))
+          /* loop */;
+        // Handle root home
+        if (d - 1 > buf && *(d - 2) != SEP)
+          *(d - 1) = SEP;

     }
     s = nm;
     while ((*d++ = *s++));
     }
     s = nm;
     while ((*d++ = *s++));


@@ -597,7 +599,7 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
     {
       strcpy(wxBuffer, "~");
       if (user != "")
     {
       strcpy(wxBuffer, "~");
       if (user != "")

-            strcat(wxBuffer, (const char*) user);
+             strcat(wxBuffer, (const char*) user);

 #ifdef __WXMSW__
 //      strcat(wxBuffer, "\\");
 #else
 #ifdef __WXMSW__
 //      strcat(wxBuffer, "\\");
 #else


@@ -620,18 +622,18 @@ char *wxFileNameFromPath (char *path)
 
       tcp = path + strlen (path);
       while (--tcp >= path)
 
       tcp = path + strlen (path);
       while (--tcp >= path)

-       {
-         if (*tcp == '/' || *tcp == '\\'
+        {
+          if (*tcp == '/' || *tcp == '\\'

 #ifdef __VMS__
      || *tcp == ':' || *tcp == ']')
 #else
      )
 #endif
 #ifdef __VMS__
      || *tcp == ':' || *tcp == ']')
 #else
      )
 #endif

-           return tcp + 1;
-       }                       /* while */
+            return tcp + 1;
+        }                        /* while */

 #ifdef __WXMSW__
       if (isalpha (*path) && *(path + 1) == ':')
 #ifdef __WXMSW__
       if (isalpha (*path) && *(path + 1) == ':')

-       return path + 2;
+        return path + 2;

 #endif
     }
   return path;
 #endif
     }
   return path;


@@ -647,18 +649,18 @@ wxString wxFileNameFromPath (const wxString& path1)
 
       tcp = path + strlen (path);
       while (--tcp >= path)
 
       tcp = path + strlen (path);
       while (--tcp >= path)

-         {
-           if (*tcp == '/' || *tcp == '\\'
+          {
+            if (*tcp == '/' || *tcp == '\\'

 #ifdef __VMS__
         || *tcp == ':' || *tcp == ']')
 #else
         )
 #endif
 #ifdef __VMS__
         || *tcp == ':' || *tcp == ']')
 #else
         )
 #endif

-               return wxString(tcp + 1);
-           }                   /* while */
+                return wxString(tcp + 1);
+            }                        /* while */

 #ifdef __WXMSW__
       if (isalpha (*path) && *(path + 1) == ':')
 #ifdef __WXMSW__
       if (isalpha (*path) && *(path + 1) == ':')

-           return wxString(path + 2);
+            return wxString(path + 2);

 #endif
     }
   // Yes, this should return the path, not an empty string, otherwise
 #endif
     }
   // Yes, this should return the path, not an empty string, otherwise


@@ -703,12 +705,12 @@ wxPathOnly (char *path)
 #ifdef __WXMSW__
       // Try Drive specifier
       if (isalpha (buf[0]) && buf[1] == ':')
 #ifdef __WXMSW__
       // Try Drive specifier
       if (isalpha (buf[0]) && buf[1] == ':')

-       {
-         // A:junk --> A:. (since A:.\junk Not A:\junk)
-         buf[2] = '.';
-         buf[3] = '\0';
-         return buf;
-       }
+        {
+          // A:junk --> A:. (since A:.\junk Not A:\junk)
+          buf[2] = '.';
+          buf[3] = '\0';
+          return buf;
+        }

 #endif
     }
 
 #endif
     }
 


@@ -751,12 +753,12 @@ wxString wxPathOnly (const wxString& path)
 #ifdef __WXMSW__
       // Try Drive specifier
       if (isalpha (buf[0]) && buf[1] == ':')
 #ifdef __WXMSW__
       // Try Drive specifier
       if (isalpha (buf[0]) && buf[1] == ':')

-       {
-         // A:junk --> A:. (since A:.\junk Not A:\junk)
-         buf[2] = '.';
-         buf[3] = '\0';
-         return wxString(buf);
-       }
+        {
+          // A:junk --> A:. (since A:.\junk Not A:\junk)
+          buf[2] = '.';
+          buf[3] = '\0';
+          return wxString(buf);
+        }

 #endif
     }
 
 #endif
     }
 


@@ -768,74 +770,74 @@ wxString wxPathOnly (const wxString& path)
 // Also, convert to lower case, since case is significant in UNIX.
 
 #ifdef __WXMAC__
 // Also, convert to lower case, since case is significant in UNIX.
 
 #ifdef __WXMAC__

-void 
+void

 wxMac2UnixFilename (char *s)
 {
 wxMac2UnixFilename (char *s)
 {

-       if (s)
-       {
-               memmove( s+1 , s ,strlen( s ) + 1) ;
-               if ( *s == ':' )
-                       *s = '.' ;
-               else
-                       *s = '/' ;
-                       
-               while (*s)
-               {
-                       if (*s == ':')
-                         *s = '/';
-                       else
-                         *s = wxToLower (*s);  // Case INDEPENDENT
-                       s++;
-               }
-       }
+        if (s)
+        {
+                memmove( s+1 , s ,strlen( s ) + 1) ;
+                if ( *s == ':' )
+                        *s = '.' ;
+                else
+                        *s = '/' ;
+
+                while (*s)
+                {
+                        if (*s == ':')
+                          *s = '/';
+                        else
+                          *s = wxToLower (*s);        // Case INDEPENDENT
+                        s++;
+                }
+        }

 }
 
 }
 

-void 
+void

 wxUnix2MacFilename (char *s)
 {
 wxUnix2MacFilename (char *s)
 {

-       if (s)
-       {
-               if ( *s == '.' )
-               {
-                       // relative path , since it goes on with slash which is translated to a : 
-                       memmove( s , s+1 ,strlen( s ) ) ;
-               }
-               else if ( *s == '/' )
-               {
-                       // absolute path -> on mac just start with the drive name
-                       memmove( s , s+1 ,strlen( s ) ) ;
-               }
-               else
-               {
-                       wxASSERT_MSG( 1 , "unkown path beginning" ) ;
-               }
-               while (*s)
-               {
-                       if (*s == '/' || *s == '\\')
-                               *s = ':';
-
-                       s++ ;
-               }
-       }
+        if (s)
+        {
+                if ( *s == '.' )
+                {
+                        // relative path , since it goes on with slash which is translated to a :
+                        memmove( s , s+1 ,strlen( s ) ) ;
+                }
+                else if ( *s == '/' )
+                {
+                        // absolute path -> on mac just start with the drive name
+                        memmove( s , s+1 ,strlen( s ) ) ;
+                }
+                else
+                {
+                        wxASSERT_MSG( 1 , "unkown path beginning" ) ;
+                }
+                while (*s)
+                {
+                        if (*s == '/' || *s == '\\')
+                                  *s = ':';
+
+                        s++ ;
+                }
+        }

 }
 #endif
 }
 #endif

-void 
+void

 wxDos2UnixFilename (char *s)
 {
   if (s)
     while (*s)
       {
 wxDos2UnixFilename (char *s)
 {
   if (s)
     while (*s)
       {

-       if (*s == '\\')
-         *s = '/';
+        if (*s == '\\')
+          *s = '/';

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-       else
-         *s = wxToLower (*s);  // Case INDEPENDENT
+        else
+          *s = wxToLower (*s);        // Case INDEPENDENT

 #endif
 #endif

-       s++;
+        s++;

       }
 }
 
       }
 }
 

-void 
+void

 #ifdef __WXMSW__
 wxUnix2DosFilename (char *s)
 #else
 #ifdef __WXMSW__
 wxUnix2DosFilename (char *s)
 #else


@@ -847,15 +849,15 @@ wxUnix2DosFilename (char *WXUNUSED(s))
   if (s)
     while (*s)
       {
   if (s)
     while (*s)
       {

-       if (*s == '/')
-         *s = '\\';
-       s++;
+        if (*s == '/')
+          *s = '\\';
+        s++;

       }
 #endif
 }
 
 // Concatenate two files to form third
       }
 #endif
 }
 
 // Concatenate two files to form third

-bool 
+bool

 wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
 {
   char *outfile = wxGetTempFileName("cat");
 wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
 {
   char *outfile = wxGetTempFileName("cat");


@@ -865,12 +867,12 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil
   FILE *fp3 = (FILE *) NULL;
   // Open the inputs and outputs
 #ifdef __WXMAC__
   FILE *fp3 = (FILE *) NULL;
   // Open the inputs and outputs
 #ifdef __WXMAC__

-       strcpy( gwxMacFileName , file1 ) ;
-       wxUnix2MacFilename( gwxMacFileName ) ;
-       strcpy( gwxMacFileName2 , file2) ;
-       wxUnix2MacFilename( gwxMacFileName2 ) ;
-       strcpy( gwxMacFileName3 , outfile) ;
-       wxUnix2MacFilename( gwxMacFileName3 ) ;
+        strcpy( gwxMacFileName , file1 ) ;
+        wxUnix2MacFilename( gwxMacFileName ) ;
+        strcpy( gwxMacFileName2 , file2) ;
+        wxUnix2MacFilename( gwxMacFileName2 ) ;
+        strcpy( gwxMacFileName3 , outfile) ;
+        wxUnix2MacFilename( gwxMacFileName3 ) ;

 
   if ((fp1 = fopen (gwxMacFileName, "rb")) == NULL ||
       (fp2 = fopen (gwxMacFileName2, "rb")) == NULL ||
 
   if ((fp1 = fopen (gwxMacFileName, "rb")) == NULL ||
       (fp2 = fopen (gwxMacFileName2, "rb")) == NULL ||


@@ -882,11 +884,11 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil
 #endif
     {
       if (fp1)
 #endif
     {
       if (fp1)

-       fclose (fp1);
+        fclose (fp1);

       if (fp2)
       if (fp2)

-       fclose (fp2);
+        fclose (fp2);

       if (fp3)
       if (fp3)

-       fclose (fp3);
+        fclose (fp3);

       return FALSE;
     }
 
       return FALSE;
     }
 


@@ -906,7 +908,7 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil
 }
 
 // Copy files
 }
 
 // Copy files

-bool 
+bool

 wxCopyFile (const wxString& file1, const wxString& file2)
 {
   FILE *fd1;
 wxCopyFile (const wxString& file1, const wxString& file2)
 {
   FILE *fd1;


@@ -914,10 +916,10 @@ wxCopyFile (const wxString& file1, const wxString& file2)
   int ch;
 
 #ifdef __WXMAC__
   int ch;
 
 #ifdef __WXMAC__

-       strcpy( gwxMacFileName , file1 ) ;
-       wxUnix2MacFilename( gwxMacFileName ) ;
-       strcpy( gwxMacFileName2 , file2) ;
-       wxUnix2MacFilename( gwxMacFileName2 ) ;
+        strcpy( gwxMacFileName , file1 ) ;
+        wxUnix2MacFilename( gwxMacFileName ) ;
+        strcpy( gwxMacFileName2 , file2) ;
+        wxUnix2MacFilename( gwxMacFileName2 ) ;

 
   if ((fd1 = fopen (gwxMacFileName, "rb")) == NULL)
     return FALSE;
 
   if ((fd1 = fopen (gwxMacFileName, "rb")) == NULL)
     return FALSE;


@@ -940,14 +942,14 @@ wxCopyFile (const wxString& file1, const wxString& file2)
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool 
+bool

 wxRenameFile (const wxString& file1, const wxString& file2)
 {
 #ifdef __WXMAC__
 wxRenameFile (const wxString& file1, const wxString& file2)
 {
 #ifdef __WXMAC__

-       strcpy( gwxMacFileName , file1 ) ;
-       wxUnix2MacFilename( gwxMacFileName ) ;
-       strcpy( gwxMacFileName2 , file2) ;
-       wxUnix2MacFilename( gwxMacFileName2 ) ;
+        strcpy( gwxMacFileName , file1 ) ;
+        wxUnix2MacFilename( gwxMacFileName ) ;
+        strcpy( gwxMacFileName2 , file2) ;
+        wxUnix2MacFilename( gwxMacFileName2 ) ;

 
   if (0 == rename (gwxMacFileName, gwxMacFileName2))
     return TRUE;
 
   if (0 == rename (gwxMacFileName, gwxMacFileName2))
     return TRUE;


@@ -967,11 +969,11 @@ wxRenameFile (const wxString& file1, const wxString& file2)
 
 bool wxRemoveFile(const wxString& file)
 {
 
 bool wxRemoveFile(const wxString& file)
 {

-#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
+#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__WATCOMC__)

   int flag = remove(WXSTRINGCAST file);
 #elif defined( __WXMAC__ )
   int flag = remove(WXSTRINGCAST file);
 #elif defined( __WXMAC__ )

-       strcpy( gwxMacFileName , file ) ;
-       wxUnix2MacFilename( gwxMacFileName ) ;
+        strcpy( gwxMacFileName , file ) ;
+        wxUnix2MacFilename( gwxMacFileName ) ;

   int flag = unlink(gwxMacFileName);
 #else
   int flag = unlink(WXSTRINGCAST file);
   int flag = unlink(gwxMacFileName);
 #else
   int flag = unlink(WXSTRINGCAST file);


@@ -984,7 +986,7 @@ bool wxMkdir(const wxString& dir)
 #if defined(__WXSTUBS__)
   return FALSE;
 #elif defined(__VMS__)
 #if defined(__WXSTUBS__)
   return FALSE;
 #elif defined(__VMS__)

-       return FALSE;
+        return FALSE;

 #elif defined( __WXMAC__ )
   strcpy( gwxMacFileName , dir ) ;
   wxUnix2MacFilename( gwxMacFileName ) ;
 #elif defined( __WXMAC__ )
   strcpy( gwxMacFileName , dir ) ;
   wxUnix2MacFilename( gwxMacFileName ) ;


@@ -1001,8 +1003,8 @@ bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
 #ifdef __VMS__
   return FALSE;
 #elif defined( __WXMAC__ )
 #ifdef __VMS__
   return FALSE;
 #elif defined( __WXMAC__ )

-       strcpy( gwxMacFileName , dir ) ;
-       wxUnix2MacFilename( gwxMacFileName ) ;
+        strcpy( gwxMacFileName , dir ) ;
+        wxUnix2MacFilename( gwxMacFileName ) ;

   return (rmdir(WXSTRINGCAST gwxMacFileName) == 0);
 #else
 
   return (rmdir(WXSTRINGCAST gwxMacFileName) == 0);
 #else
 


@@ -1037,14 +1039,14 @@ bool wxDirExists(const wxString& dir)
 #endif
 
 #if defined(__WIN32__)
 #endif
 
 #if defined(__WIN32__)

-       HANDLE h = FindFirstFile((LPTSTR) WXSTRINGCAST dir,(LPWIN32_FIND_DATA)&fileInfo);
-
-       if (h==INVALID_HANDLE_VALUE)
-        return FALSE;
-       else {
-        FindClose(h);
-        return ((fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY);
-       }
+        HANDLE h = FindFirstFile((LPTSTR) WXSTRINGCAST dir,(LPWIN32_FIND_DATA)&fileInfo);
+
+        if (h==INVALID_HANDLE_VALUE)
+         return FALSE;
+        else {
+         FindClose(h);
+         return ((fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY);
+        }

 #else
   // In Borland findfirst has a different argument
   // ordering from _dos_findfirst. But _dos_findfirst
 #else
   // In Borland findfirst has a different argument
   // ordering from _dos_findfirst. But _dos_findfirst


@@ -1084,7 +1086,7 @@ char *wxGetTempFileName(const wxString& prefix, char *buf)
 {
 #ifdef __WINDOWS__
 
 {
 #ifdef __WINDOWS__
 

-#ifndef        __WIN32__
+#ifndef        __WIN32__

   char tmp[144];
   ::GetTempFileName(0, WXSTRINGCAST prefix, 0, tmp);
 #else
   char tmp[144];
   ::GetTempFileName(0, WXSTRINGCAST prefix, 0, tmp);
 #else


@@ -1098,7 +1100,7 @@ char *wxGetTempFileName(const wxString& prefix, char *buf)
   return buf;
 
 #else
   return buf;
 
 #else

-  static short last_temp = 0;  // cache last to speed things a bit
+  static short last_temp = 0;        // cache last to speed things a bit

   // At most 1000 temp files to a process! We use a ring count.
   char tmp[100]; // FIXME static buffer
 
   // At most 1000 temp files to a process! We use a ring count.
   char tmp[100]; // FIXME static buffer
 


@@ -1106,18 +1108,18 @@ char *wxGetTempFileName(const wxString& prefix, char *buf)
     {
       sprintf (tmp, "/tmp/%s%d.%03x", WXSTRINGCAST prefix, (int) getpid (), (int) suffix);
       if (!wxFileExists( tmp ))
     {
       sprintf (tmp, "/tmp/%s%d.%03x", WXSTRINGCAST prefix, (int) getpid (), (int) suffix);
       if (!wxFileExists( tmp ))

-       {
-         // Touch the file to create it (reserve name)
-         FILE *fd = fopen (tmp, "w");
-         if (fd)
-           fclose (fd);
-         last_temp = suffix;
+        {
+          // Touch the file to create it (reserve name)
+          FILE *fd = fopen (tmp, "w");
+          if (fd)
+            fclose (fd);
+          last_temp = suffix;

           if (buf)
           if (buf)

-           strcpy( buf, tmp);
-         else
-           buf = copystring( tmp );
-         return buf;
-       }
+            strcpy( buf, tmp);
+          else
+            buf = copystring( tmp );
+          return buf;
+        }

     }
   wxLogError( _("wxWindows: error finding temporary file name.\n") );
   if (buf) buf[0] = 0;
     }
   wxLogError( _("wxWindows: error finding temporary file name.\n") );
   if (buf) buf[0] = 0;


@@ -1160,7 +1162,7 @@ char *wxFindFirstFile(const char *spec, int flags)
   /* MATTHEW: p is NULL => Local directory */
   if (!p)
     p = ".";
   /* MATTHEW: p is NULL => Local directory */
   if (!p)
     p = ".";

-    
+

   if ((wxDirStream=opendir(p))==NULL)
     return (char *) NULL;
 
   if ((wxDirStream=opendir(p))==NULL)
     return (char *) NULL;
 


@@ -1208,17 +1210,17 @@ char *wxFindNextFile(void)
       strcat(buf, nextDir->d_name);
 
       if ((strcmp(nextDir->d_name, ".") == 0) ||
       strcat(buf, nextDir->d_name);
 
       if ((strcmp(nextDir->d_name, ".") == 0) ||

-         (strcmp(nextDir->d_name, "..") == 0)) {
-       if (wxFindFileFlags && !(wxFindFileFlags & wxDIR))
-         continue;
-       isdir = TRUE;
+          (strcmp(nextDir->d_name, "..") == 0)) {
+        if (wxFindFileFlags && !(wxFindFileFlags & wxDIR))
+          continue;
+        isdir = TRUE;

       } else
       } else

-       isdir = wxDirExists(buf);
-      
+        isdir = wxDirExists(buf);
+

       if (!wxFindFileFlags
       if (!wxFindFileFlags

-         || ((wxFindFileFlags & wxDIR) && isdir)
-         || ((wxFindFileFlags & wxFILE) && !isdir))
-       return buf;
+          || ((wxFindFileFlags & wxDIR) && isdir)
+          || ((wxFindFileFlags & wxFILE) && !isdir))
+        return buf;

     }
   }
   closedir(wxDirStream);
     }
   }
   closedir(wxDirStream);


@@ -1254,28 +1256,28 @@ char *wxFindFirstFile(const char *spec, int flags)
   wxString path1(wxFileSpec);
   char *p = wxPathOnly(WXSTRINGCAST path1);
   if (p && (strlen(p) > 0))
   wxString path1(wxFileSpec);
   char *p = wxPathOnly(WXSTRINGCAST path1);
   if (p && (strlen(p) > 0))

-        strcpy(wxBuffer, p);
+         strcpy(wxBuffer, p);

   else
   else

-        wxBuffer[0] = 0;
+         wxBuffer[0] = 0;

 
 #ifdef __WIN32__
   if (wxFileStrucHandle != INVALID_HANDLE_VALUE)
 
 #ifdef __WIN32__
   if (wxFileStrucHandle != INVALID_HANDLE_VALUE)

-        FindClose(wxFileStrucHandle);
+         FindClose(wxFileStrucHandle);

 
   wxFileStrucHandle = ::FindFirstFile(WXSTRINGCAST spec, &wxFileStruc);
 
   if (wxFileStrucHandle == INVALID_HANDLE_VALUE)
 
   wxFileStrucHandle = ::FindFirstFile(WXSTRINGCAST spec, &wxFileStruc);
 
   if (wxFileStrucHandle == INVALID_HANDLE_VALUE)

-        return NULL;
+         return NULL;

 
   bool isdir = !!(wxFileStruc.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
 
   if (isdir && !(flags & wxDIR))
 
   bool isdir = !!(wxFileStruc.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
 
   if (isdir && !(flags & wxDIR))

-        return wxFindNextFile();
+         return wxFindNextFile();

   else if (!isdir && flags && !(flags & wxFILE))
   else if (!isdir && flags && !(flags & wxFILE))

-        return wxFindNextFile();
+         return wxFindNextFile();

 
   if (wxBuffer[0] != 0)
 
   if (wxBuffer[0] != 0)

-        strcat(wxBuffer, "\\");
+         strcat(wxBuffer, "\\");

   strcat(wxBuffer, wxFileStruc.cFileName);
   return wxBuffer;
 #else
   strcat(wxBuffer, wxFileStruc.cFileName);
   return wxBuffer;
 #else


@@ -1301,19 +1303,19 @@ char *wxFindFirstFile(const char *spec, int flags)
 
     if (attrib & _A_SUBDIR) {
       if (!(wxFindFileFlags & wxDIR))
 
     if (attrib & _A_SUBDIR) {
       if (!(wxFindFileFlags & wxDIR))

-       return wxFindNextFile();
+        return wxFindNextFile();

     } else if (wxFindFileFlags && !(wxFindFileFlags & wxFILE))
     } else if (wxFindFileFlags && !(wxFindFileFlags & wxFILE))

-               return wxFindNextFile();
+                return wxFindNextFile();

 
 

-        if (wxBuffer[0] != 0)
-               strcat(wxBuffer, "\\");
+         if (wxBuffer[0] != 0)
+                strcat(wxBuffer, "\\");

 
 #ifdef __BORLANDC__
 
 #ifdef __BORLANDC__

-        strcat(wxBuffer, wxFileStruc.ff_name);
+         strcat(wxBuffer, wxFileStruc.ff_name);

 #else
 #else

-        strcat(wxBuffer, wxFileStruc.name);
+         strcat(wxBuffer, wxFileStruc.name);

 #endif
 #endif

-        return wxBuffer;
+         return wxBuffer;

   }
   else
     return NULL;
   }
   else
     return NULL;


@@ -1327,21 +1329,21 @@ char *wxFindNextFile(void)
   wxString p2(wxFileSpec);
   char *p = wxPathOnly(WXSTRINGCAST p2);
   if (p && (strlen(p) > 0))
   wxString p2(wxFileSpec);
   char *p = wxPathOnly(WXSTRINGCAST p2);
   if (p && (strlen(p) > 0))

-        strcpy(wxBuffer, p);
+         strcpy(wxBuffer, p);

   else
   else

-        wxBuffer[0] = 0;
-  
+         wxBuffer[0] = 0;
+

  try_again:
 
 #ifdef __WIN32__
   if (wxFileStrucHandle == INVALID_HANDLE_VALUE)
  try_again:
 
 #ifdef __WIN32__
   if (wxFileStrucHandle == INVALID_HANDLE_VALUE)

-        return NULL;
+         return NULL;

 
   bool success = (FindNextFile(wxFileStrucHandle, &wxFileStruc) != 0);
   if (!success) {
 
   bool success = (FindNextFile(wxFileStrucHandle, &wxFileStruc) != 0);
   if (!success) {

-               FindClose(wxFileStrucHandle);
+                FindClose(wxFileStrucHandle);

       wxFileStrucHandle = INVALID_HANDLE_VALUE;
       wxFileStrucHandle = INVALID_HANDLE_VALUE;

-               return NULL;
+                return NULL;

   }
 
   bool isdir = !!(wxFileStruc.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
   }
 
   bool isdir = !!(wxFileStruc.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);


@@ -1349,12 +1351,12 @@ char *wxFindNextFile(void)
   if (isdir && !(wxFindFileFlags & wxDIR))
     goto try_again;
   else if (!isdir && wxFindFileFlags && !(wxFindFileFlags & wxFILE))
   if (isdir && !(wxFindFileFlags & wxDIR))
     goto try_again;
   else if (!isdir && wxFindFileFlags && !(wxFindFileFlags & wxFILE))

-        goto try_again;
+         goto try_again;

 
   if (wxBuffer[0] != 0)
     strcat(wxBuffer, "\\");
   strcat(wxBuffer, wxFileStruc.cFileName);
 
   if (wxBuffer[0] != 0)
     strcat(wxBuffer, "\\");
   strcat(wxBuffer, wxFileStruc.cFileName);

-  return wxBuffer;  
+  return wxBuffer;

 #else
 
 #ifdef __BORLANDC__
 #else
 
 #ifdef __BORLANDC__


@@ -1374,19 +1376,19 @@ char *wxFindNextFile(void)
 
     if (attrib & _A_SUBDIR) {
       if (!(wxFindFileFlags & wxDIR))
 
     if (attrib & _A_SUBDIR) {
       if (!(wxFindFileFlags & wxDIR))

-       goto try_again;
+        goto try_again;

     } else if (wxFindFileFlags && !(wxFindFileFlags & wxFILE))
       goto try_again;
 
 
     } else if (wxFindFileFlags && !(wxFindFileFlags & wxFILE))
       goto try_again;
 
 

-        if (wxBuffer[0] != 0)
+         if (wxBuffer[0] != 0)

       strcat(wxBuffer, "\\");
 #ifdef __BORLANDC__
       strcat(wxBuffer, "\\");
 #ifdef __BORLANDC__

-        strcat(wxBuffer, wxFileStruc.ff_name);
+         strcat(wxBuffer, wxFileStruc.ff_name);

 #else
 #else

-        strcat(wxBuffer, wxFileStruc.name);
+         strcat(wxBuffer, wxFileStruc.name);

 #endif
 #endif

-        return wxBuffer;
+         return wxBuffer;

   }
   else
     return NULL;
   }
   else
     return NULL;


@@ -1403,7 +1405,7 @@ char *wxGetWorkingDirectory(char *buf, int sz)
 {
   if (!buf)
     buf = new char[sz+1];
 {
   if (!buf)
     buf = new char[sz+1];

-#ifdef _MSC_VER 
+#ifdef _MSC_VER

   if (_getcwd(buf, sz) == NULL) {
 #else
   if (getcwd(buf, sz) == NULL) {
   if (_getcwd(buf, sz) == NULL) {
 #else
   if (getcwd(buf, sz) == NULL) {


@@ -1462,7 +1464,7 @@ bool wxEndsWithPathSeparator(const char *pszFileName)
 bool wxFindFileInPath(wxString *pStr, const char *pszPath, const char *pszFile)
 {
   // we assume that it's not empty
 bool wxFindFileInPath(wxString *pStr, const char *pszPath, const char *pszFile)
 {
   // we assume that it's not empty

-  wxCHECK_MSG( !IsEmpty(pszFile), FALSE, 
+  wxCHECK_MSG( !IsEmpty(pszFile), FALSE,

                _("empty file name in wxFindFileInPath"));
 
   // skip path separator in the beginning of the file name if present
                _("empty file name in wxFindFileInPath"));
 
   // skip path separator in the beginning of the file name if present


@@ -1537,13 +1539,13 @@ bool wxIsWild( const wxString& pattern )
   wxString tmp = pattern;
   char *pat = WXSTRINGCAST(tmp);
     while (*pat) {
   wxString tmp = pattern;
   char *pat = WXSTRINGCAST(tmp);
     while (*pat) {

-       switch (*pat++) {
-       case '?': case '*': case '[': case '{':
-           return TRUE;
-       case '\\':
-           if (!*pat++)
-               return FALSE;
-       }
+        switch (*pat++) {
+        case '?': case '*': case '[': case '{':
+            return TRUE;
+        case '\\':
+            if (!*pat++)
+                return FALSE;
+        }

     }
     return FALSE;
 };
     }
     return FALSE;
 };


@@ -1577,129 +1579,129 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
 
     // dot_special means '.' only matches '.'
     if (dot_special && *str == '.' && *pattern != *str)
 
     // dot_special means '.' only matches '.'
     if (dot_special && *str == '.' && *pattern != *str)

-       return FALSE;
+        return FALSE;

 
     while ((*pattern != '\0') && (!done)
     && (((*str=='\0')&&((*pattern==OB)||(*pattern=='*')))||(*str!='\0'))) {
 
     while ((*pattern != '\0') && (!done)
     && (((*str=='\0')&&((*pattern==OB)||(*pattern=='*')))||(*str!='\0'))) {

-       switch (*pattern) {
-       case '\\':
-           pattern++;
-           if (*pattern != '\0')
-               pattern++;
-           break;
-       case '*':
-           pattern++;
-           ret_code = FALSE;
-           while ((*str!='\0')
-           && (!(ret_code=wxMatchWild(pattern, str++, FALSE))))
-               /*loop*/;
-           if (ret_code) {
-               while (*str != '\0')
-                   str++;
-               while (*pattern != '\0')
-                   pattern++;
-           }
-           break;
-       case '[':
-           pattern++;
-         repeat:
-           if ((*pattern == '\0') || (*pattern == ']')) {
-               done = TRUE;
-               break;
-           }
-           if (*pattern == '\\') {
-               pattern++;
-               if (*pattern == '\0') {
-                   done = TRUE;
-                   break;
-               }
-           }
-           if (*(pattern + 1) == '-') {
-               c = *pattern;
-               pattern += 2;
-               if (*pattern == ']') {
-                   done = TRUE;
-                   break;
-               }
-               if (*pattern == '\\') {
-                   pattern++;
-                   if (*pattern == '\0') {
-                       done = TRUE;
-                       break;
-                   }
-               }
-               if ((*str < c) || (*str > *pattern)) {
-                   pattern++;
-                   goto repeat;
-               }
-           } else if (*pattern != *str) {
-               pattern++;
-               goto repeat;
-           }
-           pattern++;
-           while ((*pattern != ']') && (*pattern != '\0')) {
-               if ((*pattern == '\\') && (*(pattern + 1) != '\0'))
-                   pattern++;
-               pattern++;
-           }
-           if (*pattern != '\0') {
-               pattern++, str++;
-           }
-           break;
-       case '?':
-           pattern++;
-           str++;
-           break;
-       case OB:
-           pattern++;
-           while ((*pattern != CB) && (*pattern != '\0')) {
-               cp = str;
-               ok = TRUE;
-               while (ok && (*cp != '\0') && (*pattern != '\0')
-               &&  (*pattern != ',') && (*pattern != CB)) {
-                   if (*pattern == '\\')
-                       pattern++;
-                   ok = (*pattern++ == *cp++);
-               }
-               if (*pattern == '\0') {
-                   ok = FALSE;
-                   done = TRUE;
-                   break;
-               } else if (ok) {
-                   str = cp;
-                   while ((*pattern != CB) && (*pattern != '\0')) {
-                       if (*++pattern == '\\') {
-                           if (*++pattern == CB)
-                               pattern++;
-                       }
-                   }
-               } else {
-                   while (*pattern!=CB && *pattern!=',' && *pattern!='\0') {
-                       if (*++pattern == '\\') {
+        switch (*pattern) {
+        case '\\':
+            pattern++;
+            if (*pattern != '\0')
+                pattern++;
+            break;
+        case '*':
+            pattern++;
+            ret_code = FALSE;
+            while ((*str!='\0')
+            && (!(ret_code=wxMatchWild(pattern, str++, FALSE))))
+                /*loop*/;
+            if (ret_code) {
+                while (*str != '\0')
+                    str++;
+                while (*pattern != '\0')
+                    pattern++;
+            }
+            break;
+        case '[':
+            pattern++;
+          repeat:
+            if ((*pattern == '\0') || (*pattern == ']')) {
+                done = TRUE;
+                break;
+            }
+            if (*pattern == '\\') {
+                pattern++;
+                if (*pattern == '\0') {
+                    done = TRUE;
+                    break;
+                }
+            }
+            if (*(pattern + 1) == '-') {
+                c = *pattern;
+                pattern += 2;
+                if (*pattern == ']') {
+                    done = TRUE;
+                    break;
+                }
+                if (*pattern == '\\') {
+                    pattern++;
+                    if (*pattern == '\0') {
+                        done = TRUE;
+                        break;
+                    }
+                }
+                if ((*str < c) || (*str > *pattern)) {
+                    pattern++;
+                    goto repeat;
+                }
+            } else if (*pattern != *str) {
+                pattern++;
+                goto repeat;
+            }
+            pattern++;
+            while ((*pattern != ']') && (*pattern != '\0')) {
+                if ((*pattern == '\\') && (*(pattern + 1) != '\0'))
+                    pattern++;
+                pattern++;
+            }
+            if (*pattern != '\0') {
+                pattern++, str++;
+            }
+            break;
+        case '?':
+            pattern++;
+            str++;
+            break;
+        case OB:
+            pattern++;
+            while ((*pattern != CB) && (*pattern != '\0')) {
+                cp = str;
+                ok = TRUE;
+                while (ok && (*cp != '\0') && (*pattern != '\0')
+                &&  (*pattern != ',') && (*pattern != CB)) {
+                    if (*pattern == '\\')
+                        pattern++;
+                    ok = (*pattern++ == *cp++);
+                }
+                if (*pattern == '\0') {
+                    ok = FALSE;
+                    done = TRUE;
+                    break;
+                } else if (ok) {
+                    str = cp;
+                    while ((*pattern != CB) && (*pattern != '\0')) {
+                        if (*++pattern == '\\') {
+                            if (*++pattern == CB)
+                                pattern++;
+                        }
+                    }
+                } else {
+                    while (*pattern!=CB && *pattern!=',' && *pattern!='\0') {
+                        if (*++pattern == '\\') {

                             if (*++pattern == CB || *pattern == ',')
                             if (*++pattern == CB || *pattern == ',')

-                               pattern++;
-                       }
-                   }
-               }
-               if (*pattern != '\0')
-                   pattern++;
-           }
-           break;
-       default:
-           if (*str == *pattern) {
-               str++, pattern++;
-           } else {
-               done = TRUE;
-           }
-       }
+                                pattern++;
+                        }
+                    }
+                }
+                if (*pattern != '\0')
+                    pattern++;
+            }
+            break;
+        default:
+            if (*str == *pattern) {
+                str++, pattern++;
+            } else {
+                done = TRUE;
+            }
+        }

     }
     while (*pattern == '*')
     }
     while (*pattern == '*')

-       pattern++;
+        pattern++;

     return ((*str == '\0') && (*pattern == '\0'));
 };
 
 #endif
 
     return ((*str == '\0') && (*pattern == '\0'));
 };
 
 #endif
 

-#ifdef _MSC_VER
+#ifdef __VISUALC__

     #pragma warning(default:4706)   // assignment within conditional expression
 #endif // VC++
     #pragma warning(default:4706)   // assignment within conditional expression
 #endif // VC++

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 8708f2debc52375bf1ea4b973f660cea57a454a3..03267bf2d3a17ab15de7720779189f6d3872e3f7 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -986,7 +986,7 @@ void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
 
   // make life easier for people using VC++ IDE: clicking on the message will
   // take us immediately to the place of the failed assert
 
   // make life easier for people using VC++ IDE: clicking on the message will
   // take us immediately to the place of the failed assert

-#ifdef _MSC_VER
+#ifdef __VISUALC__

   sprintf(szBuf, _("%s(%d): assert failed"), szFile, nLine);
 #else  // !VC++
   // make the error message more clear for all the others
   sprintf(szBuf, _("%s(%d): assert failed"), szFile, nLine);
 #else  // !VC++
   // make the error message more clear for all the others

diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 81245b504f2178305b82504f5223afb975d54a82..7cac322e8d7b0ad2e05f810e1011cba17585b6b8 100644 (file)
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -38,15 +38,12 @@
 #include <wx/log.h>
 #include <stdlib.h>
 
 #include <wx/log.h>
 #include <stdlib.h>
 

+#include "wx/ioswrap.h"
+

 #if wxUSE_IOSTREAMH
 #if wxUSE_IOSTREAMH

-#include <iostream.h>
-#include <fstream.h>
+    #include <fstream.h>

 #else
 #else

-#include <iostream>
-#include <fstream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
+    #include <fstream>

 #endif
 
 #if !defined(__WATCOMC__) && !defined(__VMS__) && !defined( __MWERKS__ ) && !defined(__SALFORDC__)
 #endif
 
 #if !defined(__WATCOMC__) && !defined(__VMS__) && !defined( __MWERKS__ ) && !defined(__SALFORDC__)


@@ -78,8 +75,8 @@
 // wxDebugContext wxTheDebugContext;
 /*
   Redefine new and delete so that we can pick up situations where:
 // wxDebugContext wxTheDebugContext;
 /*
   Redefine new and delete so that we can pick up situations where:

-       - we overwrite or underwrite areas of malloc'd memory.
-       - we use uninitialise variables
+        - we overwrite or underwrite areas of malloc'd memory.
+        - we use uninitialise variables

   Only do this in debug mode.
 
   We change new to get enough memory to allocate a struct, followed
   Only do this in debug mode.
 
   We change new to get enough memory to allocate a struct, followed


@@ -116,7 +113,7 @@ void wxMemStruct::ErrorMsg (const char * mesg)
   wxLogDebug("wxWindows memory checking error: %s", mesg);
   PrintNode ();
 
   wxLogDebug("wxWindows memory checking error: %s", mesg);
   PrintNode ();
 

-//      << m_fileName << ' ' << m_lineNum << endl;
+//         << m_fileName << ' ' << m_lineNum << endl;

 }
 
 /*
 }
 
 /*


@@ -126,7 +123,7 @@ void wxMemStruct::ErrorMsg ()
 {
   wxLogDebug("wxWindows over/underwrite memory error:");
   PrintNode ();
 {
   wxLogDebug("wxWindows over/underwrite memory error:");
   PrintNode ();

-    
+

 //    cerr << m_fileName << ' ' << m_lineNum << endl;
 }
 
 //    cerr << m_fileName << ' ' << m_lineNum << endl;
 }
 


@@ -141,9 +138,9 @@ void wxMemStruct::ErrorMsg ()
 int wxMemStruct::AssertList ()
 {
     if (wxDebugContext::GetHead () != 0 && ! (wxDebugContext::GetHead ())->AssertIt () ||
 int wxMemStruct::AssertList ()
 {
     if (wxDebugContext::GetHead () != 0 && ! (wxDebugContext::GetHead ())->AssertIt () ||

-       wxDebugContext::GetTail () != 0 && ! wxDebugContext::GetTail ()->AssertIt ()) {
-       ErrorMsg ("Head or tail pointers trashed");
-       return 0;
+        wxDebugContext::GetTail () != 0 && ! wxDebugContext::GetTail ()->AssertIt ()) {
+        ErrorMsg ("Head or tail pointers trashed");
+        return 0;

     }
     return 1;
 }
     }
     return 1;
 }


@@ -163,8 +160,8 @@ int wxMemStruct::AssertList ()
 int wxMemStruct::AssertIt ()
 {
     return (m_id == MemStructId &&
 int wxMemStruct::AssertIt ()
 {
     return (m_id == MemStructId &&

-           (m_prev == 0 || m_prev->m_id == MemStructId) &&
-           (m_next == 0 || m_next->m_id == MemStructId));
+            (m_prev == 0 || m_prev->m_id == MemStructId) &&
+            (m_next == 0 || m_next->m_id == MemStructId));

 }
 
 
 }
 
 


@@ -175,19 +172,19 @@ int wxMemStruct::AssertIt ()
 int wxMemStruct::Append ()
 {
     if (! AssertList ())
 int wxMemStruct::Append ()
 {
     if (! AssertList ())

-       return 0;
+        return 0;

 
     if (wxDebugContext::GetHead () == 0) {
 
     if (wxDebugContext::GetHead () == 0) {

-       if (wxDebugContext::GetTail () != 0) {
-           ErrorMsg ("Null list should have a null tail pointer");
-           return 0;
-       }
-       (void) wxDebugContext::SetHead (this);
-       (void) wxDebugContext::SetTail (this);
+        if (wxDebugContext::GetTail () != 0) {
+            ErrorMsg ("Null list should have a null tail pointer");
+            return 0;
+        }
+        (void) wxDebugContext::SetHead (this);
+        (void) wxDebugContext::SetTail (this);

     } else {
     } else {

-       wxDebugContext::GetTail ()->m_next = this;
-       this->m_prev = wxDebugContext::GetTail ();
-       (void) wxDebugContext::SetTail (this);
+        wxDebugContext::GetTail ()->m_next = this;
+        this->m_prev = wxDebugContext::GetTail ();
+        (void) wxDebugContext::SetTail (this);

     }
     return 1;
 }
     }
     return 1;
 }


@@ -201,51 +198,51 @@ int wxMemStruct::Append ()
 int wxMemStruct::Unlink ()
 {
     if (! AssertList ())
 int wxMemStruct::Unlink ()
 {
     if (! AssertList ())

-       return 0;
+        return 0;

 
     if (wxDebugContext::GetHead () == 0 || wxDebugContext::GetTail () == 0) {
 
     if (wxDebugContext::GetHead () == 0 || wxDebugContext::GetTail () == 0) {

-       ErrorMsg ("Trying to remove node from empty list");
-       return 0;
+        ErrorMsg ("Trying to remove node from empty list");
+        return 0;

     }
 
     // Handle the part of the list before this node.
     if (m_prev == 0) {
     }
 
     // Handle the part of the list before this node.
     if (m_prev == 0) {

-       if (this != wxDebugContext::GetHead ()) {
-           ErrorMsg ("No previous node for non-head node");
-           return 0;
-       }
-       (void) wxDebugContext::SetHead (m_next);
+        if (this != wxDebugContext::GetHead ()) {
+            ErrorMsg ("No previous node for non-head node");
+            return 0;
+        }
+        (void) wxDebugContext::SetHead (m_next);

     } else {
     } else {

-       if (! m_prev->AssertIt ()) {
-           ErrorMsg ("Trashed previous pointer");
-           return 0;
-       }
-       
-       if (m_prev->m_next != this) {
-           ErrorMsg ("List is inconsistent");
-           return 0;
-       }
-       m_prev->m_next = m_next;
+        if (! m_prev->AssertIt ()) {
+            ErrorMsg ("Trashed previous pointer");
+            return 0;
+        }
+
+        if (m_prev->m_next != this) {
+            ErrorMsg ("List is inconsistent");
+            return 0;
+        }
+        m_prev->m_next = m_next;

     }
 
     // Handle the part of the list after this node.
     if (m_next == 0) {
     }
 
     // Handle the part of the list after this node.
     if (m_next == 0) {

-       if (this != wxDebugContext::GetTail ()) {
-           ErrorMsg ("No next node for non-tail node");
-           return 0;
-       }
-       (void) wxDebugContext::SetTail (m_prev);
+        if (this != wxDebugContext::GetTail ()) {
+            ErrorMsg ("No next node for non-tail node");
+            return 0;
+        }
+        (void) wxDebugContext::SetTail (m_prev);

     } else {
     } else {

-       if (! m_next->AssertIt ()) {
-           ErrorMsg ("Trashed next pointer");
-           return 0;
-       }
-
-       if (m_next->m_prev != this) {
-           ErrorMsg ("List is inconsistent");
-           return 0;
-       }
-       m_next->m_prev = m_prev;
+        if (! m_next->AssertIt ()) {
+            ErrorMsg ("Trashed next pointer");
+            return 0;
+        }
+
+        if (m_next->m_prev != this) {
+            ErrorMsg ("List is inconsistent");
+            return 0;
+        }
+        m_next->m_prev = m_prev;

     }
 
     return 1;
     }
 
     return 1;


@@ -262,22 +259,22 @@ int wxMemStruct::CheckBlock ()
     int nFailures = 0;
 
     if (m_firstMarker != MemStartCheck) {
     int nFailures = 0;
 
     if (m_firstMarker != MemStartCheck) {

-       nFailures++;
-       ErrorMsg ();
+        nFailures++;
+        ErrorMsg ();

     }
     }

-    
+

     char * pointer = wxDebugContext::MidMarkerPos ((char *) this);
     if (* (wxMarkerType *) pointer != MemMidCheck) {
     char * pointer = wxDebugContext::MidMarkerPos ((char *) this);
     if (* (wxMarkerType *) pointer != MemMidCheck) {

-       nFailures++;
-       ErrorMsg ();
+        nFailures++;
+        ErrorMsg ();

     }
     }

-    
+

     pointer = wxDebugContext::EndMarkerPos ((char *) this, RequestSize ());
     if (* (wxMarkerType *) pointer != MemEndCheck) {
     pointer = wxDebugContext::EndMarkerPos ((char *) this, RequestSize ());
     if (* (wxMarkerType *) pointer != MemEndCheck) {

-       nFailures++;
-       ErrorMsg ();
+        nFailures++;
+        ErrorMsg ();

     }
     }

-    
+

     return nFailures;
 }
 
     return nFailures;
 }
 


@@ -288,12 +285,12 @@ int wxMemStruct::CheckBlock ()
 int wxMemStruct::CheckAllPrevious ()
 {
     int nFailures = 0;
 int wxMemStruct::CheckAllPrevious ()
 {
     int nFailures = 0;

-    
+

     for (wxMemStruct * st = this->m_prev; st != 0; st = st->m_prev) {
     for (wxMemStruct * st = this->m_prev; st != 0; st = st->m_prev) {

-       if (st->AssertIt ())
-           nFailures += st->CheckBlock ();
-       else
-           return -1;
+        if (st->AssertIt ())
+            nFailures += st->CheckBlock ();
+        else
+            return -1;

     }
 
     return nFailures;
     }
 
     return nFailures;


@@ -366,7 +363,7 @@ void wxMemStruct::PrintNode ()
 void wxMemStruct::Dump ()
 {
   if (!ValidateNode()) return;
 void wxMemStruct::Dump ()
 {
   if (!ValidateNode()) return;

-  
+

   if (m_isObject)
   {
     wxObject *obj = (wxObject *)m_actualData;
   if (m_isObject)
   {
     wxObject *obj = (wxObject *)m_actualData;


@@ -416,15 +413,15 @@ int wxMemStruct::ValidateNode ()
 {
     char * startPointer = (char *) this;
     if (!AssertIt ()) {
 {
     char * startPointer = (char *) this;
     if (!AssertIt ()) {

-       if (IsDeleted ())
-           ErrorMsg ("Object already deleted");
-       else {
-           // Can't use the error routines as we have no recognisable object.
+        if (IsDeleted ())
+            ErrorMsg ("Object already deleted");
+        else {
+            // Can't use the error routines as we have no recognisable object.

 #ifndef __WXGTK__
 #ifndef __WXGTK__

-            wxLogDebug("Can't verify memory struct - all bets are off!");
+             wxLogDebug("Can't verify memory struct - all bets are off!");

 #endif
 #endif

-       }
-       return 0;
+        }
+        return 0;

     }
 
 /*
     }
 
 /*


@@ -438,20 +435,20 @@ int wxMemStruct::ValidateNode ()
     if (* (wxMarkerType *) wxDebugContext::MidMarkerPos (startPointer) != MemMidCheck)
       ErrorMsg ();
     if (* (wxMarkerType *) wxDebugContext::EndMarkerPos (startPointer,
     if (* (wxMarkerType *) wxDebugContext::MidMarkerPos (startPointer) != MemMidCheck)
       ErrorMsg ();
     if (* (wxMarkerType *) wxDebugContext::EndMarkerPos (startPointer,

-                                             RequestSize ()) !=
-       MemEndCheck)
+                                              RequestSize ()) !=
+        MemEndCheck)

       ErrorMsg ();
 
     // Back to before the extra buffer and check that
     // we can still read what we originally wrote.
     if (Marker () != MemStartCheck ||
       ErrorMsg ();
 
     // Back to before the extra buffer and check that
     // we can still read what we originally wrote.
     if (Marker () != MemStartCheck ||

-       * (wxMarkerType *) wxDebugContext::MidMarkerPos (startPointer)
-                        != MemMidCheck ||
-       * (wxMarkerType *) wxDebugContext::EndMarkerPos (startPointer,
-                                             RequestSize ()) != MemEndCheck)
+        * (wxMarkerType *) wxDebugContext::MidMarkerPos (startPointer)
+                         != MemMidCheck ||
+        * (wxMarkerType *) wxDebugContext::EndMarkerPos (startPointer,
+                                              RequestSize ()) != MemEndCheck)

     {
     {

-       ErrorMsg ();
-       return 0;
+        ErrorMsg ();
+        return 0;

     }
 
     return 1;
     }
 
     return 1;


@@ -588,7 +585,7 @@ char * wxDebugContext::EndMarkerPos (const char * buf, const size_t size)
 char * wxDebugContext::StartPos (const char * caller)
 {
     return ((char *) (caller - wxDebugContext::PaddedSize (sizeof(wxMarkerType)) -
 char * wxDebugContext::StartPos (const char * caller)
 {
     return ((char *) (caller - wxDebugContext::PaddedSize (sizeof(wxMarkerType)) -

-           wxDebugContext::PaddedSize (sizeof (wxMemStruct))));
+            wxDebugContext::PaddedSize (sizeof (wxMemStruct))));

 }
 
 /*
 }
 
 /*


@@ -620,7 +617,7 @@ size_t wxDebugContext::PaddedSize (const size_t size)
 size_t wxDebugContext::TotSize (const size_t reqSize)
 {
     return (PaddedSize (sizeof (wxMemStruct)) + PaddedSize (reqSize) +
 size_t wxDebugContext::TotSize (const size_t reqSize)
 {
     return (PaddedSize (sizeof (wxMemStruct)) + PaddedSize (reqSize) +

-           2 * sizeof(wxMarkerType));
+            2 * sizeof(wxMarkerType));

 }
 
 
 }
 
 


@@ -631,7 +628,7 @@ void wxDebugContext::TraverseList (PmSFV func, wxMemStruct *from)
 {
   if (!from)
     from = wxDebugContext::GetHead ();
 {
   if (!from)
     from = wxDebugContext::GetHead ();

-    
+

   for (wxMemStruct * st = from; st != 0; st = st->m_next)
   {
       void* data = st->GetActualData();
   for (wxMemStruct * st = from; st != 0; st = st->m_next)
   {
       void* data = st->GetActualData();


@@ -683,7 +680,7 @@ bool wxDebugContext::Dump(void)
     }
   }
   TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));
     }
   }
   TraverseList ((PmSFV)&wxMemStruct::Dump, (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL));

-  
+

   wxLogDebug( "" );
   wxLogDebug( "" );
 
   wxLogDebug( "" );
   wxLogDebug( "" );
 


@@ -739,10 +736,10 @@ bool wxDebugContext::PrintStatistics(bool detailed)
       wxLogDebug( "----- Memory statistics -----" );
     }
   }
       wxLogDebug( "----- Memory statistics -----" );
     }
   }

-  
+

   bool currentMode = GetDebugMode();
   SetDebugMode(FALSE);
   bool currentMode = GetDebugMode();
   SetDebugMode(FALSE);

-  
+

   long noNonObjectNodes = 0;
   long noObjectNodes = 0;
   long totalSize = 0;
   long noNonObjectNodes = 0;
   long noObjectNodes = 0;
   long totalSize = 0;


@@ -753,7 +750,7 @@ bool wxDebugContext::PrintStatistics(bool detailed)
   if (!from)
     from = wxDebugContext::GetHead ();
 
   if (!from)
     from = wxDebugContext::GetHead ();
 

-  wxMemStruct *st;    
+  wxMemStruct *st;

   for (st = from; st != 0; st = st->m_next)
   {
     void* data = st->GetActualData();
   for (st = from; st != 0; st = st->m_next)
   {
     void* data = st->GetActualData();


@@ -803,7 +800,7 @@ bool wxDebugContext::PrintStatistics(bool detailed)
     }
     wxLogDebug("");
   }
     }
     wxLogDebug("");
   }

-  
+

   SetDebugMode(currentMode);
 
   wxLogDebug("Number of object items: %ld", noObjectNodes);
   SetDebugMode(currentMode);
 
   wxLogDebug("Number of object items: %ld", noObjectNodes);


@@ -816,7 +813,7 @@ bool wxDebugContext::PrintStatistics(bool detailed)
 #else
   return FALSE;
 #endif
 #else
   return FALSE;
 #endif

-}    
+}

 
 bool wxDebugContext::PrintClasses(void)
 {
 
 bool wxDebugContext::PrintClasses(void)
 {


@@ -874,7 +871,7 @@ bool wxDebugContext::PrintClasses(void)
   wxLogDebug("");
   wxLogDebug("");
   return TRUE;
   wxLogDebug("");
   wxLogDebug("");
   return TRUE;

-}    
+}

 
 void wxDebugContext::SetCheckpoint(bool all)
 {
 
 void wxDebugContext::SetCheckpoint(bool all)
 {


@@ -888,7 +885,7 @@ void wxDebugContext::SetCheckpoint(bool all)
 int wxDebugContext::Check(bool checkAll)
 {
   int nFailures = 0;
 int wxDebugContext::Check(bool checkAll)
 {
   int nFailures = 0;

-    
+

   wxMemStruct *from = (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL );
   if (!from || checkAll)
     from = wxDebugContext::GetHead ();
   wxMemStruct *from = (checkPoint ? checkPoint->m_next : (wxMemStruct*)NULL );
   if (!from || checkAll)
     from = wxDebugContext::GetHead ();


@@ -942,7 +939,7 @@ int wxDebugContext::CountObjectsLeft(bool sinceCheckpoint)
 #endif
 
 // Seems OK all of a sudden. Maybe to do with linking with multithreaded library?
 #endif
 
 // Seems OK all of a sudden. Maybe to do with linking with multithreaded library?

-#if 0 // def _MSC_VER
+#if 0 // def __VISUALC__

 #define NO_DEBUG_ALLOCATION
 #endif
 
 #define NO_DEBUG_ALLOCATION
 #endif
 


@@ -1001,7 +998,7 @@ void operator delete (void * buf)
 }
 
 // VC++ 6.0
 }
 
 // VC++ 6.0

-#if _MSC_VER >= 1200
+#if defined(__VISUALC__) && (__VISUALC__ >= 1200)

 void operator delete(void* pData, char* /* fileName */, int /* lineNum */)
 {
 // ::operator delete(pData);
 void operator delete(void* pData, char* /* fileName */, int /* lineNum */)
 {
 // ::operator delete(pData);


@@ -1039,12 +1036,12 @@ void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bo
   {
     return (void *)malloc(size);
   }
   {
     return (void *)malloc(size);
   }

-  
+

     int totSize = wxDebugContext::TotSize (size);
     char * buf = (char *) malloc(totSize);
     if (!buf) {
     int totSize = wxDebugContext::TotSize (size);
     char * buf = (char *) malloc(totSize);
     if (!buf) {

-       wxLogDebug("Call to malloc (%ld) failed.", (long)size);
-       return 0;
+        wxLogDebug("Call to malloc (%ld) failed.", (long)size);
+        return 0;

     }
     wxMemStruct * st = (wxMemStruct *)buf;
     st->m_firstMarker = MemStartCheck;
     }
     wxMemStruct * st = (wxMemStruct *)buf;
     st->m_firstMarker = MemStartCheck;


@@ -1058,15 +1055,15 @@ void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bo
 
     // Errors from Append() shouldn't really happen - but just in case!
     if (st->Append () == 0) {
 
     // Errors from Append() shouldn't really happen - but just in case!
     if (st->Append () == 0) {

-       st->ErrorMsg ("Trying to append new node");
+        st->ErrorMsg ("Trying to append new node");

     }
     }

-    
+

     if (wxDebugContext::GetCheckPrevious ()) {
     if (wxDebugContext::GetCheckPrevious ()) {

-       if (st->CheckAllPrevious () < 0) {
-           st->ErrorMsg ("Checking previous nodes");
-       }
+        if (st->CheckAllPrevious () < 0) {
+            st->ErrorMsg ("Checking previous nodes");
+        }

     }
     }

-    
+

     // Set up the extra markers at the middle and end.
     char * ptr = wxDebugContext::MidMarkerPos (buf);
     * (wxMarkerType *) ptr = MemMidCheck;
     // Set up the extra markers at the middle and end.
     char * ptr = wxDebugContext::MidMarkerPos (buf);
     * (wxMarkerType *) ptr = MemMidCheck;


@@ -1086,7 +1083,7 @@ void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
 {
   if (!buf)
     return;
 {
   if (!buf)
     return;

-    
+

   // If not in debugging allocation mode, do the normal thing
   // so we don't leave any trace of ourselves in the node list.
   if (!wxDebugContext::GetDebugMode())
   // If not in debugging allocation mode, do the normal thing
   // so we don't leave any trace of ourselves in the node list.
   if (!wxDebugContext::GetDebugMode())


@@ -1101,7 +1098,7 @@ void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
     wxMemStruct * st = (wxMemStruct *) wxDebugContext::StructPos (startPointer);
 
     if (! st->ValidateNode ())
     wxMemStruct * st = (wxMemStruct *) wxDebugContext::StructPos (startPointer);
 
     if (! st->ValidateNode ())

-       return;
+        return;

 
     // If this is the current checkpoint, we need to
     // move the checkpoint back so it points to a valid
 
     // If this is the current checkpoint, we need to
     // move the checkpoint back so it points to a valid


@@ -1113,12 +1110,12 @@ void wxDebugFree(void * buf, bool WXUNUSED(isVect) )
     {
       st->ErrorMsg ("Unlinking deleted node");
     }
     {
       st->ErrorMsg ("Unlinking deleted node");
     }

-    
+

     // Now put in the fill char into the id slot and the caller requested
     // memory locations.
     st->SetDeleted ();
     (void) memset (wxDebugContext::CallerMemPos (startPointer), MemFillChar,
     // Now put in the fill char into the id slot and the caller requested
     // memory locations.
     st->SetDeleted ();
     (void) memset (wxDebugContext::CallerMemPos (startPointer), MemFillChar,

-                  st->RequestSize ());
+                   st->RequestSize ());

 
     // Don't allow delayed freeing of memory in this version
 //    if (!wxDebugContext::GetDelayFree())
 
     // Don't allow delayed freeing of memory in this version
 //    if (!wxDebugContext::GetDelayFree())


@@ -1160,7 +1157,7 @@ void wxTraceLevel(int level, const char *fmt ...)
 {
   if (wxDebugContext::GetLevel() < level)
     return;
 {
   if (wxDebugContext::GetLevel() < level)
     return;

-    
+

   va_list ap;
   static char buffer[512];
 
   va_list ap;
   static char buffer[512];
 

diff --git a/src/common/object.cpp b/src/common/object.cpp
index 4ac78acc233be0e6217f1061047159b6908a6375..acebb417292c064706eb41e0c08ba9e30271fc1c 100644 (file)
--- a/src/common/object.cpp
+++ b/src/common/object.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -40,15 +40,8 @@
 #endif
 
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
 #endif
 
 #if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT

-  // for wxObject::Dump
-#if wxUSE_IOSTREAMH
-#  include <iostream.h>
-#else
-#  include <iostream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
-#endif
+    // for wxObject::Dump
+    #include "wx/ioswrap.h"

 #endif
 
 #if !USE_SHARED_LIBRARY
 #endif
 
 #if !USE_SHARED_LIBRARY


@@ -121,7 +114,7 @@ void wxObject::operator delete (void * buf)
 }
 
 // VC++ 6.0
 }
 
 // VC++ 6.0

-#if _MSC_VER >= 1200
+#if defined(__VISUALC__) && (__VISUALC__ >= 1200)

 void wxObject::operator delete(void* pData, char* /* fileName */, int /* lineNum */)
 {
  ::operator delete(pData);
 void wxObject::operator delete(void* pData, char* /* fileName */, int /* lineNum */)
 {
  ::operator delete(pData);


@@ -129,7 +122,7 @@ void wxObject::operator delete(void* pData, char* /* fileName */, int /* lineNum
 #endif
 
 // Cause problems for VC++ - crashes
 #endif
 
 // Cause problems for VC++ - crashes

-#if !defined(_MSC_VER) && wxUSE_ARRAY_MEMORY_OPERATORS
+#if !defined(__VISUALC__) && wxUSE_ARRAY_MEMORY_OPERATORS

 void * wxObject::operator new[] (size_t size, char * fileName, int lineNum)
 {
   return wxDebugAlloc(size, fileName, lineNum, TRUE, TRUE);
 void * wxObject::operator new[] (size_t size, char * fileName, int lineNum)
 {
   return wxDebugAlloc(size, fileName, lineNum, TRUE, TRUE);

diff --git a/src/common/odbc.cpp b/src/common/odbc.cpp
index 576ee3a4874817a4cf7ed20fb5721292d452005b..f82a986409db28e6e0a71ec989f71785260444b3 100644 (file)
--- a/src/common/odbc.cpp
+++ b/src/common/odbc.cpp
@@ -2,12 +2,12 @@
 // Name:        odbc.cpp
 // Purpose:     ODBC implementation
 // Author:      Julian Smart, Olaf Klein (oklein@smallo.ruhr.de),
 // Name:        odbc.cpp
 // Purpose:     ODBC implementation
 // Author:      Julian Smart, Olaf Klein (oklein@smallo.ruhr.de),

-//               Patrick Halke (patrick@zaphod.ruhr.de)
-// Modified by:        
+//              Patrick Halke (patrick@zaphod.ruhr.de)
+// Modified by:

 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -25,7 +25,7 @@
 
 #if wxUSE_ODBC
 
 
 #if wxUSE_ODBC
 

-#ifdef _MSC_VER
+#ifdef __VISUALC__

     #pragma warning(disable:4706)   // assignment within conditional expression
 #endif // VC++
 
     #pragma warning(disable:4706)   // assignment within conditional expression
 #endif // VC++
 


@@ -1831,7 +1831,7 @@ bool wxQueryField::IsDirty(void) {
   return dirty;
 }
 
   return dirty;
 }
 

-#ifdef _MSC_VER
+#ifdef __VISUALC__

     #pragma warning(default:4706)   // assignment within conditional expression
 #endif // VC++
 
     #pragma warning(default:4706)   // assignment within conditional expression
 #endif // VC++
 

diff --git a/src/common/resourc2.cpp b/src/common/resourc2.cpp
index 4bee887ddb459fda7c1c3ac5ef5eb1537cffe425..42deac36a0895214f6018e0287678195ce49ac4a 100644 (file)
--- a/src/common/resourc2.cpp
+++ b/src/common/resourc2.cpp
@@ -22,7 +22,7 @@
 
 #if wxUSE_WX_RESOURCES
 
 
 #if wxUSE_WX_RESOURCES
 

-#ifdef _MSC_VER
+#ifdef __VISUALC__

     #pragma warning(disable:4706)   // assignment within conditional expression
 #endif // VC++
 
     #pragma warning(disable:4706)   // assignment within conditional expression
 #endif // VC++
 


@@ -1568,7 +1568,7 @@ wxControl *wxWindow::CreateItem(const wxItemResource *resource, const wxItemReso
   return table->CreateItem((wxWindow *)this, resource, parentResource);
 }
 
   return table->CreateItem((wxWindow *)this, resource, parentResource);
 }
 

-#ifdef _MSC_VER
+#ifdef __VISUALC__

     #pragma warning(default:4706)   // assignment within conditional expression
 #endif // VC++
 
     #pragma warning(default:4706)   // assignment within conditional expression
 #endif // VC++
 

diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index 031a211c74df3753e26ec98207bcbd638238b8d6..7b8918622cc846344bdad5db4ec10e0843747d8f 100644 (file)
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -22,7 +22,7 @@
 
 #if wxUSE_WX_RESOURCES
 
 
 #if wxUSE_WX_RESOURCES
 

-#ifdef _MSC_VER
+#ifdef __VISUALC__

     #pragma warning(disable:4706)   // assignment within conditional expression
 #endif // VC++
 
     #pragma warning(disable:4706)   // assignment within conditional expression
 #endif // VC++
 


@@ -2916,7 +2916,7 @@ wxControl *wxWindow::CreateItem(const wxItemResource *resource, const wxItemReso
   return table->CreateItem((wxWindow *)this, resource, parentResource);
 }
 
   return table->CreateItem((wxWindow *)this, resource, parentResource);
 }
 

-#ifdef _MSC_VER
+#ifdef __VISUALC__

     #pragma warning(default:4706)   // assignment within conditional expression
 #endif // VC++
 
     #pragma warning(default:4706)   // assignment within conditional expression
 #endif // VC++
 

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index e4d22c8e4a24a1c2c8e6c58b8edb0ae3246443e3..56c601c617765577035866db3ca02cb0673bbef5 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -97,7 +97,7 @@ void wxMacProcessEvents() ;
 #include <signal.h>
 #include <errno.h>
 
 #include <signal.h>
 #include <errno.h>
 

-#ifdef _MSC_VER
+#ifdef __VISUALC__

 #include <io.h>
 #endif
 
 #include <io.h>
 #endif
 


@@ -157,7 +157,7 @@ void wxMacProcessEvents() ;
 // implementations (such as PC-NFS) will require you to include this
 // or a similar routine (see appendix in WinSock doc or help file).
 
 // implementations (such as PC-NFS) will require you to include this
 // or a similar routine (see appendix in WinSock doc or help file).
 

-#if defined( NEED_WSAFDIsSet ) || defined( _MSC_VER )
+#if defined( NEED_WSAFDIsSet ) || defined( __VISUALC__ )

 int PASCAL FAR __WSAFDIsSet(SOCKET fd, fd_set FAR *set)
 {
   int i = set->fd_count;
 int PASCAL FAR __WSAFDIsSet(SOCKET fd, fd_set FAR *set)
 {
   int i = set->fd_count;


@@ -440,9 +440,9 @@ wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, size_t nbytes)
   SockMsg msg;
 
   // warning about 'cast truncates constant value'
   SockMsg msg;
 
   // warning about 'cast truncates constant value'

-#ifdef _MSC_VER
+#ifdef __VISUALC__

     #pragma warning(disable: 4310)
     #pragma warning(disable: 4310)

-#endif // _MSC_VER
+#endif // __VISUALC__

 
   msg.sig[0] = (char) 0xad;
   msg.sig[1] = (char) 0xde;
 
   msg.sig[0] = (char) 0xad;
   msg.sig[1] = (char) 0xde;


@@ -468,9 +468,9 @@ wxSocketBase& wxSocketBase::WriteMsg(const char *buffer, size_t nbytes)
 
   return *this;
 
 
   return *this;
 

-#ifdef _MSC_VER
+#ifdef __VISUALC__

     #pragma warning(default: 4310)
     #pragma warning(default: 4310)

-#endif // _MSC_VER
+#endif // __VISUALC__

 }
 
 wxSocketBase& wxSocketBase::Unread(const char *buffer, size_t nbytes)
 }
 
 wxSocketBase& wxSocketBase::Unread(const char *buffer, size_t nbytes)

diff --git a/src/common/string.cpp b/src/common/string.cpp
index deb0d439782efe9f4830c2a74ceb33edec87f4a3..1107cc55cf71076e97376dea15bc6de2a86ea9a6 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -90,7 +90,7 @@ extern const char WXDLLEXPORT *g_szNul = &g_strEmpty.dummy;
 // function: for Unix this is done with configure, for Windows we test the
 // compiler explicitly.
 #ifdef __WXMSW__
 // function: for Unix this is done with configure, for Windows we test the
 // compiler explicitly.
 #ifdef __WXMSW__

-    #ifdef _MSC_VER
+    #ifdef __VISUALC__

         #define wxVsprintf     _vsnprintf
     #endif
 #else   // !Windows
         #define wxVsprintf     _vsnprintf
     #endif
 #else   // !Windows


@@ -107,7 +107,7 @@ extern const char WXDLLEXPORT *g_szNul = &g_strEmpty.dummy;
 #ifndef __SC__
     #pragma message("Using sprintf() because no snprintf()-like function defined")
 #endif
 #ifndef __SC__
     #pragma message("Using sprintf() because no snprintf()-like function defined")
 #endif

-#endif
+#endif // no vsnprintf

 
 // ----------------------------------------------------------------------------
 // global functions
 
 // ----------------------------------------------------------------------------
 // global functions


@@ -119,46 +119,18 @@ extern const char WXDLLEXPORT *g_szNul = &g_strEmpty.dummy;
 // iostream ones.
 //
 // ATTN: you can _not_ use both of these in the same program!
 // iostream ones.
 //
 // ATTN: you can _not_ use both of these in the same program!

-#if wxUSE_IOSTREAMH
-#include <iostream.h>
-#define   NAMESPACE
-#else
-#include <iostream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
-// for msvc (bcc50+ also) you don't need these NAMESPACE defines,
-// using namespace std; takes care of that.
-#define   NAMESPACE   std::
-#endif
-
-#ifdef __WXMSW__
-    #ifdef _MSC_VER
-        #define wxVsprintf     _vsnprintf
-    #endif
-#else
-    #if defined ( HAVE_VSNPRINTF )
-        #define wxVsprintf       vsnprintf
-    #endif
-#endif

 
 

-#ifndef wxVsprintf
-    // vsprintf() is ANSI so we can always use it, but it's unsafe!
-    #define wxVsprintf(buffer,len,format,argptr) vsprintf(buffer,format, argptr)
-    #pragma message("Using sprintf() because no snprintf()-like function defined")
-#endif
-
-NAMESPACE istream& operator>>(NAMESPACE istream& is, wxString& WXUNUSED(str))
+istream& operator>>(istream& is, wxString& WXUNUSED(str))

 {
 #if 0
   int w = is.width(0);
   if ( is.ipfx(0) ) {
 {
 #if 0
   int w = is.width(0);
   if ( is.ipfx(0) ) {

-    NAMESPACE streambuf *sb = is.rdbuf();
+    streambuf *sb = is.rdbuf();

     str.erase();
     while ( true ) {
       int ch = sb->sbumpc ();
       if ( ch == EOF ) {
     str.erase();
     while ( true ) {
       int ch = sb->sbumpc ();
       if ( ch == EOF ) {

-        is.setstate(NAMESPACE ios::eofbit);
+        is.setstate(ios::eofbit);

         break;
       }
       else if ( isspace(ch) ) {
         break;
       }
       else if ( isspace(ch) ) {


@@ -174,7 +146,7 @@ NAMESPACE istream& operator>>(NAMESPACE istream& is, wxString& WXUNUSED(str))
 
   is.isfx();
   if ( str.length() == 0 )
 
   is.isfx();
   if ( str.length() == 0 )

-    is.setstate(NAMESPACE ios::failbit);
+    is.setstate(ios::failbit);

 #endif
   return is;
 }
 #endif
   return is;
 }


@@ -1142,12 +1114,12 @@ size_t wxString::find(const wxString& str, size_t nStart) const
 }
 
 // VC++ 1.5 can't cope with the default argument in the header.
 }
 
 // VC++ 1.5 can't cope with the default argument in the header.

-#if ! (defined(_MSC_VER) && !defined(__WIN32__))
+#if !defined(__VISUALC__) || defined(__WIN32__)

 size_t wxString::find(const char* sz, size_t nStart, size_t n) const
 {
   return find(wxString(sz, n == npos ? 0 : n), nStart);
 }
 size_t wxString::find(const char* sz, size_t nStart, size_t n) const
 {
   return find(wxString(sz, n == npos ? 0 : n), nStart);
 }

-#endif
+#endif // VC++ 1.5

 
 // Gives a duplicate symbol (presumably a case-insensitivity problem)
 #if !defined(__BORLANDC__)
 
 // Gives a duplicate symbol (presumably a case-insensitivity problem)
 #if !defined(__BORLANDC__)


@@ -1178,7 +1150,7 @@ size_t wxString::rfind(const wxString& str, size_t nStart) const
 }
 
 // VC++ 1.5 can't cope with the default argument in the header.
 }
 
 // VC++ 1.5 can't cope with the default argument in the header.

-#if ! (defined(_MSC_VER) && !defined(__WIN32__))
+#if !defined(__VISUALC__) || defined(__WIN32__)

 size_t wxString::rfind(const char* sz, size_t nStart, size_t n) const
 {
   return rfind(wxString(sz, n == npos ? 0 : n), nStart);
 size_t wxString::rfind(const char* sz, size_t nStart, size_t n) const
 {
   return rfind(wxString(sz, n == npos ? 0 : n), nStart);


@@ -1192,7 +1164,7 @@ size_t wxString::rfind(char ch, size_t nStart) const
 
   return p == NULL ? npos : p - c_str();
 }
 
   return p == NULL ? npos : p - c_str();
 }

-#endif
+#endif // VC++ 1.5

 
 wxString wxString::substr(size_t nStart, size_t nLen) const
 {
 
 wxString wxString::substr(size_t nStart, size_t nLen) const
 {

diff --git a/src/common/time.cpp b/src/common/time.cpp
index d709f8b21286364cc140db034b1b302174b3165b..71ad2fac3a5517789a6b7121db1063c89dd30d2c 100644 (file)
--- a/src/common/time.cpp
+++ b/src/common/time.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -32,17 +32,14 @@ seconds since January 1, 1901, GMT.
 #include "wx/time.h"
 #include "wx/date.h"
 #include "wx/utils.h"
 #include "wx/time.h"
 #include "wx/date.h"
 #include "wx/utils.h"

-#include <wx/intl.h>
+#include "wx/intl.h"
+
+#include "wx/ioswrap.h"

 
 #if wxUSE_IOSTREAMH
 
 #if wxUSE_IOSTREAMH

-#include <iostream.h>
-#include <iomanip.h>
+    #include <iomanip.h>

 #else
 #else

-#include <iostream>
-#include <iomanip>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
+    #include <iomanip>

 #endif
 
 #include <string.h>
 #endif
 
 #include <string.h>


@@ -60,8 +57,8 @@ static int DST_OBSERVED;        /* flags U.S. daylight saving time observed */
 
 static bool wxTimeInitialized = FALSE;
 
 
 static bool wxTimeInitialized = FALSE;
 

-wxTime::tFormat                wxTime::Format          = wxTime::wx12h;
-wxTime::tPrecision     wxTime::Precision       = wxTime::wxStdMinSec;
+wxTime::tFormat    wxTime::Format    = wxTime::wx12h;
+wxTime::tPrecision  wxTime::Precision  = wxTime::wxStdMinSec;

 
 static const unsigned long seconds_in_day = 24*60*60L;
 static const wxDate refDate(1,1,1901);
 
 static const unsigned long seconds_in_day = 24*60*60L;
 static const wxDate refDate(1,1,1901);


@@ -69,19 +66,19 @@ static const wxDate refDate(1,1,1901);
 
 wxTime wxTime::GetLocalTime(const wxDate& date, hourTy h, minuteTy m, secondTy s)
 /*
 
 wxTime wxTime::GetLocalTime(const wxDate& date, hourTy h, minuteTy m, secondTy s)
 /*

-                 Return a local wxTime for the specified Standard Time date, hour, minute,
-                 and second.
+      Return a local wxTime for the specified Standard Time date, hour, minute,
+      and second.

 */
 {
   if (!wxTimeInitialized)
   {
 */
 {
   if (!wxTimeInitialized)
   {

-        wxGetLocalTime(&TIME_ZONE, &DST_OBSERVED);
-        wxTimeInitialized = TRUE;
+   wxGetLocalTime(&TIME_ZONE, &DST_OBSERVED);
+   wxTimeInitialized = TRUE;

   }
 /*
   }
 /*

-                 if (!date.IsBetween(refDate,maxDate))
-                                        setError(NIHCL_DATERANGE,DEFAULT,
-                                                               date.dayOfMonth(),date.nameOfMonth(),date.year());
+      if (!date.IsBetween(refDate,maxDate))
+           setError(NIHCL_DATERANGE,DEFAULT,
+                date.dayOfMonth(),date.nameOfMonth(),date.year());

 */
   // The following line causes an error in GCC 2.1
 //   long daysBetween = date-refDate;
 */
   // The following line causes an error in GCC 2.1
 //   long daysBetween = date-refDate;


@@ -95,13 +92,13 @@ wxTime wxTime::GetLocalTime(const wxDate& date, hourTy h, minuteTy m, secondTy s
 
 wxTime::wxTime()
 /*
 
 wxTime::wxTime()
 /*

-                 Construct a wxTime for this instant.
+      Construct a wxTime for this instant.

 */
 {
   if (!wxTimeInitialized)
   {
 */
 {
   if (!wxTimeInitialized)
   {

-        wxGetLocalTime(&TIME_ZONE, &DST_OBSERVED);
-        wxTimeInitialized = TRUE;
+   wxGetLocalTime(&TIME_ZONE, &DST_OBSERVED);
+   wxTimeInitialized = TRUE;

   }
   sec = wxGetCurrentTime();
 #ifdef __SALFORDC__
   }
   sec = wxGetCurrentTime();
 #ifdef __SALFORDC__


@@ -113,14 +110,14 @@ wxTime::wxTime()
 
 wxTime::wxTime(hourTy h, minuteTy m, secondTy s, bool dst)
 /*
 
 wxTime::wxTime(hourTy h, minuteTy m, secondTy s, bool dst)
 /*

-                 Construct a wxTime for today at the specified (local) hour, minute, and
-                 second.
+      Construct a wxTime for today at the specified (local) hour, minute, and
+      second.

 */
 {
   if (!wxTimeInitialized)
   {
 */
 {
   if (!wxTimeInitialized)
   {

-        wxGetLocalTime(&TIME_ZONE, &DST_OBSERVED);
-        wxTimeInitialized = TRUE;
+   wxGetLocalTime(&TIME_ZONE, &DST_OBSERVED);
+   wxTimeInitialized = TRUE;

   }
 
   sec = wxTime(wxDate(),h,m,s,dst).sec;
   }
 
   sec = wxTime(wxDate(),h,m,s,dst).sec;


@@ -136,7 +133,7 @@ wxTime::wxTime(const wxDate& date, hourTy h, minuteTy m, secondTy s, bool dst)
   if (!wxTimeInitialized)
   {
     wxGetLocalTime(&TIME_ZONE, &DST_OBSERVED);
   if (!wxTimeInitialized)
   {
     wxGetLocalTime(&TIME_ZONE, &DST_OBSERVED);

-        wxTimeInitialized = TRUE;
+   wxTimeInitialized = TRUE;

   }
   sec = GetLocalTime(date,h,m,s).sec-3600;
   if (IsDST())
   }
   sec = GetLocalTime(date,h,m,s).sec-3600;
   if (IsDST())


@@ -149,8 +146,8 @@ wxTime::wxTime(const wxDate& date, hourTy h, minuteTy m, secondTy s, bool dst)
     sec += 3600;
 /*
                 if (IsDST()) setError(NIHCL_BADTIME,DEFAULT,
     sec += 3600;
 /*
                 if (IsDST()) setError(NIHCL_BADTIME,DEFAULT,

-                                                               date.dayOfMonth(),date.nameOfMonth(),date.year(),
-                                                               h,m,s,(dst?_("DST"):""));
+                date.dayOfMonth(),date.nameOfMonth(),date.year(),
+                h,m,s,(dst?_("DST"):""));

 */
   }
   sec += TIME_ZONE;                               // adjust to GMT
 */
   }
   sec += TIME_ZONE;                               // adjust to GMT


@@ -159,11 +156,11 @@ wxTime::wxTime(const wxDate& date, hourTy h, minuteTy m, secondTy s, bool dst)
 #ifndef __SALFORDC__
 wxTime::operator wxDate() const
 /*
 #ifndef __SALFORDC__
 wxTime::operator wxDate() const
 /*

-                 Convert a wxTime to a local wxDate
+      Convert a wxTime to a local wxDate

 */
 {
 //      return wxDate((int)(GetLocalTime().sec/seconds_in_day));     4.2 cc bug
 */
 {
 //      return wxDate((int)(GetLocalTime().sec/seconds_in_day));     4.2 cc bug

-                 long daycount = (long)(GetLocalTime().sec/seconds_in_day);
+      long daycount = (long)(GetLocalTime().sec/seconds_in_day);

 
         wxDate date(1,1,1901);
         date += daycount;
 
         wxDate date(1,1,1901);
         date += daycount;


@@ -178,11 +175,11 @@ bool wxTime::IsBetween(const wxTime& a, const wxTime& b) const
 
 hourTy wxTime::GetHour() const
 /*
 
 hourTy wxTime::GetHour() const
 /*

-                 Return the hour of this wxTime in local time; i.e., adjust for
+      Return the hour of this wxTime in local time; i.e., adjust for

         time zone and Daylight Savings Time.
 */
 {
         time zone and Daylight Savings Time.
 */
 {

-                 return GetLocalTime().GetHourGMT();
+      return GetLocalTime().GetHourGMT();

 }
 
 hourTy wxTime::GetHourGMT() const
 }
 
 hourTy wxTime::GetHourGMT() const


@@ -190,12 +187,12 @@ hourTy wxTime::GetHourGMT() const
         Return the hour of this Time in GMT.
 */
 {
         Return the hour of this Time in GMT.
 */
 {

-                 return (hourTy)((sec % 86400) / 3600);
+      return (hourTy)((sec % 86400) / 3600);

 }
 
 wxTime wxTime::GetBeginDST(unsigned year)
 /*
 }
 
 wxTime wxTime::GetBeginDST(unsigned year)
 /*

-                 Return the local Standard Time at which Daylight Savings Time
+      Return the local Standard Time at which Daylight Savings Time

         begins in the specified year.
 */
 {
         begins in the specified year.
 */
 {


@@ -203,8 +200,8 @@ wxTime wxTime::GetBeginDST(unsigned year)
         wxTime DSTtime(GetLocalTime(wxDate(3,31,year).Previous(1)+7,2));
         if (year<=1986) {
                 // Previous Sunday
         wxTime DSTtime(GetLocalTime(wxDate(3,31,year).Previous(1)+7,2));
         if (year<=1986) {
                 // Previous Sunday

-                                        DSTtime = GetLocalTime(wxDate(4,30,year).Previous(1),2);
-                                        if (year==1974) DSTtime = GetLocalTime(wxDate(1,6,1974),2);
+           DSTtime = GetLocalTime(wxDate(4,30,year).Previous(1),2);
+           if (year==1974) DSTtime = GetLocalTime(wxDate(1,6,1974),2);

                 if (year==1975) DSTtime = GetLocalTime(wxDate(2,23,1975),2);
         }
         return DSTtime;
                 if (year==1975) DSTtime = GetLocalTime(wxDate(2,23,1975),2);
         }
         return DSTtime;


@@ -216,8 +213,8 @@ wxTime wxTime::GetEndDST(unsigned year)
         ends in the specified year.
 */
 {
         ends in the specified year.
 */
 {

-                 wxTime STDtime(GetLocalTime(wxDate(10,31,year).Previous(1),2-1));
-                 return STDtime;
+      wxTime STDtime(GetLocalTime(wxDate(10,31,year).Previous(1),2-1));
+      return STDtime;

 }
 
 bool wxTime::IsDST() const
 }
 
 bool wxTime::IsDST() const


@@ -229,12 +226,12 @@ bool wxTime::IsDST() const
         long daycount = (long)(sec/seconds_in_day);
 
         // At this point, daycount is the number of days from 1/1/1901.
         long daycount = (long)(sec/seconds_in_day);
 
         // At this point, daycount is the number of days from 1/1/1901.

-                 // Need to convert to julian date (which starts at 1/1/4713 B.C.)
-                 wxDate date(1,1,1901);
+      // Need to convert to julian date (which starts at 1/1/4713 B.C.)
+      wxDate date(1,1,1901);

         date += daycount;
 
         unsigned year = date.GetYear();
         date += daycount;
 
         unsigned year = date.GetYear();

-                 if (DST_OBSERVED)
+      if (DST_OBSERVED)

         {
                 if (*this >= GetBeginDST(year))
                         if (*this < GetEndDST(year)) return TRUE;
         {
                 if (*this >= GetBeginDST(year))
                         if (*this < GetEndDST(year)) return TRUE;


@@ -247,7 +244,7 @@ wxTime wxTime::GetLocalTime() const
         Adjusts this GM Time for local time zone and Daylight Savings Time.
 */
 {
         Adjusts this GM Time for local time zone and Daylight Savings Time.
 */
 {

-                 wxTime local_time(sec-TIME_ZONE);
+      wxTime local_time(sec-TIME_ZONE);

         if (local_time.IsDST()) local_time.sec += 3600;
         return local_time;
 }
         if (local_time.IsDST()) local_time.sec += 3600;
         return local_time;
 }


@@ -255,7 +252,7 @@ wxTime wxTime::GetLocalTime() const
 minuteTy wxTime::GetMinute() const
 /*
         Return the minute of this wxTime in local time; i.e., adjust
 minuteTy wxTime::GetMinute() const
 /*
         Return the minute of this wxTime in local time; i.e., adjust

-                 for time zone and Daylight Savings Time.
+      for time zone and Daylight Savings Time.

 */
 {
         return GetLocalTime().GetMinuteGMT();
 */
 {
         return GetLocalTime().GetMinuteGMT();


@@ -266,7 +263,7 @@ minuteTy wxTime::GetMinuteGMT() const
         Return the minute of this wxTime in GMT.
 */
 {
         Return the minute of this wxTime in GMT.
 */
 {

-                 return (minuteTy)(((sec % 86400) % 3600) / 60);
+      return (minuteTy)(((sec % 86400) % 3600) / 60);

 }
 
 secondTy wxTime::GetSecond() const
 }
 
 secondTy wxTime::GetSecond() const


@@ -274,7 +271,7 @@ secondTy wxTime::GetSecond() const
         Return the second of this wxTime.
 */
 {
         Return the second of this wxTime.
 */
 {

-                 return (secondTy)(((sec % 86400) % 3600) % 60);
+      return (secondTy)(((sec % 86400) % 3600) % 60);

 }
 
 secondTy wxTime::GetSecondGMT() const
 }
 
 secondTy wxTime::GetSecondGMT() const


@@ -318,7 +315,7 @@ wxTime wxTime::Max(const wxTime& t) const
 wxTime wxTime::Min(const wxTime& t) const
 {
         if (t > *this) return *this;
 wxTime wxTime::Min(const wxTime& t) const
 {
         if (t > *this) return *this;

-                 return t;
+      return t;

 }
 
 #ifndef __SALFORDC__
 }
 
 #ifndef __SALFORDC__


@@ -329,46 +326,46 @@ wxTime::operator char *(void)
 #endif
 
 void wxTime::SetFormat(const wxTime::tFormat lFormat,
 #endif
 
 void wxTime::SetFormat(const wxTime::tFormat lFormat,

-                                                         const wxTime::tPrecision lPrecision) {
+                const wxTime::tPrecision lPrecision) {

 
 

-       wxTime::Format          = lFormat;
-       wxTime::Precision       = lPrecision;
+  wxTime::Format    = lFormat;
+  wxTime::Precision  = lPrecision;

 }
 
 char *wxTime::FormatTime() const {
 }
 
 char *wxTime::FormatTime() const {

-       static char     timeBuf[30];
-       unsigned                hh(GetHour());
-
-       switch (Format) {
-       case wx12h:
-               hh      -= 12;
-               break;
-       case wx24h:
-               break;
-       }
-
-       switch (Precision) {
-       case wxStdMinSec:
-               sprintf(timeBuf,"%2d:%02d:%02d",hh,GetMinute(),GetSecond());
-               break;
-       case wxStdMin:
-               sprintf(timeBuf,"%2d:%02d",hh,GetMinute());
-               break;
-       }
-
-       if (Format == wx12h)
-               if (GetHour() <= 12)
-                       strcat(timeBuf,_("am"));
-               else
-                       strcat(timeBuf,_("pm"));
-
-       return timeBuf;
+  static char  timeBuf[30];
+  unsigned    hh(GetHour());
+
+  switch (Format) {
+  case wx12h:
+    hh  -= 12;
+    break;
+  case wx24h:
+    break;
+  }
+
+  switch (Precision) {
+  case wxStdMinSec:
+    sprintf(timeBuf,"%2d:%02d:%02d",hh,GetMinute(),GetSecond());
+    break;
+  case wxStdMin:
+    sprintf(timeBuf,"%2d:%02d",hh,GetMinute());
+    break;
+  }
+
+  if (Format == wx12h)
+    if (GetHour() <= 12)
+      strcat(timeBuf,_("am"));
+    else
+      strcat(timeBuf,_("pm"));
+
+  return timeBuf;

 }
 
 /*
 int wxTime::compare(const Object& ob) const
 {
 }
 
 /*
 int wxTime::compare(const Object& ob) const
 {

-                 assertArgSpecies(ob,classDesc,"compare");
+      assertArgSpecies(ob,classDesc,"compare");

         register clockTy t = castdown(ob).sec;
         if (sec < t) return -1;
         if (sec > t) return 1;
         register clockTy t = castdown(ob).sec;
         if (sec < t) return -1;
         if (sec > t) return 1;


@@ -392,16 +389,16 @@ void wxTime::printOn(ostream& strm) const
         wxDate(*this).printOn(strm);
         strm << ' ' << ((hh <= 12) ? hh : hh-12) << ':'
              << setfill('0') << setw(2) << GetMinute() << ':'
         wxDate(*this).printOn(strm);
         strm << ' ' << ((hh <= 12) ? hh : hh-12) << ':'
              << setfill('0') << setw(2) << GetMinute() << ':'

-                                << setfill('0') << setw(2) << GetSecond() << ' ';
+         << setfill('0') << setw(2) << GetSecond() << ' ';

         if (hh < 12) strm << _("am");
         else strm << _("pm");
 }
 
 wxTime::wxTime(OIOin& strm)
         if (hh < 12) strm << _("am");
         else strm << _("pm");
 }
 
 wxTime::wxTime(OIOin& strm)

-                 : BASE(strm)
+      : BASE(strm)

 {
 {

-                 unsigned long usec;
-                 strm >> sec >> usec;
+      unsigned long usec;
+      strm >> sec >> usec;

 }
 
 void wxTime::storer(OIOout& strm) const
 }
 
 void wxTime::storer(OIOout& strm) const


@@ -412,16 +409,16 @@ void wxTime::storer(OIOout& strm) const
 
 
 wxTime::wxTime(OIOifd& fd)
 
 
 wxTime::wxTime(OIOifd& fd)

-                 : BASE(fd)
+      : BASE(fd)

 {
 {

-                 unsigned long usec;
-                 fd >> sec >> usec;
+      unsigned long usec;
+      fd >> sec >> usec;

 }
 
 void wxTime::storer(OIOofd& fd) const
 {
 }
 
 void wxTime::storer(OIOofd& fd) const
 {

-                 BASE::storer(fd);
-                 fd << sec << 0l;
+      BASE::storer(fd);
+      fd << sec << 0l;

 }
 */
 
 }
 */
 

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 1488ca866c31987d44299d160ce9c6ad802b81a3..57fcf3bd32171acdbcb48a155c9770cb478207de 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Julian Smart

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -30,15 +30,12 @@
 #include "wx/textdlg.h"
 #endif
 
 #include "wx/textdlg.h"
 #endif
 

+#include "wx/ioswrap.h"
+

 #if wxUSE_IOSTREAMH
 #if wxUSE_IOSTREAMH

-#include <iostream.h>
-#include <fstream.h>
+    #include <fstream.h>

 #else
 #else

-#include <iostream>
-#include <fstream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
+    #include <fstream>

 #endif
 
 #include <ctype.h>
 #endif
 
 #include <ctype.h>


@@ -46,9 +43,9 @@
 #include <stdlib.h>
 #include <string.h>
 #if !defined(__WATCOMC__)
 #include <stdlib.h>
 #include <string.h>
 #if !defined(__WATCOMC__)

-#if !(defined(_MSC_VER) && (_MSC_VER > 800))
-#include <errno.h>
-#endif
+    #if !(defined(_MSC_VER) && (_MSC_VER > 800))
+        #include <errno.h>
+    #endif

 #endif
 #include <time.h>
 #ifndef __MWERKS__
 #endif
 #include <time.h>
 #ifndef __MWERKS__


@@ -92,14 +89,14 @@ int strncasecmp(const char *str_1, const char *str_2, size_t maxchar)
 {
 
   register char c1, c2;
 {
 
   register char c1, c2;

-  while( maxchar--) 
+  while( maxchar--)

   {
     c1 = tolower(*str_1++);
     c2 = tolower(*str_2++);
   {
     c1 = tolower(*str_1++);
     c2 = tolower(*str_2++);

-    
+

     if ( !c1 || c1!=c2 )
     if ( !c1 || c1!=c2 )

-               return c1 - c2;
-                   
+                  return c1 - c2;
+

   } ;
 
   return 0 ;
   } ;
 
   return 0 ;


@@ -163,14 +160,6 @@ int strncasecmp(const char *str_1, const char *str_2, size_t maxchar)
 #endif
 #endif
 
 #endif
 #endif
 

-#ifdef _MSC_VER
-#pragma warning (disable : 4245)
-#endif
-
-#ifdef _MSC_VER
-#pragma warning (default : 4245)
-#endif
-

 #else
 // This declaration is missing in SunOS!
 // (Yes, I know it is NOT ANSI-C but its in BSD libc)
 #else
 // This declaration is missing in SunOS!
 // (Yes, I know it is NOT ANSI-C but its in BSD libc)


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

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

 
 
 char *
 
 
 char *


@@ -191,7 +180,7 @@ copystring (const char *s)
   size_t len = strlen (s) + 1;
 
   char *news = new char[len];
   size_t len = strlen (s) + 1;
 
   char *news = new char[len];

-  memcpy (news, s, len);       // Should be the fastest
+  memcpy (news, s, len);    // Should be the fastest

 
   return news;
 }
 
   return news;
 }


@@ -199,7 +188,7 @@ copystring (const char *s)
 // Id generation
 static long wxCurrentId = 100;
 
 // Id generation
 static long wxCurrentId = 100;
 

-long 
+long

 wxNewId (void)
 {
   return wxCurrentId++;
 wxNewId (void)
 {
   return wxCurrentId++;


@@ -208,21 +197,21 @@ wxNewId (void)
 long
 wxGetCurrentId(void) { return wxCurrentId; }
 
 long
 wxGetCurrentId(void) { return wxCurrentId; }
 

-void 
+void

 wxRegisterId (long id)
 {
   if (id >= wxCurrentId)
     wxCurrentId = id + 1;
 }
 
 wxRegisterId (long id)
 {
   if (id >= wxCurrentId)
     wxCurrentId = id + 1;
 }
 

-void 
+void

 StringToFloat (char *s, float *number)
 {
   if (s && *s && number)
     *number = (float) strtod (s, (char **) NULL);
 }
 
 StringToFloat (char *s, float *number)
 {
   if (s && *s && number)
     *number = (float) strtod (s, (char **) NULL);
 }
 

-void 
+void

 StringToDouble (char *s, double *number)
 {
   if (s && *s && number)
 StringToDouble (char *s, double *number)
 {
   if (s && *s && number)


@@ -248,14 +237,14 @@ DoubleToString (double number, const char *fmt)
   return buf;
 }
 
   return buf;
 }
 

-void 
+void

 StringToInt (char *s, int *number)
 {
   if (s && *s && number)
     *number = (int) strtol (s, (char **) NULL, 10);
 }
 
 StringToInt (char *s, int *number)
 {
   if (s && *s && number)
     *number = (int) strtol (s, (char **) NULL, 10);
 }
 

-void 
+void

 StringToLong (char *s, long *number)
 {
   if (s && *s && number)
 StringToLong (char *s, long *number)
 {
   if (s && *s && number)


@@ -288,7 +277,7 @@ static char hexArray[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A'
 int wxHexToDec(const wxString& buf)
 {
   int firstDigit, secondDigit;
 int wxHexToDec(const wxString& buf)
 {
   int firstDigit, secondDigit;

-  
+

   if (buf.GetChar(0) >= 'A')
     firstDigit = buf.GetChar(0) - 'A' + 10;
   else
   if (buf.GetChar(0) >= 'A')
     firstDigit = buf.GetChar(0) - 'A' + 10;
   else


@@ -298,7 +287,7 @@ int wxHexToDec(const wxString& buf)
     secondDigit = buf.GetChar(1) - 'A' + 10;
   else
     secondDigit = buf.GetChar(1) - '0';
     secondDigit = buf.GetChar(1) - 'A' + 10;
   else
     secondDigit = buf.GetChar(1) - '0';

-    
+

   return firstDigit * 16 + secondDigit;
 }
 
   return firstDigit * 16 + secondDigit;
 }
 


@@ -321,7 +310,7 @@ wxString wxDecToHex(int dec)
 }
 
 // Match a string INDEPENDENT OF CASE
 }
 
 // Match a string INDEPENDENT OF CASE

-bool 
+bool

 StringMatch (char *str1, char *str2, bool subString, bool exact)
 {
   if (str1 == NULL || str2 == NULL)
 StringMatch (char *str1, char *str2, bool subString, bool exact)
 {
   if (str1 == NULL || str2 == NULL)


@@ -338,15 +327,15 @@ StringMatch (char *str1, char *str2, bool subString, bool exact)
       // Search for str1 in str2
       // Slow .... but acceptable for short strings
       for (i = 0; i <= len2 - len1; i++)
       // Search for str1 in str2
       // Slow .... but acceptable for short strings
       for (i = 0; i <= len2 - len1; i++)

-       {
-         if (strncasecmp (str1, str2 + i, len1) == 0)
-           return TRUE;
-       }
+        {
+          if (strncasecmp (str1, str2 + i, len1) == 0)
+            return TRUE;
+        }

     }
   else if (exact)
     {
       if (strcasecmp (str1, str2) == 0)
     }
   else if (exact)
     {
       if (strcasecmp (str1, str2) == 0)

-       return TRUE;
+        return TRUE;

     }
   else
     {
     }
   else
     {


@@ -354,7 +343,7 @@ StringMatch (char *str1, char *str2, bool subString, bool exact)
       int len2 = strlen (str2);
 
       if (strncasecmp (str1, str2, wxMin (len1, len2)) == 0)
       int len2 = strlen (str2);
 
       if (strncasecmp (str1, str2, wxMin (len1, len2)) == 0)

-       return TRUE;
+        return TRUE;

     }
 
   return FALSE;
     }
 
   return FALSE;


@@ -365,7 +354,7 @@ StringMatch (char *str1, char *str2, bool subString, bool exact)
 wxString wxNow( void )
 {
   time_t now = time((time_t *) NULL);
 wxString wxNow( void )
 {
   time_t now = time((time_t *) NULL);

-  char *date = ctime(&now); 
+  char *date = ctime(&now);

   date[24] = '\0';
   return wxString(date);
 }
   date[24] = '\0';
   return wxString(date);
 }


@@ -400,31 +389,31 @@ char *wxStripMenuCodes (char *in, char *out)
 {
   if (!in)
     return (char *) NULL;
 {
   if (!in)
     return (char *) NULL;

-    
+

   if (!out)
     out = copystring(in);
 
   char *tmpOut = out;
   if (!out)
     out = copystring(in);
 
   char *tmpOut = out;

-  
+

   while (*in)
     {
       if (*in == '&')
   while (*in)
     {
       if (*in == '&')

-       {
-         // Check && -> &, &x -> x
-         if (*++in == '&')
-           *out++ = *in++;
-       }
+        {
+          // Check && -> &, &x -> x
+          if (*++in == '&')
+            *out++ = *in++;
+        }

       else if (*in == '\t')
       else if (*in == '\t')

-       {
+        {

           // Remove all stuff after \t in X mode, and let the stuff as is
           // in Windows mode.
           // Accelerators are handled in wx_item.cc for Motif, and are not
           // YET supported in XView
           // Remove all stuff after \t in X mode, and let the stuff as is
           // in Windows mode.
           // Accelerators are handled in wx_item.cc for Motif, and are not
           // YET supported in XView

-         break;
-       }
+          break;
+        }

       else
       else

-       *out++ = *in++;
-    }                          // while
+        *out++ = *in++;
+    }                                // while

 
   *out = '\0';
 
 
   *out = '\0';
 


@@ -463,12 +452,12 @@ wxFindWindowByLabel (const wxString& title, wxWindow * parent)
   else
     {
       for (wxNode * node = wxTopLevelWindows.First (); node; node = node->Next ())
   else
     {
       for (wxNode * node = wxTopLevelWindows.First (); node; node = node->Next ())

-       {
-         wxWindow *win = (wxWindow *) node->Data ();
-         wxWindow *retwin = wxFindWindowByLabel1 (title, win);
-         if (retwin)
-           return retwin;
-       }                       // for()
+        {
+          wxWindow *win = (wxWindow *) node->Data ();
+          wxWindow *retwin = wxFindWindowByLabel1 (title, win);
+          if (retwin)
+            return retwin;
+        }                        // for()

 
     }
   return (wxWindow *) NULL;
 
     }
   return (wxWindow *) NULL;


@@ -481,22 +470,22 @@ wxFindWindowByLabel1 (const wxString& title, wxWindow * parent)
   if (parent)
     {
       if (parent->GetLabel() == title)
   if (parent)
     {
       if (parent->GetLabel() == title)

-               return parent;
+                return parent;

     }
 
   if (parent)
     {
       for (wxNode * node = parent->GetChildren().First (); node; node = node->Next ())
     }
 
   if (parent)
     {
       for (wxNode * node = parent->GetChildren().First (); node; node = node->Next ())

-       {
-         wxWindow *win = (wxWindow *) node->Data ();
-         wxWindow *retwin = wxFindWindowByLabel1 (title, win);
-         if (retwin)
-           return retwin;
-       }                       // for()
+        {
+          wxWindow *win = (wxWindow *) node->Data ();
+          wxWindow *retwin = wxFindWindowByLabel1 (title, win);
+          if (retwin)
+            return retwin;
+        }                        // for()

 
     }
 
 
     }
 

-  return (wxWindow *) NULL;                    // Not found
+  return (wxWindow *) NULL;                        // Not found

 
 }
 
 
 }
 


@@ -518,12 +507,12 @@ wxFindWindowByName (const wxString& title, wxWindow * parent)
   else
     {
       for (wxNode * node = wxTopLevelWindows.First (); node; node = node->Next ())
   else
     {
       for (wxNode * node = wxTopLevelWindows.First (); node; node = node->Next ())

-       {
-         wxWindow *win = (wxWindow *) node->Data ();
-         wxWindow *retwin = wxFindWindowByName1 (title, win);
-         if (retwin)
-           return retwin;
-       }                       // for()
+        {
+          wxWindow *win = (wxWindow *) node->Data ();
+          wxWindow *retwin = wxFindWindowByName1 (title, win);
+          if (retwin)
+            return retwin;
+        }                        // for()

 
     }
   // Failed? Try by label instead.
 
     }
   // Failed? Try by label instead.


@@ -536,28 +525,28 @@ wxFindWindowByName1 (const wxString& title, wxWindow * parent)
 {
   if (parent)
     {
 {
   if (parent)
     {

-       if ( parent->GetName() == title )
-                       return parent;
+            if ( parent->GetName() == title )
+                        return parent;

     }
 
   if (parent)
     {
       for (wxNode * node = parent->GetChildren().First (); node; node = node->Next ())
     }
 
   if (parent)
     {
       for (wxNode * node = parent->GetChildren().First (); node; node = node->Next ())

-       {
-         wxWindow *win = (wxWindow *) node->Data ();
-         wxWindow *retwin = wxFindWindowByName1 (title, win);
-         if (retwin)
-           return retwin;
-       }                       // for()
+        {
+          wxWindow *win = (wxWindow *) node->Data ();
+          wxWindow *retwin = wxFindWindowByName1 (title, win);
+          if (retwin)
+            return retwin;
+        }                        // for()

 
     }
 
 
     }
 

-  return (wxWindow *) NULL;                    // Not found
+  return (wxWindow *) NULL;                        // Not found

 
 }
 
 // Returns menu item id or -1 if none.
 
 }
 
 // Returns menu item id or -1 if none.

-int 
+int

 wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& itemString)
 {
   wxMenuBar *menuBar = frame->GetMenuBar ();
 wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& itemString)
 {
   wxMenuBar *menuBar = frame->GetMenuBar ();


@@ -572,12 +561,12 @@ On Fri, 21 Jul 1995, Paul Craven wrote:
 > Is there a way to find the path of running program's executable? I can get
 > my home directory, and the current directory, but I don't know how to get the
 > executable directory.
 > Is there a way to find the path of running program's executable? I can get
 > my home directory, and the current directory, but I don't know how to get the
 > executable directory.

-> 
+>

 
 The code below (warty as it is), does what you want on most Unix,
 DOS, and Mac platforms (it's from the ALS Prolog main).
 
 
 The code below (warty as it is), does what you want on most Unix,
 DOS, and Mac platforms (it's from the ALS Prolog main).
 

-|| Ken Bowen      Applied Logic Systems, Inc.         PO Box 180,     
+|| Ken Bowen      Applied Logic Systems, Inc.         PO Box 180,

 ||====            Voice:  +1 (617)965-9191            Newton Centre,
 ||                FAX:    +1 (617)965-1636            MA  02159  USA
                   Email:  ken@als.com        WWW: http://www.als.com
 ||====            Voice:  +1 (617)965-9191            Newton Centre,
 ||                FAX:    +1 (617)965-1636            MA  02159  USA
                   Email:  ken@als.com        WWW: http://www.als.com


@@ -590,8 +579,8 @@ DOS, and Mac platforms (it's from the ALS Prolog main).
 
 /*--------------------------------------------------------------------*
  | whereami is given a filename f in the form:  whereami(argv[0])
 
 /*--------------------------------------------------------------------*
  | whereami is given a filename f in the form:  whereami(argv[0])

- | It returns the directory in which the executable file (containing 
- | this code [main.c] ) may be found.  A dot will be returned to indicate 
+ | It returns the directory in which the executable file (containing
+ | this code [main.c] ) may be found.  A dot will be returned to indicate

  | the current directory.
  *--------------------------------------------------------------------*/
 
  | the current directory.
  *--------------------------------------------------------------------*/
 


@@ -599,7 +588,7 @@ static void
 whereami(name)
     char *name;
 {
 whereami(name)
     char *name;
 {

-    register char *cutoff = NULL;      /* stifle -Wall */
+    register char *cutoff = NULL;        /* stifle -Wall */

     register char *s;
     register char *t;
     int   cc;
     register char *s;
     register char *t;
     int   cc;


@@ -612,117 +601,117 @@ whereami(name)
 
     if (access(name, R_OK) == 0) {
 
 
     if (access(name, R_OK) == 0) {
 

-       /*-------------------------------------------------------------*
-        * The file was accessible without any other work.  But the current
-        * working directory might change on us, so if it was accessible
-        * through the cwd, then we should get it for later accesses.
-        *-------------------------------------------------------------*/
+        /*-------------------------------------------------------------*
+         * The file was accessible without any other work.  But the current
+         * working directory might change on us, so if it was accessible
+         * through the cwd, then we should get it for later accesses.
+         *-------------------------------------------------------------*/

 
 

-       t = imagedir;
-       if (!absolute_pathname(name)) {
+        t = imagedir;
+        if (!absolute_pathname(name)) {

 #if defined(DOS) || defined(__WIN32__)
 #if defined(DOS) || defined(__WIN32__)

-           int   drive;
-           char *newrbuf;
+            int   drive;
+            char *newrbuf;

 
 

-           newrbuf = imagedir;
+            newrbuf = imagedir;

 #ifndef __DJGPP__
 #ifndef __DJGPP__

-           if (*(name + 1) == ':') {
-               if (*name >= 'a' && *name <= 'z')
-                   drive = (int) (*name - 'a' + 1);
-               else
-                   drive = (int) (*name - 'A' + 1);
-               *newrbuf++ = *name;
-               *newrbuf++ = *(name + 1);
-               *newrbuf++ = DIR_SEPARATOR;
-           }
-           else {
-               drive = 0;
-               *newrbuf++ = DIR_SEPARATOR;
-           }
-           if (getcwd(newrbuf, drive) == 0) {  /* } */
+            if (*(name + 1) == ':') {
+                if (*name >= 'a' && *name <= 'z')
+                    drive = (int) (*name - 'a' + 1);
+                else
+                    drive = (int) (*name - 'A' + 1);
+                *newrbuf++ = *name;
+                *newrbuf++ = *(name + 1);
+                *newrbuf++ = DIR_SEPARATOR;
+            }
+            else {
+                drive = 0;
+                *newrbuf++ = DIR_SEPARATOR;
+            }
+            if (getcwd(newrbuf, drive) == 0) {        /* } */

 #else
 #else

-           if (getcwd(newrbuf, 1024) == 0) {   /* } */
+            if (getcwd(newrbuf, 1024) == 0) {        /* } */

 #endif
 #else  /* DOS */
 #ifdef HAVE_GETWD
 #endif
 #else  /* DOS */
 #ifdef HAVE_GETWD

-           if (getwd(imagedir) == 0) {         /* } */
+            if (getwd(imagedir) == 0) {                /* } */

 #else  /* !HAVE_GETWD */
 #else  /* !HAVE_GETWD */

-           if (getcwd(imagedir, 1024) == 0) {
+            if (getcwd(imagedir, 1024) == 0) {

 #endif /* !HAVE_GETWD */
 #endif /* DOS */
 #endif /* !HAVE_GETWD */
 #endif /* DOS */

-               fatal_error(FE_GETCWD, 0);
-           }
-           for (; *t; t++)     /* Set t to end of buffer */
-               ;
-           if (*(t - 1) == DIR_SEPARATOR)      /* leave slash if already
-                                                * last char
-                                                */
-               cutoff = t - 1;
-           else {
-               cutoff = t;     /* otherwise put one in */
-               *t++ = DIR_SEPARATOR;
-           }
-       }
+                fatal_error(FE_GETCWD, 0);
+            }
+            for (; *t; t++)        /* Set t to end of buffer */
+                ;
+            if (*(t - 1) == DIR_SEPARATOR)        /* leave slash if already
+                                                 * last char
+                                                 */
+                cutoff = t - 1;
+            else {
+                cutoff = t;        /* otherwise put one in */
+                *t++ = DIR_SEPARATOR;
+            }
+        }

 #if (!defined(__MAC__) && !defined(__DJGPP__) && !defined(__GO32__) && !defined(__WIN32__))
 #if (!defined(__MAC__) && !defined(__DJGPP__) && !defined(__GO32__) && !defined(__WIN32__))

-       else
-               (*t++ = DIR_SEPARATOR);
+        else
+                (*t++ = DIR_SEPARATOR);

 #endif
 
 #endif
 

-       /*-------------------------------------------------------------*
-        * Copy the rest of the string and set the cutoff if it was not
-        * already set.  If the first character of name is a slash, cutoff
-        * is not presently set but will be on the first iteration of the
-        * loop below.
-        *-------------------------------------------------------------*/
+        /*-------------------------------------------------------------*
+         * Copy the rest of the string and set the cutoff if it was not
+         * already set.  If the first character of name is a slash, cutoff
+         * is not presently set but will be on the first iteration of the
+         * loop below.
+         *-------------------------------------------------------------*/

 
 

-       for ((*name == DIR_SEPARATOR ? (s = name+1) : (s = name));;) {
-           if (*s == DIR_SEPARATOR)
-                       cutoff = t;
-           if (!(*t++ = *s++))
-                       break;
-       }
+        for ((*name == DIR_SEPARATOR ? (s = name+1) : (s = name));;) {
+            if (*s == DIR_SEPARATOR)
+                        cutoff = t;
+            if (!(*t++ = *s++))
+                        break;
+        }

 
     }
     else {
 
 
     }
     else {
 

-       /*-------------------------------------------------------------*
-        * Get the path list from the environment.  If the path list is
-        * inaccessible for any reason, leave with fatal error.
-        *-------------------------------------------------------------*/
+        /*-------------------------------------------------------------*
+         * Get the path list from the environment.  If the path list is
+         * inaccessible for any reason, leave with fatal error.
+         *-------------------------------------------------------------*/

 
 #ifdef __MAC__
 
 #ifdef __MAC__

-       if ((s = getenv("Commands")) == (char *) 0)
+        if ((s = getenv("Commands")) == (char *) 0)

 #else
 #else

-       if ((s = getenv("PATH")) == (char *) 0)
+        if ((s = getenv("PATH")) == (char *) 0)

 #endif
 #endif

-           fatal_error(FE_PATH, 0);
-
-       /*
-        * Copy path list into ebuf and set the source pointer to the
-        * beginning of this buffer.
-        */
-
-       strcpy(ebuf, s);
-       s = ebuf;
-
-       for (;;) {
-           t = imagedir;
-           while (*s && *s != PATH_SEPARATOR)
-               *t++ = *s++;
-           if (t > imagedir && *(t - 1) == DIR_SEPARATOR) 
-               ;               /* do nothing -- slash already is in place */
-           else
-               *t++ = DIR_SEPARATOR;   /* put in the slash */
-           cutoff = t - 1;     /* set cutoff */
-           strcpy(t, name);
-           if (access(imagedir, R_OK) == 0)
-               break;
-
-           if (*s)
-               s++;            /* advance source pointer */
-           else
-               fatal_error(FE_INFND, 0);
-       }
+            fatal_error(FE_PATH, 0);
+
+        /*
+         * Copy path list into ebuf and set the source pointer to the
+         * beginning of this buffer.
+         */
+
+        strcpy(ebuf, s);
+        s = ebuf;
+
+        for (;;) {
+            t = imagedir;
+            while (*s && *s != PATH_SEPARATOR)
+                *t++ = *s++;
+            if (t > imagedir && *(t - 1) == DIR_SEPARATOR)
+                ;                /* do nothing -- slash already is in place */
+            else
+                *t++ = DIR_SEPARATOR;        /* put in the slash */
+            cutoff = t - 1;        /* set cutoff */
+            strcpy(t, name);
+            if (access(imagedir, R_OK) == 0)
+                break;
+
+            if (*s)
+                s++;                /* advance source pointer */
+            else
+                fatal_error(FE_INFND, 0);
+        }

 
     }
 
 
     }
 


@@ -735,26 +724,26 @@ whereami(name)
 
 #ifdef HAVE_SYMLINK
     while ((cc = readlink(imagedir, ebuf, 512)) != -1) {
 
 #ifdef HAVE_SYMLINK
     while ((cc = readlink(imagedir, ebuf, 512)) != -1) {

-       ebuf[cc] = 0;
-       s = ebuf;
-       if (*s == DIR_SEPARATOR) {
-           t = imagedir;
-       }
-       else {
-           t = cutoff + 1;
-       }
-       for (;;) {
-           if (*s == DIR_SEPARATOR)
-               cutoff = t;     /* mark the last slash seen */
-           if (!(*t++ = *s++)) /* copy the character */
-               break;
-       }
+        ebuf[cc] = 0;
+        s = ebuf;
+        if (*s == DIR_SEPARATOR) {
+            t = imagedir;
+        }
+        else {
+            t = cutoff + 1;
+        }
+        for (;;) {
+            if (*s == DIR_SEPARATOR)
+                cutoff = t;        /* mark the last slash seen */
+            if (!(*t++ = *s++))        /* copy the character */
+                break;
+        }

     }
 
 #endif /* HAVE_SYMLINK */
 
     }
 
 #endif /* HAVE_SYMLINK */
 

-    strcpy(imagename, cutoff + 1);     /* keep the image name */
-    *(cutoff + 1) = 0;         /* chop off the filename part */
+    strcpy(imagename, cutoff + 1);        /* keep the image name */
+    *(cutoff + 1) = 0;                /* chop off the filename part */

 }
 
 #endif
 }
 
 #endif


@@ -801,14 +790,14 @@ wxString wxGetTextFromUser(const wxString& message, const wxString& caption,
 }
 
 #ifdef __MWERKS__
 }
 
 #ifdef __MWERKS__

-char *strdup(const char *s) 
+char *strdup(const char *s)

 {
 {

-       return strcpy( (char*) malloc( strlen( s ) + 1 ) , s ) ;
+        return strcpy( (char*) malloc( strlen( s ) + 1 ) , s ) ;

 }
 
 }
 

-int    isascii( int c ) 
+int isascii( int c )

 {
 {

-       return ( c >= 0 && c < 128 ) ;
+        return ( c >= 0 && c < 128 ) ;

 }
 #endif
 
 }
 #endif
 

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index 2612f8db247a0788143314a47a56175d9a277ddb..ad725d2e13629431ea1df5eca09445ec272f6e53 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -6,7 +6,7 @@
 // Created:     10/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c)
 // Created:     10/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c)

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -17,16 +17,13 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_IOSTREAMH
 #   include <fstream.h>
 #else
 #   include <fstream>
 #endif
 
 #if wxUSE_IOSTREAMH
 #   include <fstream.h>
 #else
 #   include <fstream>

-#   ifdef _MSC_VER
-        using namespace std;
-#   endif

 #endif
 
 #include "wx/stream.h"
 #endif
 
 #include "wx/stream.h"

diff --git a/src/common/wxexpr.cpp b/src/common/wxexpr.cpp
index 5a3ace2c1477cfdf3f597d120303c3ab108d00ff..e7cabf24f0bff4f150df23ef2aa1c0d368960b78 100644 (file)
--- a/src/common/wxexpr.cpp
+++ b/src/common/wxexpr.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -21,12 +21,9 @@
 #endif
 
 #if wxUSE_IOSTREAMH
 #endif
 
 #if wxUSE_IOSTREAMH

-#include <fstream.h>
+    #include <fstream.h>

 #else
 #else

-#include <fstream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
+    #include <fstream>

 #endif
 
 #include <stdarg.h>
 #endif
 
 #include <stdarg.h>

diff --git a/src/generic/helpxlp.cpp b/src/generic/helpxlp.cpp
index 13d43fbb6360476f6889cc3ccaf52d1a73d0326f..26bec27921ca8ad4af0c9b1f64a2aaf24b73b116 100644 (file)
--- a/src/generic/helpxlp.cpp
+++ b/src/generic/helpxlp.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -67,8 +67,8 @@ IMPLEMENT_CLASS(wxXLPHelpController, wxHelpControllerBase)
 #endif
 
 // suppress annoying warning "'this' used in base member init list" (so what?)
 #endif
 
 // suppress annoying warning "'this' used in base member init list" (so what?)

-#ifdef _MSC_VER
-#pragma warning(disable: 4355)
+#ifdef __VISUALC__
+    #pragma warning(disable: 4355)

 #endif // Visual C++
 
 wxXLPHelpController::wxXLPHelpController(void)
 #endif // Visual C++
 
 wxXLPHelpController::wxXLPHelpController(void)


@@ -78,8 +78,8 @@ wxXLPHelpController::wxXLPHelpController(void)
   helpRunning = FALSE; helpConnection = NULL;
 }
 
   helpRunning = FALSE; helpConnection = NULL;
 }
 

-#ifdef _MSC_VER
-#pragma warning(default: 4355)
+#ifdef __VISUALC__
+    #pragma warning(default: 4355)

 #endif // Visual C++
 
 wxXLPHelpController::~wxXLPHelpController(void)
 #endif // Visual C++
 
 wxXLPHelpController::~wxXLPHelpController(void)


@@ -118,21 +118,21 @@ bool wxXLPHelpController::LoadFile(const wxString& file)
 
 bool wxXLPHelpController::DisplayContents(void)
 {
 
 bool wxXLPHelpController::DisplayContents(void)
 {

-       if (!helpRunning)
-       {
+  if (!helpRunning)
+  {

       if (!Run())
         return FALSE;
     }
     if (helpConnection)
       if (!Run())
         return FALSE;
     }
     if (helpConnection)

-       return helpConnection->Execute("s -1");
+        return helpConnection->Execute("s -1");

     else
     else

-           return FALSE;
+      return FALSE;

 }
 
 bool wxXLPHelpController::DisplaySection(int section)
 {
     if (!helpRunning)
 }
 
 bool wxXLPHelpController::DisplaySection(int section)
 {
     if (!helpRunning)

-       {
+  {

       if (!Run())
         return FALSE;
     }
       if (!Run())
         return FALSE;
     }


@@ -146,7 +146,7 @@ bool wxXLPHelpController::DisplaySection(int section)
 bool wxXLPHelpController::DisplayBlock(long block)
 {
     if (!helpRunning)
 bool wxXLPHelpController::DisplayBlock(long block)
 {
     if (!helpRunning)

-       {
+  {

       if (!Run())
         return FALSE;
     }
       if (!Run())
         return FALSE;
     }


@@ -160,7 +160,7 @@ bool wxXLPHelpController::DisplayBlock(long block)
 bool wxXLPHelpController::KeywordSearch(const wxString& k)
 {
     if (!helpRunning)
 bool wxXLPHelpController::KeywordSearch(const wxString& k)
 {
     if (!helpRunning)

-       {
+  {

       if (!Run())
         return FALSE;
     }
       if (!Run())
         return FALSE;
     }

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index ac63e42c763c0f8947cb75d6de0bc9f22a0c6831..a3301a60857d6de7b33fa4ad242462f4b2358947 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -227,7 +227,7 @@ bool wxApp::Initialize()
 
     // This is to foil optimizations in Visual C++ that throw out dummy.obj.
     // PLEASE DO NOT ALTER THIS.
 
     // This is to foil optimizations in Visual C++ that throw out dummy.obj.
     // PLEASE DO NOT ALTER THIS.

-#if defined(_MSC_VER) && !defined(WXMAKINGDLL)
+#if defined(__VISUALC__) && !defined(WXMAKINGDLL)

     extern char wxDummyChar;
     if (wxDummyChar) wxDummyChar++;
 #endif
     extern char wxDummyChar;
     if (wxDummyChar) wxDummyChar++;
 #endif


@@ -545,7 +545,7 @@ void wxApp::CleanUp()
 #if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL))
 
 // temporarily disable this warning
 #if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL))
 
 // temporarily disable this warning

-#ifdef _MSC_VER
+#ifdef __VISUALC__

     #pragma warning(disable: 4715) // not all control paths return a value
 #endif // Visual C++
 
     #pragma warning(disable: 4715) // not all control paths return a value
 #endif // Visual C++
 


@@ -565,10 +565,10 @@ int wxEntry(WXHINSTANCE hInstance,
   // FIXME other compilers must support Win32 SEH (structured exception
   //       handling) too, just find the appropriate keyword in their docs!
   //       Please note that it's _not_ the same as C++ exceptions!
   // FIXME other compilers must support Win32 SEH (structured exception
   //       handling) too, just find the appropriate keyword in their docs!
   //       Please note that it's _not_ the same as C++ exceptions!

-#if !defined(__WXDEBUG__) && defined(_MSC_VER) && !defined(__MWERKS__)
+#if !defined(__WXDEBUG__) && defined(__VISUALC__)

     #define CATCH_PROGRAM_EXCEPTIONS
 
     #define CATCH_PROGRAM_EXCEPTIONS
 

-  __try {
+    __try {

 #else
     #undef  CATCH_PROGRAM_EXCEPTIONS
 #endif
 #else
     #undef  CATCH_PROGRAM_EXCEPTIONS
 #endif


@@ -656,7 +656,7 @@ int wxEntry(WXHINSTANCE hInstance,
 }
 
 // restore warning state
 }
 
 // restore warning state

-#ifdef _MSC_VER
+#ifdef __VISUALC__

     #pragma warning(default: 4715) // not all control paths return a value
 #endif // Visual C++
 
     #pragma warning(default: 4715) // not all control paths return a value
 #endif // Visual C++
 


@@ -1123,6 +1123,6 @@ HINSTANCE wxGetInstance()
 
 // For some reason, with MSVC++ 1.5, WinMain isn't linked in properly
 // if in a separate file. So include it here to ensure it's linked.
 
 // For some reason, with MSVC++ 1.5, WinMain isn't linked in properly
 // if in a separate file. So include it here to ensure it's linked.

-#if (defined(_MSC_VER) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__))
+#if (defined(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__))

   #include "main.cpp"
 #endif
   #include "main.cpp"
 #endif

diff --git a/src/msw/dibutils.cpp b/src/msw/dibutils.cpp
index 6921a9247293b3b6204f78f9d7c7bc97cde0fef1..3ae1f94dc9f194dcb70e78578a6949ad7d71f407 100644 (file)
--- a/src/msw/dibutils.cpp
+++ b/src/msw/dibutils.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Microsoft, Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Microsoft, Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -29,13 +29,14 @@
 #include <windows.h>
 #include <windowsx.h>
 #include <stdio.h>
 #include <windows.h>
 #include <windowsx.h>
 #include <stdio.h>

-#include <wx/msw/dibutils.h>
+
+#include "wx/msw/dibutils.h"

 
 #if defined(__WIN32__)
 #if !defined(__MWERKS__) && !defined(__SALFORDC__)
     #include <memory.h>             // for _fmemcpy()
 #endif
 
 #if defined(__WIN32__)
 #if !defined(__MWERKS__) && !defined(__SALFORDC__)
     #include <memory.h>             // for _fmemcpy()
 #endif

-        #define _huge
+   #define _huge

 #ifndef hmemcpy
     #define hmemcpy memcpy
 #endif
 #ifndef hmemcpy
     #define hmemcpy memcpy
 #endif


@@ -81,7 +82,7 @@ void ClearSystemPalette(void)
   for(Counter = 0; Counter < 256; Counter++)
   {
     Palette.aEntries[Counter].peRed = 0;
   for(Counter = 0; Counter < 256; Counter++)
   {
     Palette.aEntries[Counter].peRed = 0;

-        Palette.aEntries[Counter].peGreen = 0;
+   Palette.aEntries[Counter].peGreen = 0;

     Palette.aEntries[Counter].peBlue = 0;
     Palette.aEntries[Counter].peFlags = PC_NOCOLLAPSE;
   }
     Palette.aEntries[Counter].peBlue = 0;
     Palette.aEntries[Counter].peFlags = PC_NOCOLLAPSE;
   }


@@ -92,8 +93,8 @@ void ClearSystemPalette(void)
 
   if (ScreenPalette)
   {
 
   if (ScreenPalette)
   {

-        ScreenPalette = SelectPalette(ScreenDC,ScreenPalette,FALSE);
-        nMapped = RealizePalette(ScreenDC);
+   ScreenPalette = SelectPalette(ScreenDC,ScreenPalette,FALSE);
+   nMapped = RealizePalette(ScreenDC);

     ScreenPalette = SelectPalette(ScreenDC,ScreenPalette,FALSE);
     bOK = DeleteObject(ScreenPalette);
   }
     ScreenPalette = SelectPalette(ScreenDC,ScreenPalette,FALSE);
     bOK = DeleteObject(ScreenPalette);
   }


@@ -114,14 +115,14 @@ void ClearSystemPalette(void)
 
 int DibWriteFile(LPSTR szFile, LPBITMAPINFOHEADER lpbi)
 {
 
 int DibWriteFile(LPSTR szFile, LPBITMAPINFOHEADER lpbi)
 {

-        HFILE               fh;
-        OFSTRUCT            of;
+   HFILE               fh;
+   OFSTRUCT            of;

 
 

-        fh = OpenFile(szFile, &of, OF_WRITE | OF_CREATE);
+   fh = OpenFile(szFile, &of, OF_WRITE | OF_CREATE);

 
   if (!fh) {
 
   if (!fh) {

-//      printf("la regamos0");
-        return 0;
+//   printf("la regamos0");
+   return 0;

   }
 
   long size = DibSize(lpbi);
   }
 
   long size = DibSize(lpbi);


@@ -133,19 +134,19 @@ int DibWriteFile(LPSTR szFile, LPBITMAPINFOHEADER lpbi)
   bmf.bfReserved1 = 0;
   bmf.bfReserved2 = 0;
   bmf.bfOffBits = sizeof(bmf) + (char far*)(DibPtr(lpbi)) - (char far*)lpbi;
   bmf.bfReserved1 = 0;
   bmf.bfReserved2 = 0;
   bmf.bfOffBits = sizeof(bmf) + (char far*)(DibPtr(lpbi)) - (char far*)lpbi;

-#if defined( __WATCOMC__) || defined(_MSC_VER) || defined(__SC__) || defined(__SALFORDC__)
+#if defined( __WATCOMC__) || defined(__VISUALC__) || defined(__SC__) || defined(__SALFORDC__)

   if (_hwrite(fh, (LPCSTR)(&bmf), sizeof(bmf))<0 ||
   if (_hwrite(fh, (LPCSTR)(&bmf), sizeof(bmf))<0 ||

-       _hwrite(fh, (LPCSTR)lpbi, size)<0) {
-         _lclose(fh);
-//      printf("la regamos1");
-         return 0;
+  _hwrite(fh, (LPCSTR)lpbi, size)<0) {
+    _lclose(fh);
+//   printf("la regamos1");
+    return 0;

   }
 #else
   if (_hwrite(fh, (LPBYTE)(&bmf), sizeof(bmf))<0 ||
   }
 #else
   if (_hwrite(fh, (LPBYTE)(&bmf), sizeof(bmf))<0 ||

-       _hwrite(fh, (LPBYTE)lpbi, size)<0) {
-         _lclose(fh);
-//      printf("la regamos1");
-         return 0;
+  _hwrite(fh, (LPBYTE)lpbi, size)<0) {
+    _lclose(fh);
+//   printf("la regamos1");
+    return 0;

   }
 #endif
 
   }
 #endif
 


@@ -155,50 +156,50 @@ int DibWriteFile(LPSTR szFile, LPBITMAPINFOHEADER lpbi)
 
 PDIB DibOpenFile(LPSTR szFile)
 {
 
 PDIB DibOpenFile(LPSTR szFile)
 {

-        HFILE               fh;
-        DWORD               dwLen;
-        DWORD               dwBits;
-        PDIB                pdib;
-        LPVOID              p;
-        OFSTRUCT            of;
+   HFILE               fh;
+   DWORD               dwLen;
+   DWORD               dwBits;
+   PDIB                pdib;
+   LPVOID              p;
+   OFSTRUCT            of;

 
 #if defined(WIN32) || defined(_WIN32)
 
 #if defined(WIN32) || defined(_WIN32)

-        #define GetCurrentInstance()    GetModuleHandle(NULL)
+   #define GetCurrentInstance()    GetModuleHandle(NULL)

 #else
 #else

-        #define GetCurrentInstance()    (HINSTANCE)SELECTOROF((LPVOID)&of)
+   #define GetCurrentInstance()    (HINSTANCE)SELECTOROF((LPVOID)&of)

 #endif
 
 #endif
 

-        fh = OpenFile(szFile, &of, OF_READ);
+   fh = OpenFile(szFile, &of, OF_READ);

 
 

-        if (fh == -1)
-        {
-                 HRSRC h;
+   if (fh == -1)
+   {
+      HRSRC h;

 
           // TODO: Unicode version
 #ifdef __WIN16__
 
           // TODO: Unicode version
 #ifdef __WIN16__

-                 h = FindResource(GetCurrentInstance(), szFile, RT_BITMAP);
+      h = FindResource(GetCurrentInstance(), szFile, RT_BITMAP);

 #else
 #else

-                 h = FindResourceA(GetCurrentInstance(), szFile, RT_BITMAP);
+      h = FindResourceA(GetCurrentInstance(), szFile, RT_BITMAP);

 #endif
 
 #if defined(__WIN32__)
 #endif
 
 #if defined(__WIN32__)

-                 //!!! can we call GlobalFree() on this? is it the right format.
-                 //!!! can we write to this resource?
-                 if (h)
-                               return (PDIB)LockResource(LoadResource(GetCurrentInstance(), h));
+      //!!! can we call GlobalFree() on this? is it the right format.
+      //!!! can we write to this resource?
+      if (h)
+        return (PDIB)LockResource(LoadResource(GetCurrentInstance(), h));

 #else
 #else

-                 if (h)
-                               fh = AccessResource(GetCurrentInstance(), h);
+      if (h)
+        fh = AccessResource(GetCurrentInstance(), h);

 #endif
 #endif

-        }
+   }

 
 

-        if (fh == -1)
-                 return NULL;
+   if (fh == -1)
+      return NULL;

 
 

-        pdib = DibReadBitmapInfo(fh);
+   pdib = DibReadBitmapInfo(fh);

 
 

-        if (!pdib)
-                 return NULL;
+   if (!pdib)
+      return NULL;

 
     /* How much memory do we need to hold the DIB */
 
 
     /* How much memory do we need to hold the DIB */
 


@@ -207,11 +208,11 @@ PDIB DibOpenFile(LPSTR szFile)
 
     /* Can we get more memory? */
 
 
     /* Can we get more memory? */
 

-        p = GlobalReAllocPtr(pdib,dwLen,0);
+   p = GlobalReAllocPtr(pdib,dwLen,0);

 
     if (!p)
     {
 
     if (!p)
     {

-                 GlobalFreePtr(pdib);
+      GlobalFreePtr(pdib);

         pdib = NULL;
     }
     else
         pdib = NULL;
     }
     else


@@ -221,8 +222,8 @@ PDIB DibOpenFile(LPSTR szFile)
 
     if (pdib)
     {
 
     if (pdib)
     {

-                 /* read in the bits */
-                 _hread(fh, (LPBYTE)pdib + (UINT)pdib->biSize + DibPaletteSize(pdib), dwBits);
+      /* read in the bits */
+      _hread(fh, (LPBYTE)pdib + (UINT)pdib->biSize + DibPaletteSize(pdib), dwBits);

     }
 
     _lclose(fh);
     }
 
     _lclose(fh);


@@ -468,7 +469,7 @@ PDIB DibCreate(int bits, int dx, int dy)
         *pdw++ = 0x00000000;    // 0000  black
         *pdw++ = 0x00800000;    // 0001  dark red
         *pdw++ = 0x00008000;    // 0010  dark green
         *pdw++ = 0x00000000;    // 0000  black
         *pdw++ = 0x00800000;    // 0001  dark red
         *pdw++ = 0x00008000;    // 0010  dark green

-                 *pdw++ = 0x00808000;    // 0011  mustard
+      *pdw++ = 0x00808000;    // 0011  mustard

         *pdw++ = 0x00000080;    // 0100  dark blue
         *pdw++ = 0x00800080;    // 0101  purple
         *pdw++ = 0x00008080;    // 0110  dark turquoise
         *pdw++ = 0x00000080;    // 0100  dark blue
         *pdw++ = 0x00800080;    // 0101  purple
         *pdw++ = 0x00008080;    // 0110  dark turquoise


@@ -476,7 +477,7 @@ PDIB DibCreate(int bits, int dx, int dy)
         *pdw++ = 0x00808080;    // 0111  dark gray
         *pdw++ = 0x00FF0000;    // 1001  red
         *pdw++ = 0x0000FF00;    // 1010  green
         *pdw++ = 0x00808080;    // 0111  dark gray
         *pdw++ = 0x00FF0000;    // 1001  red
         *pdw++ = 0x0000FF00;    // 1010  green

-                 *pdw++ = 0x00FFFF00;    // 1011  yellow
+      *pdw++ = 0x00FFFF00;    // 1011  yellow

         *pdw++ = 0x000000FF;    // 1100  blue
         *pdw++ = 0x00FF00FF;    // 1101  pink (magenta)
         *pdw++ = 0x0000FFFF;    // 1110  cyan
         *pdw++ = 0x000000FF;    // 1100  blue
         *pdw++ = 0x00FF00FF;    // 1101  pink (magenta)
         *pdw++ = 0x0000FFFF;    // 1110  cyan


@@ -583,69 +584,69 @@ static void hmemmove(BYTE _huge *d, BYTE _huge *s, LONG len)
 
 BOOL DibMapToPalette(PDIB pdib, HPALETTE hpal)
 {
 
 BOOL DibMapToPalette(PDIB pdib, HPALETTE hpal)
 {

-        LPBITMAPINFOHEADER  lpbi;
-        PALETTEENTRY        pe;
-        int                 n;
-        int                 nDibColors;
-        int                 nPalColors=0;
-        BYTE FAR *          lpBits;
-        RGBQUAD FAR *       lpRgb;
-        BYTE                xlat[256];
-        DWORD               SizeImage;
-
-        if (!hpal || !pdib)
-                 return FALSE;
-
-        lpbi   = (LPBITMAPINFOHEADER)pdib;
-        lpRgb  = DibColors(pdib);
-
-        GetObject(hpal,sizeof(int),(LPSTR)&nPalColors);
-        nDibColors = DibNumColors(pdib);
-
-        if ((SizeImage = lpbi->biSizeImage) == 0)
-                 SizeImage = DibSizeImage(lpbi);
-
-        //
-        //  build a xlat table. from the current DIB colors to the given
-        //  palette.
-        //
-        for (n=0; n<nDibColors; n++)
-                 xlat[n] = (BYTE)GetNearestPaletteIndex(hpal,RGB(lpRgb[n].rgbRed,lpRgb[n].rgbGreen,lpRgb[n].rgbBlue));
-
-        lpBits = (LPBYTE)DibPtr(lpbi);
-        lpbi->biClrUsed = nPalColors;
-
-        //
-        // re-size the DIB
-        //
-        if (nPalColors > nDibColors)
-        {
-                 GlobalReAllocPtr(lpbi, lpbi->biSize + nPalColors*sizeof(RGBQUAD) + SizeImage, 0);
-                 hmemmove((BYTE _huge *)DibPtr(lpbi), (BYTE _huge *)lpBits, SizeImage);
-                 lpBits = (LPBYTE)DibPtr(lpbi);
-        }
-        else if (nPalColors < nDibColors)
-        {
-                 hmemcpy(DibPtr(lpbi), lpBits, SizeImage);
-                 GlobalReAllocPtr(lpbi, lpbi->biSize + nPalColors*sizeof(RGBQUAD) + SizeImage, 0);
-                 lpBits = (LPBYTE)DibPtr(lpbi);
-        }
-
-        //
-        // translate the DIB bits
-        //
-        switch (lpbi->biCompression)
-        {
-                 case BI_RLE8:
-                               xlatRle8(lpBits, SizeImage, xlat);
-                               break;
-
-                 case BI_RLE4:
-                               xlatRle4(lpBits, SizeImage, xlat);
-                               break;
+   LPBITMAPINFOHEADER  lpbi;
+   PALETTEENTRY        pe;
+   int                 n;
+   int                 nDibColors;
+   int                 nPalColors=0;
+   BYTE FAR *          lpBits;
+   RGBQUAD FAR *       lpRgb;
+   BYTE                xlat[256];
+   DWORD               SizeImage;
+
+   if (!hpal || !pdib)
+      return FALSE;
+
+   lpbi   = (LPBITMAPINFOHEADER)pdib;
+   lpRgb  = DibColors(pdib);
+
+   GetObject(hpal,sizeof(int),(LPSTR)&nPalColors);
+   nDibColors = DibNumColors(pdib);
+
+   if ((SizeImage = lpbi->biSizeImage) == 0)
+      SizeImage = DibSizeImage(lpbi);
+
+   //
+   //  build a xlat table. from the current DIB colors to the given
+   //  palette.
+   //
+   for (n=0; n<nDibColors; n++)
+      xlat[n] = (BYTE)GetNearestPaletteIndex(hpal,RGB(lpRgb[n].rgbRed,lpRgb[n].rgbGreen,lpRgb[n].rgbBlue));
+
+   lpBits = (LPBYTE)DibPtr(lpbi);
+   lpbi->biClrUsed = nPalColors;
+
+   //
+   // re-size the DIB
+   //
+   if (nPalColors > nDibColors)
+   {
+      GlobalReAllocPtr(lpbi, lpbi->biSize + nPalColors*sizeof(RGBQUAD) + SizeImage, 0);
+      hmemmove((BYTE _huge *)DibPtr(lpbi), (BYTE _huge *)lpBits, SizeImage);
+      lpBits = (LPBYTE)DibPtr(lpbi);
+   }
+   else if (nPalColors < nDibColors)
+   {
+      hmemcpy(DibPtr(lpbi), lpBits, SizeImage);
+      GlobalReAllocPtr(lpbi, lpbi->biSize + nPalColors*sizeof(RGBQUAD) + SizeImage, 0);
+      lpBits = (LPBYTE)DibPtr(lpbi);
+   }
+
+   //
+   // translate the DIB bits
+   //
+   switch (lpbi->biCompression)
+   {
+      case BI_RLE8:
+        xlatRle8(lpBits, SizeImage, xlat);
+        break;
+
+      case BI_RLE4:
+        xlatRle4(lpBits, SizeImage, xlat);
+        break;

 
         case BI_RGB:
 
         case BI_RGB:

-                               if (lpbi->biBitCount == 8)
+        if (lpbi->biBitCount == 8)

                 xlatClut8(lpBits, SizeImage, xlat);
             else
                 xlatClut4(lpBits, SizeImage, xlat);
                 xlatClut8(lpBits, SizeImage, xlat);
             else
                 xlatClut4(lpBits, SizeImage, xlat);


@@ -660,12 +661,12 @@ BOOL DibMapToPalette(PDIB pdib, HPALETTE hpal)
         GetPaletteEntries(hpal,n,1,&pe);
 
         lpRgb[n].rgbRed      = pe.peRed;
         GetPaletteEntries(hpal,n,1,&pe);
 
         lpRgb[n].rgbRed      = pe.peRed;

-                 lpRgb[n].rgbGreen    = pe.peGreen;
-                 lpRgb[n].rgbBlue     = pe.peBlue;
-                 lpRgb[n].rgbReserved = (BYTE)0;
-        }
+      lpRgb[n].rgbGreen    = pe.peGreen;
+      lpRgb[n].rgbBlue     = pe.peBlue;
+      lpRgb[n].rgbReserved = (BYTE)0;
+   }

 
 

-        return TRUE;
+   return TRUE;

 }
 
 
 }
 
 


@@ -676,21 +677,21 @@ HPALETTE MakePalette(const BITMAPINFO FAR* Info, UINT flags)
 
   WORD nColors = Info->bmiHeader.biClrUsed;
   if (nColors) {
 
   WORD nColors = Info->bmiHeader.biClrUsed;
   if (nColors) {

-        LOGPALETTE* logPal = (LOGPALETTE*)
-                new BYTE[sizeof(LOGPALETTE) + (nColors-1)*sizeof(PALETTEENTRY)];
-
-        logPal->palVersion  = 0x300; // Windows 3.0 version
-        logPal->palNumEntries = nColors;
-        for (short n = 0; n < nColors; n++) {
-               logPal->palPalEntry[n].peRed   = rgb[n].rgbRed;
-               logPal->palPalEntry[n].peGreen = rgb[n].rgbGreen;
-               logPal->palPalEntry[n].peBlue  = rgb[n].rgbBlue;
-               logPal->palPalEntry[n].peFlags = (BYTE)flags;
-        }
-        hPalette = ::CreatePalette(logPal);
-        delete logPal;
+   LOGPALETTE* logPal = (LOGPALETTE*)
+     new BYTE[sizeof(LOGPALETTE) + (nColors-1)*sizeof(PALETTEENTRY)];
+
+   logPal->palVersion  = 0x300; // Windows 3.0 version
+   logPal->palNumEntries = nColors;
+   for (short n = 0; n < nColors; n++) {
+    logPal->palPalEntry[n].peRed   = rgb[n].rgbRed;
+    logPal->palPalEntry[n].peGreen = rgb[n].rgbGreen;
+    logPal->palPalEntry[n].peBlue  = rgb[n].rgbBlue;
+    logPal->palPalEntry[n].peFlags = (BYTE)flags;
+   }
+   hPalette = ::CreatePalette(logPal);
+   delete logPal;

   } else
   } else

-        hPalette = 0;
+   hPalette = 0;

 
   return hPalette;
 }
 
   return hPalette;
 }

diff --git a/src/msw/dummy.cpp b/src/msw/dummy.cpp
index 1a2876a2b91613e17d96eee87350e1cd3b6d16af..807c6a8b0107941082a2d20715f7281951d9bb4b 100644 (file)
--- a/src/msw/dummy.cpp
+++ b/src/msw/dummy.cpp
@@ -1,9 +1,9 @@
 /*
 /*

- * File:       dummy.cc
- * Purpose:    See below
- * Author:     Julian Smart
- * Created:    1993
- * Updated:    
+ * File:  dummy.cc
+ * Purpose:  See below
+ * Author:  Julian Smart
+ * Created:  1993
+ * Updated:

  * Copyright:   (c) 1993, AIAI, University of Edinburgh
  */
 
  * Copyright:   (c) 1993, AIAI, University of Edinburgh
  */
 


@@ -40,7 +40,7 @@
 
 // Foils optimizations in Visual C++ (see also app.cpp). Without it,
 // dummy.obj isn't linked and we get a linker error.
 
 // Foils optimizations in Visual C++ (see also app.cpp). Without it,
 // dummy.obj isn't linked and we get a linker error.

-#if defined(_MSC_VER)
+#if defined(__VISUALC__)

     char wxDummyChar = 0;
 #endif
 
     char wxDummyChar = 0;
 #endif
 


@@ -51,7 +51,7 @@
 #if !defined(APIENTRY)
     #define APIENTRY FAR PASCAL
 #endif
 #if !defined(APIENTRY)
     #define APIENTRY FAR PASCAL
 #endif

- 
+

 int
 #ifdef __WATCOMC__
     PASCAL
 int
 #ifdef __WATCOMC__
     PASCAL

diff --git a/src/msw/dummydll.cpp b/src/msw/dummydll.cpp
index 94d3a94a5fbed1acf47b6b848737045bfe1cbb83..1a594077d8ccf77b4047aa3fecf6662b587219a0 100644 (file)
--- a/src/msw/dummydll.cpp
+++ b/src/msw/dummydll.cpp
@@ -1,13 +1,13 @@
 /*
 /*

- * File:       dummydll.cc
- * Purpose:    
- * Author:     Julian Smart
- * Created:    1993
- * Updated:    
+ * File:  dummydll.cc
+ * Purpose:
+ * Author:  Julian Smart
+ * Created:  1993
+ * Updated:

  * Copyright:   (c) 1993, AIAI, University of Edinburgh
  */
 
  * Copyright:   (c) 1993, AIAI, University of Edinburgh
  */
 

-/* static const char sccsid[] = "@(#)dummydll.cc       1.2 5/9/94"; */
+/* static const char sccsid[] = "@(#)dummydll.cc  1.2 5/9/94"; */

 
 /*
  * A dummy file to include wx.h. If precompiling wx.h, I
 
 /*
  * A dummy file to include wx.h. If precompiling wx.h, I


@@ -19,7 +19,7 @@
 
 // Foils optimizations in Visual C++ (see also app.cpp). Without it,
 // dummy.obj isn't linked and we get a linker error.
 
 // Foils optimizations in Visual C++ (see also app.cpp). Without it,
 // dummy.obj isn't linked and we get a linker error.

-#if defined(_MSC_VER) && defined(__WIN16__)
-char wxDummyChar=0;
+#if defined(__VISUALC__) && defined(__WIN16__)
+    char wxDummyChar=0;

 #endif
 
 #endif
 

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index 2d202e39eb7bcd1e55465fab0eb781acfdfe60ad..43f372295c24117044ac977521c5d63f8d2bb119 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -2,7 +2,7 @@
 // Name:        msw/ole/dataobj.cpp
 // Purpose:     implementation of wx[I]DataObject class
 // Author:      Vadim Zeitlin
 // Name:        msw/ole/dataobj.cpp
 // Purpose:     implementation of wx[I]DataObject class
 // Author:      Vadim Zeitlin

-// Modified by: 
+// Modified by:

 // Created:     10.05.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     10.05.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>


@@ -313,7 +313,7 @@ STDMETHODIMP wxIDataObject::EnumFormatEtc(DWORD dwDirection,
     return E_NOTIMPL;
   }
 
     return E_NOTIMPL;
   }
 

-  wxIEnumFORMATETC *pEnum = 
+  wxIEnumFORMATETC *pEnum =

     new wxIEnumFORMATETC(m_pDataObject->GetPreferredFormat());
   pEnum->AddRef();
   *ppenumFormatEtc = pEnum;
     new wxIEnumFORMATETC(m_pDataObject->GetPreferredFormat());
   pEnum->AddRef();
   *ppenumFormatEtc = pEnum;


@@ -359,7 +359,7 @@ const char *wxDataObject::GetFormatName(wxDataFormat format)
 {
 #ifdef __WXDEBUG__
   // case 'xxx' is not a valid value for switch of enum 'wxDataFormat'
 {
 #ifdef __WXDEBUG__
   // case 'xxx' is not a valid value for switch of enum 'wxDataFormat'

-  #ifdef _MSC_VER
+  #ifdef __VISUALC__

     #pragma warning(disable:4063)
   #endif // VC++
 
     #pragma warning(disable:4063)
   #endif // VC++
 


@@ -386,7 +386,7 @@ const char *wxDataObject::GetFormatName(wxDataFormat format)
       return s_szBuf;
   }
 
       return s_szBuf;
   }
 

-  #ifdef _MSC_VER
+  #ifdef __VISUALC__

     #pragma warning(default:4063)
   #endif // VC++
 
     #pragma warning(default:4063)
   #endif // VC++
 

diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index cb2a9e698b74e1abcee1692c68b9c4697f94e665..e67ac95611d5bf550910d6856ef95b9d97b5c821 100644 (file)
--- a/src/msw/ole/oleutils.cpp
+++ b/src/msw/ole/oleutils.cpp
@@ -2,7 +2,7 @@
 // Name:        ole/oleutils.cpp
 // Purpose:     implementation of OLE helper functions
 // Author:      Vadim Zeitlin
 // Name:        ole/oleutils.cpp
 // Purpose:     implementation of OLE helper functions
 // Author:      Vadim Zeitlin

-// Modified by: 
+// Modified by:

 // Created:     19.02.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     19.02.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>


@@ -37,8 +37,8 @@
 #include  <wx/msw/ole/uuid.h>
 #include  <wx/msw/ole/oleutils.h>
 
 #include  <wx/msw/ole/uuid.h>
 #include  <wx/msw/ole/oleutils.h>
 

-#if defined(_MSC_VER) && (_MSC_VER > 1000)
-#include  <docobj.h>
+#if defined(__VISUALC__) && (__VISUALC__ > 1000)
+    #include  <docobj.h>

 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================


@@ -62,7 +62,7 @@ bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount)
 // Debug support
 // ----------------------------------------------------------------------------
 
 // Debug support
 // ----------------------------------------------------------------------------
 

-#if defined(__WXDEBUG__) && defined(_MSC_VER) && (_MSC_VER > 1000)
+#if defined(__WXDEBUG__) && defined(__VISUALC__) && (__VISUALC__ > 1000)

 const char *GetIidName(REFIID riid)
 {
   // an association between symbolic name and numeric value of an IID
 const char *GetIidName(REFIID riid)
 {
   // an association between symbolic name and numeric value of an IID

diff --git a/src/msw/pnghand.cpp b/src/msw/pnghand.cpp
index 2f82fa3e1079b5eadbac222e86e998e18cc5db58..01309d2b84dd749beef4e5734b7e078712bd11ba 100644 (file)
--- a/src/msw/pnghand.cpp
+++ b/src/msw/pnghand.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -26,12 +26,9 @@
 #include <string.h>
 
 #if wxUSE_IOSTREAMH
 #include <string.h>
 
 #if wxUSE_IOSTREAMH

-#include <fstream.h>
+#   include <fstream.h>

 #else
 #else

-#include <fstream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
+#   include <fstream>

 #endif
 
 #include <windows.h>
 #endif
 
 #include <windows.h>


@@ -70,7 +67,7 @@ ima_png_error(png_struct *png_ptr, char *message)
 {
 //        wxMessageBox(message, "PNG error");
 
 {
 //        wxMessageBox(message, "PNG error");
 

-       longjmp(png_ptr->jmpbuf, 1);
+  longjmp(png_ptr->jmpbuf, 1);

 }
 
 
 }
 
 


@@ -80,15 +77,15 @@ wxPalette *wxCopyPalette(const wxPalette *cmap);
 wxPNGReader::wxPNGReader(void)
 {
   filetype = 0;
 wxPNGReader::wxPNGReader(void)
 {
   filetype = 0;

-  RawImage = NULL;             //  Image data
+  RawImage = NULL;      //  Image data

 
 

-  Width = 0; Height = 0;               //  Dimensions
-  Depth = 0;                                   // (bits x pixel)
-  ColorType = 0;                               // Bit 1 = Palette used
-                                                                       // Bit 2 = Color used
-                                                                       // Bit 3 = Alpha used
+  Width = 0; Height = 0;       //  Dimensions
+  Depth = 0;           // (bits x pixel)
+  ColorType = 0;        // Bit 1 = Palette used
+                  // Bit 2 = Color used
+                  // Bit 3 = Alpha used

 
 

-  EfeWidth = 0;                                // Efective Width
+  EfeWidth = 0;         // Efective Width

 
   lpbi = NULL;
   bgindex = -1;
 
   lpbi = NULL;
   bgindex = -1;


@@ -100,15 +97,15 @@ wxPNGReader::wxPNGReader ( char* ImageFileName )
 {
   imageOK = FALSE;
   filetype = 0;
 {
   imageOK = FALSE;
   filetype = 0;

-  RawImage = NULL;             //  Image data
+  RawImage = NULL;      //  Image data

 
 

-  Width = 0; Height = 0;               //  Dimensions
-  Depth = 0;                                   // (bits x pixel)
-  ColorType = 0;                               // Bit 1 = Palette used
-                                                                       // Bit 2 = Color used
-                                                                       // Bit 3 = Alpha used
+  Width = 0; Height = 0;       //  Dimensions
+  Depth = 0;           // (bits x pixel)
+  ColorType = 0;        // Bit 1 = Palette used
+                  // Bit 2 = Color used
+                  // Bit 3 = Alpha used

 
 

-  EfeWidth = 0;                                // Efective Width
+  EfeWidth = 0;         // Efective Width

 
   lpbi = NULL;
   bgindex = -1;
 
   lpbi = NULL;
   bgindex = -1;


@@ -125,17 +122,17 @@ wxPNGReader::Create(int width, int height, int depth, int colortype)
 
   if (lpbi)  {
 #ifdef __WIN16__
 
   if (lpbi)  {
 #ifdef __WIN16__

-        GlobalFreePtr((unsigned int) lpbi);
+   GlobalFreePtr((unsigned int) lpbi);

 #else
 #else

-        GlobalFreePtr(lpbi);
+   GlobalFreePtr(lpbi);

 #endif
 #endif

-//      delete Palette;
+//   delete Palette;

   }
   RawImage = 0;
   Palette = 0;
   if (lpbi = DibCreate(Depth, Width, Height))  {
   }
   RawImage = 0;
   Palette = 0;
   if (lpbi = DibCreate(Depth, Width, Height))  {

-               RawImage = (ImagePointerType)DibPtr(lpbi);
-               EfeWidth = (long)(((long)Width*Depth + 31) / 32) * 4;
+    RawImage = (ImagePointerType)DibPtr(lpbi);
+    EfeWidth = (long)(((long)Width*Depth + 31) / 32) * 4;

         imageOK = TRUE;
   }
 }
         imageOK = TRUE;
   }
 }


@@ -144,11 +141,11 @@ wxPNGReader::~wxPNGReader ( )
 {
   if (lpbi)  {
 #ifdef __WIN16__
 {
   if (lpbi)  {
 #ifdef __WIN16__

-        GlobalFreePtr((unsigned int) lpbi);
+   GlobalFreePtr((unsigned int) lpbi);

 #else
 #else

-        GlobalFreePtr(lpbi);
+   GlobalFreePtr(lpbi);

 #endif
 #endif

-        delete Palette;
+   delete Palette;

   }
 }
 
   }
 }
 


@@ -167,17 +164,17 @@ bool wxPNGReader::GetRGB(int x, int y, byte* r, byte* g, byte* b)
   if (!Inside(x, y)) return FALSE;
 
   if (Palette) {
   if (!Inside(x, y)) return FALSE;
 
   if (Palette) {

-        return Palette->GetRGB(GetIndex(x, y), r, g, b);
-/*      PALETTEENTRY entry;
-        ::GetPaletteEntries((HPALETTE) Palette->GetHPALETTE(), GetIndex(x, y), 1, &entry);
-        *r = entry.peRed;
-        *g = entry.peGreen;
-        *b = entry.peBlue;  */
+   return Palette->GetRGB(GetIndex(x, y), r, g, b);
+/*   PALETTEENTRY entry;
+   ::GetPaletteEntries((HPALETTE) Palette->GetHPALETTE(), GetIndex(x, y), 1, &entry);
+   *r = entry.peRed;
+   *g = entry.peGreen;
+   *b = entry.peBlue;  */

   } else {
   } else {

-        ImagePointerType ImagePointer = RawImage + EfeWidth*y + (x*Depth >> 3);
-        *b = ImagePointer[0];
-        *g = ImagePointer[1];
-        *r = ImagePointer[2];
+   ImagePointerType ImagePointer = RawImage + EfeWidth*y + (x*Depth >> 3);
+   *b = ImagePointer[0];
+   *g = ImagePointer[1];
+   *r = ImagePointer[2];

   }
   return TRUE;
 }
   }
   return TRUE;
 }


@@ -199,14 +196,14 @@ bool wxPNGReader::SetRGB(int x, int y, byte r, byte g, byte b)
 
   if (ColorType & COLORTYPE_PALETTE)
   {
 
   if (ColorType & COLORTYPE_PALETTE)
   {

-        if (!Palette) return FALSE;
-        SetIndex(x, y, Palette->GetPixel(r, g, b));
+   if (!Palette) return FALSE;
+   SetIndex(x, y, Palette->GetPixel(r, g, b));

 
   } else {
 
   } else {

-        ImagePointerType ImagePointer = RawImage + EfeWidth*y + (x*Depth >> 3);
-        ImagePointer[0] = b;
-        ImagePointer[1] = g;
-        ImagePointer[2] = r;
+   ImagePointerType ImagePointer = RawImage + EfeWidth*y + (x*Depth >> 3);
+   ImagePointer[0] = b;
+   ImagePointer[1] = g;
+   ImagePointer[2] = r;

   }
 
   return TRUE;
   }
 
   return TRUE;


@@ -215,7 +212,7 @@ bool wxPNGReader::SetRGB(int x, int y, byte r, byte g, byte b)
 bool wxPNGReader::SetPalette(wxPalette* colourmap)
 {
   if (!colourmap)
 bool wxPNGReader::SetPalette(wxPalette* colourmap)
 {
   if (!colourmap)

-        return FALSE;
+   return FALSE;

   ColorType |= (COLORTYPE_PALETTE | COLORTYPE_COLOR);
   Palette = colourmap;
   return (DibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0);
   ColorType |= (COLORTYPE_PALETTE | COLORTYPE_COLOR);
   Palette = colourmap;
   return (DibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0);


@@ -226,7 +223,7 @@ wxPNGReader::SetPalette(int n, byte *r, byte *g, byte *b)
 {
   Palette = new wxPalette();
   if (!Palette)
 {
   Palette = new wxPalette();
   if (!Palette)

-        return FALSE;
+   return FALSE;

 
   if (!g) g = r;
   if (!b) b = g;
 
   if (!g) g = r;
   if (!b) b = g;


@@ -240,15 +237,15 @@ wxPNGReader::SetPalette(int n, rgb_color_struct *rgb_struct)
 {
   Palette = new wxPalette();
   if (!Palette)
 {
   Palette = new wxPalette();
   if (!Palette)

-        return FALSE;
+   return FALSE;

 
   byte r[256], g[256], b[256];
 
   for(int i=0; i<n; i++)
   {
 
   byte r[256], g[256], b[256];
 
   for(int i=0; i<n; i++)
   {

-        r[i] = rgb_struct[i].red;
-        g[i] = rgb_struct[i].green;
-        b[i] = rgb_struct[i].blue;
+   r[i] = rgb_struct[i].red;
+   g[i] = rgb_struct[i].green;
+   b[i] = rgb_struct[i].blue;

   }
   // Added by JACS copying from Andrew Davison's additions
   // to GIF-reading code
   }
   // Added by JACS copying from Andrew Davison's additions
   // to GIF-reading code


@@ -281,10 +278,10 @@ wxBitmap* wxPNGReader::GetBitmap(void)
 
 bool wxPNGReader::InstantiateBitmap(wxBitmap *bitmap)
 {
 
 bool wxPNGReader::InstantiateBitmap(wxBitmap *bitmap)
 {

-       HDC dc = ::CreateCompatibleDC(NULL);
+  HDC dc = ::CreateCompatibleDC(NULL);

 
 

-       if (dc)
-       {
+  if (dc)
+  {

         // tmpBitmap is a dummy, to satisfy ::CreateCompatibleDC (it
         // is a memory dc that must have a bitmap selected into it)
         HDC dc2 = GetDC(NULL);
         // tmpBitmap is a dummy, to satisfy ::CreateCompatibleDC (it
         // is a memory dc that must have a bitmap selected into it)
         HDC dc2 = GetDC(NULL);


@@ -295,11 +292,11 @@ bool wxPNGReader::InstantiateBitmap(wxBitmap *bitmap)
         if ( Palette )
         {
             HPALETTE oldPal = ::SelectPalette(dc, (HPALETTE) Palette->GetHPALETTE(), FALSE);
         if ( Palette )
         {
             HPALETTE oldPal = ::SelectPalette(dc, (HPALETTE) Palette->GetHPALETTE(), FALSE);

-                   ::RealizePalette(dc);
+        ::RealizePalette(dc);

         }
 
         }
 

-               HBITMAP hBitmap = ::CreateDIBitmap(dc, lpbi,
-                   CBM_INIT, RawImage, (LPBITMAPINFO) lpbi, DIB_PAL_COLORS);
+    HBITMAP hBitmap = ::CreateDIBitmap(dc, lpbi,
+        CBM_INIT, RawImage, (LPBITMAPINFO) lpbi, DIB_PAL_COLORS);

 
         ::SelectPalette(dc, NULL, TRUE);
         ::SelectObject(dc, oldBitmap);
 
         ::SelectPalette(dc, NULL, TRUE);
         ::SelectObject(dc, oldBitmap);


@@ -323,16 +320,16 @@ bool wxPNGReader::InstantiateBitmap(wxBitmap *bitmap)
             wxMask *mask = CreateMask();
             bitmap->SetMask(mask);
           }
             wxMask *mask = CreateMask();
             bitmap->SetMask(mask);
           }

-                 return TRUE;
+      return TRUE;

         }
         else
         {
           return FALSE;
         }
         }
         else
         {
           return FALSE;
         }

-       }
-       else
+  }
+  else

     {
     {

-               return FALSE;
+    return FALSE;

     }
 }
 
     }
 }
 


@@ -341,13 +338,13 @@ wxPalette *wxCopyPalette(const wxPalette *cmap)
   // To get number of entries...
   WORD count = 0;
   ::GetObject((HPALETTE) cmap->GetHPALETTE(), sizeof(WORD), &count);
   // To get number of entries...
   WORD count = 0;
   ::GetObject((HPALETTE) cmap->GetHPALETTE(), sizeof(WORD), &count);

-  
+

   LOGPALETTE* logPal = (LOGPALETTE*)
   LOGPALETTE* logPal = (LOGPALETTE*)

-                new BYTE[sizeof(LOGPALETTE) + count*sizeof(PALETTEENTRY)];
+     new BYTE[sizeof(LOGPALETTE) + count*sizeof(PALETTEENTRY)];

   logPal->palVersion = 0x300;
   logPal->palNumEntries = count;
   ::GetPaletteEntries((HPALETTE) cmap->GetHPALETTE(), 0, count, logPal->palPalEntry);
   logPal->palVersion = 0x300;
   logPal->palNumEntries = count;
   ::GetPaletteEntries((HPALETTE) cmap->GetHPALETTE(), 0, count, logPal->palPalEntry);

-  
+

   HPALETTE hPalette = ::CreatePalette(logPal);
   delete[] logPal;
 
   HPALETTE hPalette = ::CreatePalette(logPal);
   delete[] logPal;
 


@@ -360,7 +357,7 @@ wxMask *wxPNGReader::CreateMask(void)
 {
     HBITMAP hBitmap = ::CreateBitmap(GetWidth(), GetHeight(), 1, 1, NULL);
 
 {
     HBITMAP hBitmap = ::CreateBitmap(GetWidth(), GetHeight(), 1, 1, NULL);
 

-       HDC dc = ::CreateCompatibleDC(NULL);
+  HDC dc = ::CreateCompatibleDC(NULL);

     HBITMAP oldBitmap = (HBITMAP) ::SelectObject(dc, hBitmap);
 
     int bgIndex = GetBGIndex();
     HBITMAP oldBitmap = (HBITMAP) ::SelectObject(dc, hBitmap);
 
     int bgIndex = GetBGIndex();


@@ -377,7 +374,7 @@ wxMask *wxPNGReader::CreateMask(void)
             else
                 ::SetPixel(dc, x, GetHeight() - y - 1, RGB(255, 255, 255));
 
             else
                 ::SetPixel(dc, x, GetHeight() - y - 1, RGB(255, 255, 255));
 

-           }
+      }

     }
     ::SelectObject(dc, oldBitmap);
     wxMask *mask = new wxMask;
     }
     ::SelectObject(dc, oldBitmap);
     wxMask *mask = new wxMask;


@@ -390,138 +387,138 @@ bool wxPNGReader::ReadFile(char * ImageFileName)
   int number_passes;
 
   if (ImageFileName)
   int number_passes;
 
   if (ImageFileName)

-        strcpy(filename, ImageFileName);
+   strcpy(filename, ImageFileName);

 
 

-       FILE *fp;
-       png_struct *png_ptr;
+  FILE *fp;
+  png_struct *png_ptr;

    png_info *info_ptr;
    png_info *info_ptr;

-       wxPNGReaderIter iter(this);
-
-       /* open the file */
-       fp = fopen(filename, "rb");
-       if (!fp)
-               return FALSE;
-
-       /* allocate the necessary structures */
-       png_ptr = new (png_struct);
-       if (!png_ptr)
-       {
-               fclose(fp);
-               return FALSE;
-       }
-
-       info_ptr = new (png_info);
-       if (!info_ptr)
-       {
-               fclose(fp);
-               delete(png_ptr);
-               return FALSE;
-       }
-       /* set error handling */
-       if (setjmp(png_ptr->jmpbuf))
-       {
-               png_read_destroy(png_ptr, info_ptr, (png_info *)0);
-               fclose(fp);
-               delete(png_ptr);
-               delete(info_ptr);
-
-               /* If we get here, we had a problem reading the file */
-               return FALSE;
-       }
+  wxPNGReaderIter iter(this);
+
+  /* open the file */
+  fp = fopen(filename, "rb");
+  if (!fp)
+    return FALSE;
+
+  /* allocate the necessary structures */
+  png_ptr = new (png_struct);
+  if (!png_ptr)
+  {
+    fclose(fp);
+    return FALSE;
+  }
+
+  info_ptr = new (png_info);
+  if (!info_ptr)
+  {
+    fclose(fp);
+    delete(png_ptr);
+    return FALSE;
+  }
+  /* set error handling */
+  if (setjmp(png_ptr->jmpbuf))
+  {
+    png_read_destroy(png_ptr, info_ptr, (png_info *)0);
+    fclose(fp);
+    delete(png_ptr);
+    delete(info_ptr);
+
+    /* If we get here, we had a problem reading the file */
+    return FALSE;
+  }

         //png_set_error(ima_png_error, NULL);
 
         //png_set_error(ima_png_error, NULL);
 

-       /* initialize the structures, info first for error handling */
-       png_info_init(info_ptr);
-       png_read_init(png_ptr);
+  /* initialize the structures, info first for error handling */
+  png_info_init(info_ptr);
+  png_read_init(png_ptr);

 
 

-       /* set up the input control */
-       png_init_io(png_ptr, fp);
+  /* set up the input control */
+  png_init_io(png_ptr, fp);

 
 

-       /* read the file information */
-       png_read_info(png_ptr, info_ptr);
+  /* read the file information */
+  png_read_info(png_ptr, info_ptr);

 
 

-       /* allocate the memory to hold the image using the fields
-               of png_info. */
-       png_color_16 my_background={ 0, 31, 127, 255, 0 };
+  /* allocate the memory to hold the image using the fields
+    of png_info. */
+  png_color_16 my_background={ 0, 31, 127, 255, 0 };

 
 

-       if (info_ptr->valid & PNG_INFO_bKGD)
+  if (info_ptr->valid & PNG_INFO_bKGD)

     {
     {

-               png_set_background(png_ptr, &(info_ptr->background),
-                       PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
+    png_set_background(png_ptr, &(info_ptr->background),
+      PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);

         if ( info_ptr->num_palette > 0 )
             bgindex = info_ptr->background.index;
     }
         if ( info_ptr->num_palette > 0 )
             bgindex = info_ptr->background.index;
     }

-       else   {
-               png_set_background(png_ptr, &my_background,
-                       PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
+  else   {
+    png_set_background(png_ptr, &my_background,
+      PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);

 
         // Added by JACS: guesswork!
         if ( info_ptr->num_trans != 0 )
             bgindex = info_ptr->num_trans - 1 ;
 
         // Added by JACS: guesswork!
         if ( info_ptr->num_trans != 0 )
             bgindex = info_ptr->num_trans - 1 ;

-        }
+   }

 
 

-       /* tell libpng to strip 16 bit depth files down to 8 bits */
-       if (info_ptr->bit_depth == 16)
-               png_set_strip_16(png_ptr);
+  /* tell libpng to strip 16 bit depth files down to 8 bits */
+  if (info_ptr->bit_depth == 16)
+    png_set_strip_16(png_ptr);

 
 

-       int pixel_depth=(info_ptr->pixel_depth<24) ? info_ptr->pixel_depth: 24;
-       Create(info_ptr->width, info_ptr->height, pixel_depth,
-               info_ptr->color_type);
+  int pixel_depth=(info_ptr->pixel_depth<24) ? info_ptr->pixel_depth: 24;
+  Create(info_ptr->width, info_ptr->height, pixel_depth,
+    info_ptr->color_type);

 
 

-       if (info_ptr->num_palette>0)
+  if (info_ptr->num_palette>0)

     {
     {

-           SetPalette((int)info_ptr->num_palette, (rgb_color_struct*)info_ptr->palette);
+      SetPalette((int)info_ptr->num_palette, (rgb_color_struct*)info_ptr->palette);
+    }
+
+  int row_stride = info_ptr->width * ((pixel_depth+7)>>3);
+ //  printf("P = %d D = %d RS= %d ", info_ptr->num_palette, info_ptr->pixel_depth,row_stride);
+//  printf("CT = %d TRS = %d BD= %d ", info_ptr->color_type, info_ptr->valid & PNG_INFO_tRNS,info_ptr->bit_depth);
+
+  byte *row_pointers = new byte[row_stride];
+
+  /* turn on interlace handling */
+  if (info_ptr->interlace_type)
+    number_passes = png_set_interlace_handling(png_ptr);
+  else
+    number_passes = 1;
+//  printf("NP = %d ", number_passes);
+
+  for (int pass=0; pass< number_passes; pass++) {
+  iter.upset();
+  int y=0;
+  do  {
+//    (unsigned char *)iter.GetRow();
+    if (info_ptr->interlace_type)  {
+     if (pass>0)
+      iter.GetRow(row_pointers, row_stride);
+     png_read_row(png_ptr, row_pointers, NULL);

     }
     }

+    else
+     png_read_row(png_ptr, row_pointers, NULL);
+
+    iter.SetRow(row_pointers, row_stride);
+    y++;
+  } while(iter.PrevRow());
+//  printf("Y=%d ",y);
+  }
+  delete[] row_pointers;

 
 

-       int row_stride = info_ptr->width * ((pixel_depth+7)>>3);
- //    printf("P = %d D = %d RS= %d ", info_ptr->num_palette, info_ptr->pixel_depth,row_stride);
-//     printf("CT = %d TRS = %d BD= %d ", info_ptr->color_type, info_ptr->valid & PNG_INFO_tRNS,info_ptr->bit_depth);
-
-       byte *row_pointers = new byte[row_stride];
-
-       /* turn on interlace handling */
-       if (info_ptr->interlace_type)
-               number_passes = png_set_interlace_handling(png_ptr);
-       else
-               number_passes = 1;
-//     printf("NP = %d ", number_passes);
-
-       for (int pass=0; pass< number_passes; pass++) {
-       iter.upset();
-       int y=0;
-       do      {
-//       (unsigned char *)iter.GetRow();
-         if (info_ptr->interlace_type)  {
-                if (pass>0)
-                       iter.GetRow(row_pointers, row_stride);
-                png_read_row(png_ptr, row_pointers, NULL);
-         }
-         else
-                png_read_row(png_ptr, row_pointers, NULL);
-
-         iter.SetRow(row_pointers, row_stride);
-         y++;
-       } while(iter.PrevRow());
-//     printf("Y=%d ",y);
-       }
-       delete[] row_pointers;
-
-       /* read the rest of the file, getting any additional chunks
-               in info_ptr */
-       png_read_end(png_ptr, info_ptr);
-
-       /* clean up after the read, and free any memory allocated */
-       png_read_destroy(png_ptr, info_ptr, (png_info *)0);
-
-       /* free the structures */
-       delete(png_ptr);
-       delete(info_ptr);
-
-       /* close the file */
-       fclose(fp);
-
-       /* that's it */
-       return TRUE;
+  /* read the rest of the file, getting any additional chunks
+    in info_ptr */
+  png_read_end(png_ptr, info_ptr);
+
+  /* clean up after the read, and free any memory allocated */
+  png_read_destroy(png_ptr, info_ptr, (png_info *)0);
+
+  /* free the structures */
+  delete(png_ptr);
+  delete(info_ptr);
+
+  /* close the file */
+  fclose(fp);
+
+  /* that's it */
+  return TRUE;

 }
 
 
 }
 
 


@@ -530,91 +527,91 @@ bool wxPNGReader::ReadFile(char * ImageFileName)
 bool wxPNGReader::SaveFile(char * ImageFileName)
 {
   if (ImageFileName)
 bool wxPNGReader::SaveFile(char * ImageFileName)
 {
   if (ImageFileName)

-        strcpy(filename, ImageFileName);
+   strcpy(filename, ImageFileName);

 
   wxPNGReaderIter iter(this);
   FILE *fp;
    png_struct *png_ptr;
 
   wxPNGReaderIter iter(this);
   FILE *fp;
    png_struct *png_ptr;

-       png_info *info_ptr;
+  png_info *info_ptr;

 
    /* open the file */
 
    /* open the file */

-       fp = fopen(filename, "wb");
-       if (!fp)
-               return FALSE;
-
-       /* allocate the necessary structures */
-       png_ptr = new (png_struct);
-       if (!png_ptr)
-       {
-               fclose(fp);
-               return FALSE;
-       }
-
-       info_ptr = new (png_info);
-       if (!info_ptr)
-       {
-               fclose(fp);
-               delete(png_ptr);
-               return FALSE;
-       }
-
-       /* set error handling */
-       if (setjmp(png_ptr->jmpbuf))
-       {
-               png_write_destroy(png_ptr);
-               fclose(fp);
-               delete(png_ptr);
-               delete(info_ptr);
-
-               /* If we get here, we had a problem reading the file */
-               return FALSE;
-       }
+  fp = fopen(filename, "wb");
+  if (!fp)
+    return FALSE;
+
+  /* allocate the necessary structures */
+  png_ptr = new (png_struct);
+  if (!png_ptr)
+  {
+    fclose(fp);
+    return FALSE;
+  }
+
+  info_ptr = new (png_info);
+  if (!info_ptr)
+  {
+    fclose(fp);
+    delete(png_ptr);
+    return FALSE;
+  }
+
+  /* set error handling */
+  if (setjmp(png_ptr->jmpbuf))
+  {
+    png_write_destroy(png_ptr);
+    fclose(fp);
+    delete(png_ptr);
+    delete(info_ptr);
+
+    /* If we get here, we had a problem reading the file */
+    return FALSE;
+  }

         //png_set_error(ima_png_error, NULL);
 
         //png_set_error(ima_png_error, NULL);
 

-//     printf("writig pg %s ", filename);
+//  printf("writig pg %s ", filename);

    /* initialize the structures */
    /* initialize the structures */

-       png_info_init(info_ptr);
-       png_write_init(png_ptr);
-            
-       int row_stride = GetWidth() * ((GetDepth()+7)>>3);
-       /* set up the output control */
+  png_info_init(info_ptr);
+  png_write_init(png_ptr);
+
+  int row_stride = GetWidth() * ((GetDepth()+7)>>3);
+  /* set up the output control */

    png_init_io(png_ptr, fp);
 
    png_init_io(png_ptr, fp);
 

-       /* set the file information here */
-       info_ptr->width = GetWidth();
-       info_ptr->height = GetHeight();
-       info_ptr->pixel_depth = GetDepth();
-       info_ptr->channels = (GetDepth()>8) ? 3: 1;
-       info_ptr->bit_depth = GetDepth()/info_ptr->channels;
-       info_ptr->color_type = GetColorType();
-       info_ptr->compression_type = info_ptr->filter_type = info_ptr->interlace_type=0;
-       info_ptr->valid = 0;
-       info_ptr->rowbytes = row_stride;
+  /* set the file information here */
+  info_ptr->width = GetWidth();
+  info_ptr->height = GetHeight();
+  info_ptr->pixel_depth = GetDepth();
+  info_ptr->channels = (GetDepth()>8) ? 3: 1;
+  info_ptr->bit_depth = GetDepth()/info_ptr->channels;
+  info_ptr->color_type = GetColorType();
+  info_ptr->compression_type = info_ptr->filter_type = info_ptr->interlace_type=0;
+  info_ptr->valid = 0;
+  info_ptr->rowbytes = row_stride;

 
 
 // printf("P = %d D = %d RS= %d GD= %d CH= %d ", info_ptr->pixel_depth, info_ptr->bit_depth, row_stride, GetDepth(), info_ptr->channels);
 
 
 // printf("P = %d D = %d RS= %d GD= %d CH= %d ", info_ptr->pixel_depth, info_ptr->bit_depth, row_stride, GetDepth(), info_ptr->channels);

-       /* set the palette if there is one */
-       if ((GetColorType() & COLORTYPE_PALETTE) && GetPalette())
-       {
-//       printf("writing paleta[%d %d %x]",GetColorType() ,COLORTYPE_PALETTE, GetPalette());
-         info_ptr->valid |= PNG_INFO_PLTE;
-         info_ptr->palette = new png_color[256];
-         info_ptr->num_palette = 256;
-         for (int i=0; i<256; i++)
-                GetPalette()->GetRGB(i, &info_ptr->palette[i].red, &info_ptr->palette[i].green, &info_ptr->palette[i].blue);
-       }
-//       printf("Paleta [%d %d %x]",GetColorType() ,COLORTYPE_PALETTE, GetPalette());
+  /* set the palette if there is one */
+  if ((GetColorType() & COLORTYPE_PALETTE) && GetPalette())
+  {
+//    printf("writing paleta[%d %d %x]",GetColorType() ,COLORTYPE_PALETTE, GetPalette());
+    info_ptr->valid |= PNG_INFO_PLTE;
+    info_ptr->palette = new png_color[256];
+    info_ptr->num_palette = 256;
+    for (int i=0; i<256; i++)
+     GetPalette()->GetRGB(i, &info_ptr->palette[i].red, &info_ptr->palette[i].green, &info_ptr->palette[i].blue);
+  }
+//    printf("Paleta [%d %d %x]",GetColorType() ,COLORTYPE_PALETTE, GetPalette());

 
 
    /* optional significant bit chunk */
 //   info_ptr->valid |= PNG_INFO_sBIT;
 //   info_ptr->sig_bit = true_bit_depth;
 
 
 
    /* optional significant bit chunk */
 //   info_ptr->valid |= PNG_INFO_sBIT;
 //   info_ptr->sig_bit = true_bit_depth;
 

-       /* optional gamma chunk */
+  /* optional gamma chunk */

 //   info_ptr->valid |= PNG_INFO_gAMA;
 //   info_ptr->gamma = gamma;
 
 //   info_ptr->valid |= PNG_INFO_gAMA;
 //   info_ptr->gamma = gamma;
 

-       /* other optional chunks */
+  /* other optional chunks */

 
    /* write the file information */
    png_write_info(png_ptr, info_ptr);
 
    /* write the file information */
    png_write_info(png_ptr, info_ptr);


@@ -622,14 +619,14 @@ bool wxPNGReader::SaveFile(char * ImageFileName)
    /* set up the transformations you want.  Note that these are
       all optional.  Only call them if you want them */
 
    /* set up the transformations you want.  Note that these are
       all optional.  Only call them if you want them */
 

-       /* shift the pixels up to a legal bit depth and fill in
+  /* shift the pixels up to a legal bit depth and fill in

       as appropriate to correctly scale the image */
 //   png_set_shift(png_ptr, &(info_ptr->sig_bit));
 
       as appropriate to correctly scale the image */
 //   png_set_shift(png_ptr, &(info_ptr->sig_bit));
 

-       /* pack pixels into bytes */
+  /* pack pixels into bytes */

 //   png_set_packing(png_ptr);
 
 //   png_set_packing(png_ptr);
 

-       /* flip bgr pixels to rgb */
+  /* flip bgr pixels to rgb */

 //   png_set_bgr(png_ptr);
 
    /* swap bytes of 16 bit files to most significant bit first */
 //   png_set_bgr(png_ptr);
 
    /* swap bytes of 16 bit files to most significant bit first */


@@ -640,35 +637,35 @@ bool wxPNGReader::SaveFile(char * ImageFileName)
 
 /* If you are only writing one row at a time, this works */
 
 
 /* If you are only writing one row at a time, this works */
 

-       byte *row_pointers = new byte[row_stride];
-       iter.upset();
-       do      {
-//       (unsigned char *)iter.GetRow();
-         iter.GetRow(row_pointers, row_stride);
-         png_write_row(png_ptr, row_pointers);
-       } while(iter.PrevRow());
-        
+  byte *row_pointers = new byte[row_stride];
+    iter.upset();
+  do  {
+//    (unsigned char *)iter.GetRow();
+    iter.GetRow(row_pointers, row_stride);
+    png_write_row(png_ptr, row_pointers);
+  } while(iter.PrevRow());
+

         delete[] row_pointers;
 
 /* write the rest of the file */
    png_write_end(png_ptr, info_ptr);
 
         delete[] row_pointers;
 
 /* write the rest of the file */
    png_write_end(png_ptr, info_ptr);
 

-       /* clean up after the write, and free any memory allocated */
+  /* clean up after the write, and free any memory allocated */

    png_write_destroy(png_ptr);
 
    /* if you malloced the palette, free it here */
    if (info_ptr->palette)
    png_write_destroy(png_ptr);
 
    /* if you malloced the palette, free it here */
    if (info_ptr->palette)

-               delete[] (info_ptr->palette);
+    delete[] (info_ptr->palette);

 
 

-       /* free the structures */
-       delete(png_ptr);
-       delete(info_ptr);
+  /* free the structures */
+  delete(png_ptr);
+  delete(info_ptr);

 
 

-       /* close the file */
-       fclose(fp);
+  /* close the file */
+  fclose(fp);

 
 

-       /* that's it */
-       return TRUE;
+  /* that's it */
+  return TRUE;

 }
 
 static int Power(int x, int y)
 }
 
 static int Power(int x, int y)


@@ -693,7 +690,7 @@ static void DecToHex(int dec, char *buf)
   buf[1] = hexArray[secondDigit];
   buf[2] = 0;
 }
   buf[1] = hexArray[secondDigit];
   buf[2] = 0;
 }

- 
+

 
 bool wxPNGReader::SaveXPM(char *filename, char *name)
 {
 
 bool wxPNGReader::SaveXPM(char *filename, char *name)
 {

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index c6263deba89c2684ded2737b064391959ddd16c8..64f4d4314ed35b69503c8c3677871c6eae82badc 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -39,12 +39,9 @@
 #include <stdlib.h>
 
 #if wxUSE_IOSTREAMH
 #include <stdlib.h>
 
 #if wxUSE_IOSTREAMH

-#include <fstream.h>
+#   include <fstream.h>

 #else
 #else

-#include <fstream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
+#   include <fstream>

 #endif
 
 #include <sys/types.h>
 #endif
 
 #include <sys/types.h>

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index a42f71bca74af9cb7bddb9ca690fba00dadf8706..e0ed4d72464ba873c3e150ccc0529db6f780a466 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -68,41 +68,26 @@
 #include <stdlib.h>
 #include <string.h>
 #ifndef __WATCOMC__
 #include <stdlib.h>
 #include <string.h>
 #ifndef __WATCOMC__

-#if !(defined(_MSC_VER) && (_MSC_VER > 800))
-#include <errno.h>
-#endif
+    #if !(defined(_MSC_VER) && (_MSC_VER > 800))
+        #include <errno.h>
+    #endif

 #endif
 #include <stdarg.h>
 
 //// BEGIN for console support: VC++ only
 
 #endif
 #include <stdarg.h>
 
 //// BEGIN for console support: VC++ only
 

-#if defined(__WXDEBUG__) && !defined(__WIN16__) && defined(_MSC_VER) && !defined(__NO_VC_CRTDBG__)
-    #define wxUSE_VC_CRTDBG
-#else
-    #undef wxUSE_VC_CRTDBG
-#endif
+#include "wx/msw/msvcrt.h"

 
 

-#ifdef wxUSE_VC_CRTDBG
-  // VC++ uses this macro as debug/release mode indicator
-  #ifndef _DEBUG
-    #define _DEBUG
-  #endif
+#include <fcntl.h>

 
 

-  #include <fcntl.h>
+#include "wx/ioswrap.h"

 
 #if wxUSE_IOSTREAMH
 // N.B. BC++ doesn't have istream.h, ostream.h
 
 #if wxUSE_IOSTREAMH
 // N.B. BC++ doesn't have istream.h, ostream.h

-#  include <iostream.h>

 #  include <io.h>
 #  include <fstream.h>
 #  include <io.h>
 #  include <fstream.h>

-

 #else
 #else

-#  include <istream>
-#  include <ostream>

 #  include <fstream>
 #  include <fstream>

-#  ifdef _MSC_VER
-      using namespace std;
-#  endif

 #endif
 
 /* Need to undef new if including crtdbg.h */
 #endif
 
 /* Need to undef new if including crtdbg.h */


@@ -118,8 +103,6 @@
 #  define new new(__FILE__,__LINE__)
 #  endif
 
 #  define new new(__FILE__,__LINE__)
 #  endif
 

-#endif
-

 /// END for console support
 
 // In the WIN.INI file
 /// END for console support
 
 // In the WIN.INI file


@@ -766,14 +749,14 @@ bool wxDirExists(const wxString& dir)
 #endif
 
 #if defined(__WIN32__)
 #endif
 
 #if defined(__WIN32__)

-       HANDLE h = FindFirstFile((LPTSTR) WXSTRINGCAST dir,(LPWIN32_FIND_DATA)&fileInfo);
-
-       if (h==INVALID_HANDLE_VALUE)
-        return FALSE;
-       else {
-        FindClose(h);
-        return ((fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY);
-       }
+  HANDLE h = FindFirstFile((LPTSTR) WXSTRINGCAST dir,(LPWIN32_FIND_DATA)&fileInfo);
+
+  if (h==INVALID_HANDLE_VALUE)
+   return FALSE;
+  else {
+   FindClose(h);
+   return ((fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY);
+  }

 #else
   // In Borland findfirst has a different argument
   // ordering from _dos_findfirst. But _dos_findfirst
 #else
   // In Borland findfirst has a different argument
   // ordering from _dos_findfirst. But _dos_findfirst


@@ -806,13 +789,13 @@ bool wxIsWild( const wxString& pattern )
   wxString tmp = pattern;
   char *pat = WXSTRINGCAST(tmp);
     while (*pat) {
   wxString tmp = pattern;
   char *pat = WXSTRINGCAST(tmp);
     while (*pat) {

-       switch (*pat++) {
-       case '?': case '*': case '[': case '{':
-           return TRUE;
-       case '\\':
-           if (!*pat++)
-               return FALSE;
-       }
+  switch (*pat++) {
+  case '?': case '*': case '[': case '{':
+      return TRUE;
+  case '\\':
+      if (!*pat++)
+    return FALSE;
+  }

     }
     return FALSE;
 };
     }
     return FALSE;
 };


@@ -832,124 +815,124 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
 
     // dot_special means '.' only matches '.'
     if (dot_special && *str == '.' && *pattern != *str)
 
     // dot_special means '.' only matches '.'
     if (dot_special && *str == '.' && *pattern != *str)

-       return FALSE;
+  return FALSE;

 
     while ((*pattern != '\0') && (!done)
     && (((*str=='\0')&&((*pattern==OB)||(*pattern=='*')))||(*str!='\0'))) {
 
     while ((*pattern != '\0') && (!done)
     && (((*str=='\0')&&((*pattern==OB)||(*pattern=='*')))||(*str!='\0'))) {

-       switch (*pattern) {
-       case '\\':
-           pattern++;
-           if (*pattern != '\0')
-               pattern++;
-           break;
-       case '*':
-           pattern++;
-           ret_code = FALSE;
-           while ((*str!='\0')
-           && (!(ret_code=wxMatchWild(pattern, str++, FALSE))))
-               /*loop*/;
-           if (ret_code) {
-               while (*str != '\0')
-                   str++;
-               while (*pattern != '\0')
-                   pattern++;
-           }
-           break;
-       case '[':
-           pattern++;
-         repeat:
-           if ((*pattern == '\0') || (*pattern == ']')) {
-               done = TRUE;
-               break;
-           }
-           if (*pattern == '\\') {
-               pattern++;
-               if (*pattern == '\0') {
-                   done = TRUE;
-                   break;
-               }
-           }
-           if (*(pattern + 1) == '-') {
-               c = *pattern;
-               pattern += 2;
-               if (*pattern == ']') {
-                   done = TRUE;
-                   break;
-               }
-               if (*pattern == '\\') {
-                   pattern++;
-                   if (*pattern == '\0') {
-                       done = TRUE;
-                       break;
-                   }
-               }
-               if ((*str < c) || (*str > *pattern)) {
-                   pattern++;
-                   goto repeat;
-               }
-           } else if (*pattern != *str) {
-               pattern++;
-               goto repeat;
-           }
-           pattern++;
-           while ((*pattern != ']') && (*pattern != '\0')) {
-               if ((*pattern == '\\') && (*(pattern + 1) != '\0'))
-                   pattern++;
-               pattern++;
-           }
-           if (*pattern != '\0') {
-               pattern++, str++;
-           }
-           break;
-       case '?':
-           pattern++;
-           str++;
-           break;
-       case OB:
-           pattern++;
-           while ((*pattern != CB) && (*pattern != '\0')) {
-               cp = str;
-               ok = TRUE;
-               while (ok && (*cp != '\0') && (*pattern != '\0')
-               &&  (*pattern != ',') && (*pattern != CB)) {
-                   if (*pattern == '\\')
-                       pattern++;
-                   ok = (*pattern++ == *cp++);
-               }
-               if (*pattern == '\0') {
-                   ok = FALSE;
-                   done = TRUE;
-                   break;
-               } else if (ok) {
-                   str = cp;
-                   while ((*pattern != CB) && (*pattern != '\0')) {
-                       if (*++pattern == '\\') {
-                           if (*++pattern == CB)
-                               pattern++;
-                       }
-                   }
-               } else {
-                   while (*pattern!=CB && *pattern!=',' && *pattern!='\0') {
-                       if (*++pattern == '\\') {
+  switch (*pattern) {
+  case '\\':
+      pattern++;
+      if (*pattern != '\0')
+    pattern++;
+      break;
+  case '*':
+      pattern++;
+      ret_code = FALSE;
+      while ((*str!='\0')
+      && (!(ret_code=wxMatchWild(pattern, str++, FALSE))))
+    /*loop*/;
+      if (ret_code) {
+    while (*str != '\0')
+        str++;
+    while (*pattern != '\0')
+        pattern++;
+      }
+      break;
+  case '[':
+      pattern++;
+    repeat:
+      if ((*pattern == '\0') || (*pattern == ']')) {
+    done = TRUE;
+    break;
+      }
+      if (*pattern == '\\') {
+    pattern++;
+    if (*pattern == '\0') {
+        done = TRUE;
+        break;
+    }
+      }
+      if (*(pattern + 1) == '-') {
+    c = *pattern;
+    pattern += 2;
+    if (*pattern == ']') {
+        done = TRUE;
+        break;
+    }
+    if (*pattern == '\\') {
+        pattern++;
+        if (*pattern == '\0') {
+      done = TRUE;
+      break;
+        }
+    }
+    if ((*str < c) || (*str > *pattern)) {
+        pattern++;
+        goto repeat;
+    }
+      } else if (*pattern != *str) {
+    pattern++;
+    goto repeat;
+      }
+      pattern++;
+      while ((*pattern != ']') && (*pattern != '\0')) {
+    if ((*pattern == '\\') && (*(pattern + 1) != '\0'))
+        pattern++;
+    pattern++;
+      }
+      if (*pattern != '\0') {
+    pattern++, str++;
+      }
+      break;
+  case '?':
+      pattern++;
+      str++;
+      break;
+  case OB:
+      pattern++;
+      while ((*pattern != CB) && (*pattern != '\0')) {
+    cp = str;
+    ok = TRUE;
+    while (ok && (*cp != '\0') && (*pattern != '\0')
+    &&  (*pattern != ',') && (*pattern != CB)) {
+        if (*pattern == '\\')
+      pattern++;
+        ok = (*pattern++ == *cp++);
+    }
+    if (*pattern == '\0') {
+        ok = FALSE;
+        done = TRUE;
+        break;
+    } else if (ok) {
+        str = cp;
+        while ((*pattern != CB) && (*pattern != '\0')) {
+      if (*++pattern == '\\') {
+          if (*++pattern == CB)
+        pattern++;
+      }
+        }
+    } else {
+        while (*pattern!=CB && *pattern!=',' && *pattern!='\0') {
+      if (*++pattern == '\\') {

                             if (*++pattern == CB || *pattern == ',')
                             if (*++pattern == CB || *pattern == ',')

-                               pattern++;
-                       }
-                   }
-               }
-               if (*pattern != '\0')
-                   pattern++;
-           }
-           break;
-       default:
-           if (*str == *pattern) {
-               str++, pattern++;
-           } else {
-               done = TRUE;
-           }
-       }
+        pattern++;
+      }
+        }
+    }
+    if (*pattern != '\0')
+        pattern++;
+      }
+      break;
+  default:
+      if (*str == *pattern) {
+    str++, pattern++;
+      } else {
+    done = TRUE;
+      }
+  }

     }
     while (*pattern == '*')
     }
     while (*pattern == '*')

-       pattern++;
+  pattern++;

     return ((*str == '\0') && (*pattern == '\0'));
 };
 
     return ((*str == '\0') && (*pattern == '\0'));
 };
 


@@ -1089,14 +1072,14 @@ void OutputDebugStringW95(const char* lpOutputString, ...)
 #endif
 
 
 #endif
 
 

-#ifdef wxUSE_VC_CRTDBG
+#ifdef 0

 
 // maximum mumber of lines the output console should have
 static const WORD MAX_CONSOLE_LINES = 500;
 
 BOOL WINAPI MyConsoleHandler( DWORD dwCtrlType ) {   //  control signal type
 
 // maximum mumber of lines the output console should have
 static const WORD MAX_CONSOLE_LINES = 500;
 
 BOOL WINAPI MyConsoleHandler( DWORD dwCtrlType ) {   //  control signal type

-       FreeConsole();
-       return TRUE;
+  FreeConsole();
+  return TRUE;

 }
 
 void wxRedirectIOToConsole()
 }
 
 void wxRedirectIOToConsole()


@@ -1110,10 +1093,10 @@ void wxRedirectIOToConsole()
     AllocConsole();
 
     // set the screen buffer to be big enough to let us scroll text
     AllocConsole();
 
     // set the screen buffer to be big enough to let us scroll text

-    GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), 
+    GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE),

                                &coninfo);
     coninfo.dwSize.Y = MAX_CONSOLE_LINES;
                                &coninfo);
     coninfo.dwSize.Y = MAX_CONSOLE_LINES;

-    SetConsoleScreenBufferSize(GetStdHandle(STD_OUTPUT_HANDLE), 
+    SetConsoleScreenBufferSize(GetStdHandle(STD_OUTPUT_HANDLE),

                                coninfo.dwSize);
 
     // redirect unbuffered STDOUT to the console
                                coninfo.dwSize);
 
     // redirect unbuffered STDOUT to the console


@@ -1139,13 +1122,12 @@ void wxRedirectIOToConsole()
     fp = _fdopen( hConHandle, "w" );
     *stderr = *fp;
     setvbuf( stderr, NULL, _IONBF, 0 );
     fp = _fdopen( hConHandle, "w" );
     *stderr = *fp;
     setvbuf( stderr, NULL, _IONBF, 0 );

-    
-    // make cout, wcout, cin, wcin, wcerr, cerr, wclog and clog 
+
+    // make cout, wcout, cin, wcin, wcerr, cerr, wclog and clog

     // point to console as well
     ios::sync_with_stdio();
 
     // point to console as well
     ios::sync_with_stdio();
 

-       SetConsoleCtrlHandler(MyConsoleHandler, TRUE);
-
+    SetConsoleCtrlHandler(MyConsoleHandler, TRUE);

 }
 #else
 // Not supported
 }
 #else
 // Not supported

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index e74411c2294eedf414227f55551f265a4441dfa0..0b7212e2a07f578662099088661c990b47c31d0c 100644 (file)
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -59,9 +59,9 @@
 #include <stdlib.h>
 #include <string.h>
 #ifndef __WATCOMC__
 #include <stdlib.h>
 #include <string.h>
 #ifndef __WATCOMC__

-#if !(defined(_MSC_VER) && (_MSC_VER > 800))
-#include <errno.h>
-#endif
+    #if !(defined(_MSC_VER) && (_MSC_VER > 800))
+        #include <errno.h>
+    #endif

 #endif
 #include <stdarg.h>
 
 #endif
 #include <stdarg.h>