MDI child maximize bug fixed

[wxWidgets.git] / src / msw / utils.cpp

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index c12877f753fa3bc221830f908c8cb221da9479b3..9f4ffbc76ce6d2ab3cdc67be45ff696991738131 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -17,34 +17,35 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/setup.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/cursor.h"
+    #include "wx/setup.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/cursor.h"

 #endif  //WX_PRECOMP
 
 #include "wx/msw/private.h"
 #include "wx/timer.h"
 #endif  //WX_PRECOMP
 
 #include "wx/msw/private.h"
 #include "wx/timer.h"

+#include "wx/intl.h"

 
 #include <windows.h>
 
 #include <ctype.h>
 
 
 #include <windows.h>
 
 #include <ctype.h>
 

-#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
-#include <direct.h>
+#if !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__SALFORDC__)
+    #include <direct.h>

 
 

-#ifndef __MWERKS__
-#include <dos.h>
-#endif
+    #ifndef __MWERKS__
+        #include <dos.h>
+    #endif

 #endif  //GNUWIN32
 
 #endif  //GNUWIN32
 

-#ifdef __GNUWIN32__
-#include <sys/unistd.h>
-#include <sys/stat.h>
+#if defined(__GNUWIN32__) && !defined(__TWIN32__)
+    #include <sys/unistd.h>
+    #include <sys/stat.h>

 #endif  //GNUWIN32
 
 #include "wx/log.h"
 #endif  //GNUWIN32
 
 #include "wx/log.h"


@@ -52,56 +53,52 @@
 #ifdef __BORLANDC__ // Please someone tell me which version of Borland needs
                     // this (3.1 I believe) and how to test for it.
                     // If this works for Borland 4.0 as well, then no worries.
 #ifdef __BORLANDC__ // Please someone tell me which version of Borland needs
                     // this (3.1 I believe) and how to test for it.
                     // If this works for Borland 4.0 as well, then no worries.

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

 #endif
 
 #endif
 

-#ifdef __WIN32__
-#include <io.h>
+// VZ: there is some code using NetXXX() functions to get the full user name:
+//     I don't think it's a good idea because they don't work under Win95 and
+//     seem to return the same as wxGetUserId() under NT. If you really want
+//     to use them, just #define USE_NET_API
+#undef USE_NET_API

 
 

-#ifndef __GNUWIN32__
-#include <shellapi.h>
-#endif
+#ifdef USE_NET_API
+    #include <lm.h>
+#endif // USE_NET_API
+
+#if defined(__WIN32__) && !defined(__WXWINE__)
+    #include <io.h>
+
+    #ifndef __GNUWIN32__
+        #include <shellapi.h>
+    #endif

 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #ifndef __WATCOMC__
 #endif
 
 #include <stdio.h>
 #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

+#ifdef __VISUALC__

 
 

-#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,14 +115,14 @@
 #  endif
 
 #endif
 #  endif
 
 #endif

-
+  // __VISUALC__

 /// END for console support
 
 // In the WIN.INI file
 /// END for console support
 
 // In the WIN.INI file

-static const char WX_SECTION[] = "wxWindows";
-static const char eHOSTNAME[]  = "HostName";
-static const char eUSERID[]    = "UserId";
-static const char eUSERNAME[]  = "UserName";
+static const wxChar WX_SECTION[] = _T("wxWindows");
+static const wxChar eHOSTNAME[]  = _T("HostName");
+static const wxChar eUSERID[]    = _T("UserId");
+static const wxChar eUSERNAME[]  = _T("UserName");

 
 // For the following functions we SHOULD fill in support
 // for Windows-NT (which I don't know) as I assume it begin
 
 // For the following functions we SHOULD fill in support
 // for Windows-NT (which I don't know) as I assume it begin


@@ -133,104 +130,64 @@ static const char eUSERNAME[]  = "UserName";
 // functions beyond those provided by WinSock
 
 // Get full hostname (eg. DoDo.BSn-Germany.crg.de)
 // functions beyond those provided by WinSock
 
 // Get full hostname (eg. DoDo.BSn-Germany.crg.de)

-bool wxGetHostName(char *buf, int maxSize)
+bool wxGetHostName(wxChar *buf, int maxSize)

 {
 {

-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__TWIN32__)

   DWORD nSize = maxSize;
   return (::GetComputerName(buf, &nSize) != 0);
 #else
   DWORD nSize = maxSize;
   return (::GetComputerName(buf, &nSize) != 0);
 #else

-  char *sysname;
-  const char *default_host = "noname";
+  wxChar *sysname;
+  const wxChar *default_host = _T("noname");

 
 

-  if ((sysname = getenv("SYSTEM_NAME")) == NULL) {
+  if ((sysname = wxGetenv(_T("SYSTEM_NAME"))) == NULL) {

      GetProfileString(WX_SECTION, eHOSTNAME, default_host, buf, maxSize - 1);
   } else
      GetProfileString(WX_SECTION, eHOSTNAME, default_host, buf, maxSize - 1);
   } else

-    strncpy(buf, sysname, maxSize - 1);
-  buf[maxSize] = '\0';
+    wxStrncpy(buf, sysname, maxSize - 1);
+  buf[maxSize] = _T('\0');

   return *buf ? TRUE : FALSE;
 #endif
 }
 
 // Get user ID e.g. jacs
   return *buf ? TRUE : FALSE;
 #endif
 }
 
 // Get user ID e.g. jacs

-bool wxGetUserId(char *buf, int maxSize)
+bool wxGetUserId(wxChar *buf, int maxSize)

 {
 {

-#if defined(__WIN32__) && !defined(__win32s__)
-
-    // VZ: why should it be so complicated??
-#if 0
-  // Gets the current user's full name according to the MS article PSS ID
-  // Number: Q119670
-  // Seems to be the same as the login name for me?
-  char *UserName = new char[256];
-  char *Domain = new char[256];
-  DWORD maxCharacters = 255;
-  GetUserName( UserName, &maxCharacters );
-  GetComputerName( Domain, &maxCharacters );
-
-  WCHAR  wszUserName[256];           // Unicode user name
-  WCHAR  wszDomain[256];
-  LPBYTE ComputerName;
-
-  struct _SERVER_INFO_100 *si100;   // Server structure
-  struct _USER_INFO_2 *ui;          // User structure
-
-  // Convert ASCII user name and domain to Unicode.
-
-  MultiByteToWideChar( CP_ACP, 0, UserName,
-     strlen(UserName)+1, wszUserName, sizeof(wszUserName) );
-  MultiByteToWideChar( CP_ACP, 0, Domain,
-     strlen(Domain)+1, wszDomain, sizeof(wszDomain) );
-
-  // Get the computer name of a DC for the specified domain.
-  // >If you get a link error on this, include netapi32.lib<
-
-  NetGetDCName( NULL, wszDomain, &ComputerName );
-
-  // Look up the user on the DC.
-
-  if(NetUserGetInfo( (LPWSTR) ComputerName,
-     (LPWSTR) &wszUserName, 2, (LPBYTE *) &ui))
-  {
-     printf( "Error getting user information.\n" );
-     return( FALSE );
-  }
-
-  // Convert the Unicode full name to ASCII.
-
-  WideCharToMultiByte( CP_ACP, 0, ui->usri2_full_name,
-     -1, buf, 256, NULL, NULL );
-  }
-  return( TRUE );
-#else   // 1
+#if defined(__WIN32__) && !defined(__win32s__) && !defined(__TWIN32__)

     DWORD nSize = maxSize;
     if ( ::GetUserName(buf, &nSize) == 0 )
     {
     DWORD nSize = maxSize;
     if ( ::GetUserName(buf, &nSize) == 0 )
     {

-        wxLogSysError("Can not get user name");
-
-        return FALSE;
+        // actually, it does happen on Win9x if the user didn't log on
+        DWORD res = ::GetEnvironmentVariable("username", buf, maxSize);
+        if ( res == 0 )
+        {
+            // not found
+            return FALSE;
+        }

     }
 
     return TRUE;
     }
 
     return TRUE;

-#endif  // 0/1
-

 #else   // Win16 or Win32s
 #else   // Win16 or Win32s

-  char *user;
-  const char *default_id = "anonymous";
+  wxChar *user;
+  const wxChar *default_id = _T("anonymous");

 
   // Can't assume we have NIS (PC-NFS) or some other ID daemon
   // So we ...
 
   // Can't assume we have NIS (PC-NFS) or some other ID daemon
   // So we ...

-  if (  (user = getenv("USER")) == NULL &&
-  (user = getenv("LOGNAME")) == NULL ) {
+  if (  (user = wxGetenv(_T("USER"))) == NULL &&
+        (user = wxGetenv(_T("LOGNAME"))) == NULL )
+  {

      // Use wxWindows configuration data (comming soon)
      GetProfileString(WX_SECTION, eUSERID, default_id, buf, maxSize - 1);
      // Use wxWindows configuration data (comming soon)
      GetProfileString(WX_SECTION, eUSERID, default_id, buf, maxSize - 1);

-  } else
-    strncpy(buf, user, maxSize - 1);
+  }
+  else
+  {
+    wxStrncpy(buf, user, maxSize - 1);
+  }
+

   return *buf ? TRUE : FALSE;
 #endif
 }
 
 // Get user name e.g. Julian Smart
   return *buf ? TRUE : FALSE;
 #endif
 }
 
 // Get user name e.g. Julian Smart

-bool wxGetUserName(char *buf, int maxSize)
+bool wxGetUserName(wxChar *buf, int maxSize)

 {
 #if wxUSE_PENWINDOWS && !defined(__WATCOMC__) && !defined(__GNUWIN32__)
   extern HANDLE g_hPenWin; // PenWindows Running?
 {
 #if wxUSE_PENWINDOWS && !defined(__WATCOMC__) && !defined(__GNUWIN32__)
   extern HANDLE g_hPenWin; // PenWindows Running?


@@ -244,9 +201,76 @@ bool wxGetUserName(char *buf, int maxSize)
   else
 #endif
   {
   else
 #endif
   {

+#ifdef USE_NET_API
+    CHAR szUserName[256];
+    if ( !wxGetUserId(szUserName, WXSIZEOF(szUserName)) )
+        return FALSE;
+
+    // TODO how to get the domain name?
+    CHAR *szDomain = "";
+
+    // the code is based on the MSDN example (also see KB article Q119670)
+    WCHAR wszUserName[256];          // Unicode user name
+    WCHAR wszDomain[256];
+    LPBYTE ComputerName;
+
+    USER_INFO_2 *ui2;         // User structure
+
+    // Convert ANSI user name and domain to Unicode
+    MultiByteToWideChar( CP_ACP, 0, szUserName, strlen(szUserName)+1,
+                          wszUserName, WXSIZEOF(wszUserName) );
+    MultiByteToWideChar( CP_ACP, 0, szDomain, strlen(szDomain)+1,
+                         wszDomain, WXSIZEOF(wszDomain) );
+
+    // Get the computer name of a DC for the domain.
+    if ( NetGetDCName( NULL, wszDomain, &ComputerName ) != NERR_Success )
+    {
+        wxLogError(_T("Can not find domain controller"));
+
+        goto error;
+    }
+
+    // Look up the user on the DC
+    NET_API_STATUS status = NetUserGetInfo( (LPWSTR)ComputerName,
+                                            (LPWSTR)&wszUserName,
+                                            2, // level - we want USER_INFO_2
+                                            (LPBYTE *) &ui2 );
+    switch ( status )
+    {
+        case NERR_Success:
+            // ok
+            break;
+
+        case NERR_InvalidComputer:
+            wxLogError(_T("Invalid domain controller name."));
+
+            goto error;
+
+        case NERR_UserNotFound:
+            wxLogError(_T("Invalid user name '%s'."), szUserName);
+
+            goto error;
+
+        default:
+            wxLogSysError(_T("Can't get information about user"));
+
+            goto error;
+    }
+
+    // Convert the Unicode full name to ANSI
+    WideCharToMultiByte( CP_ACP, 0, ui2->usri2_full_name, -1,
+                         buf, maxSize, NULL, NULL );
+
+    return TRUE;
+
+error:
+  wxLogError(_T("Couldn't look up full user name."));
+
+  return FALSE;
+#else  // !USE_NET_API

     // Could use NIS, MS-Mail or other site specific programs
     // Use wxWindows configuration data
     // Could use NIS, MS-Mail or other site specific programs
     // Use wxWindows configuration data

-    bool ok = GetProfileString(WX_SECTION, eUSERNAME, "", buf, maxSize - 1) != 0;
+    bool ok = GetProfileString(WX_SECTION, eUSERNAME, _T(""), buf, maxSize - 1) != 0;

     if ( !ok )
     {
         ok = wxGetUserId(buf, maxSize);
     if ( !ok )
     {
         ok = wxGetUserId(buf, maxSize);


@@ -254,8 +278,9 @@ bool wxGetUserName(char *buf, int maxSize)
 
     if ( !ok )
     {
 
     if ( !ok )
     {

-        strncpy(buf, "Unknown User", maxSize);
+        wxStrncpy(buf, _T("Unknown User"), maxSize);

     }
     }

+#endif // Win32/16

   }
 
   return TRUE;
   }
 
   return TRUE;


@@ -272,23 +297,23 @@ int wxKill(long pid, int sig)
 bool
 wxShell(const wxString& command)
 {
 bool
 wxShell(const wxString& command)
 {

-  char *shell;
-  if ((shell = getenv("COMSPEC")) == NULL)
-    shell = "\\COMMAND.COM";
+  wxChar *shell;
+  if ((shell = wxGetenv(_T("COMSPEC"))) == NULL)
+    shell = _T("\\COMMAND.COM");

 
 

-  char tmp[255];
-  if (command != "")
-    sprintf(tmp, "%s /c %s", shell, WXSTRINGCAST command);
+  wxChar tmp[255];
+  if (command != _T(""))
+    wxSprintf(tmp, _T("%s /c %s"), shell, WXSTRINGCAST command);

   else
   else

-    strcpy(tmp, shell);
+    wxStrcpy(tmp, shell);

 
 

-  return (wxExecute((char *)tmp, FALSE) != 0);
+  return (wxExecute((wxChar *)tmp, FALSE) != 0);

 }
 
 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)
 }
 
 // Get free memory in bytes, or -1 if cannot determine amount (e.g. on UNIX)

-long wxGetFreeMemory(void)
+long wxGetFreeMemory()

 {
 {

-#if defined(__WIN32__) && !defined(__BORLANDC__)
+#if defined(__WIN32__) && !defined(__BORLANDC__) && !defined(__TWIN32__)

   MEMORYSTATUS memStatus;
   memStatus.dwLength = sizeof(MEMORYSTATUS);
   GlobalMemoryStatus(&memStatus);
   MEMORYSTATUS memStatus;
   memStatus.dwLength = sizeof(MEMORYSTATUS);
   GlobalMemoryStatus(&memStatus);


@@ -303,7 +328,7 @@ static bool inTimer = FALSE;
 class wxSleepTimer: public wxTimer
 {
  public:
 class wxSleepTimer: public wxTimer
 {
  public:

-  inline void Notify(void)
+  inline void Notify()

   {
     inTimer = FALSE;
     Stop();
   {
     inTimer = FALSE;
     Stop();


@@ -312,6 +337,27 @@ class wxSleepTimer: public wxTimer
 
 static wxTimer *wxTheSleepTimer = NULL;
 
 
 static wxTimer *wxTheSleepTimer = NULL;
 

+void wxUsleep(unsigned long milliseconds)
+{
+#ifdef __WIN32__
+    ::Sleep(milliseconds);
+#else
+  if (inTimer)
+    return;
+
+  wxTheSleepTimer = new wxSleepTimer;
+  inTimer = TRUE;
+  wxTheSleepTimer->Start(milliseconds);
+  while (inTimer)
+  {
+    if (wxTheApp->Pending())
+      wxTheApp->Dispatch();
+  }
+  delete wxTheSleepTimer;
+  wxTheSleepTimer = NULL;
+#endif
+}
+

 void wxSleep(int nSecs)
 {
 #if 0 // WIN32 hangs app
 void wxSleep(int nSecs)
 {
 #if 0 // WIN32 hangs app


@@ -334,16 +380,16 @@ void wxSleep(int nSecs)
 }
 
 // Consume all events until no more left
 }
 
 // Consume all events until no more left

-void wxFlushEvents(void)
+void wxFlushEvents()

 {
 //  wxYield();
 }
 
 // Output a debug mess., in a system dependent fashion.
 {
 //  wxYield();
 }
 
 // Output a debug mess., in a system dependent fashion.

-void wxDebugMsg(const char *fmt ...)
+void wxDebugMsg(const wxChar *fmt ...)

 {
   va_list ap;
 {
   va_list ap;

-  static char buffer[512];
+  static wxChar buffer[512];

 
   if (!wxTheApp->GetWantDebugOutput())
     return ;
 
   if (!wxTheApp->GetWantDebugOutput())
     return ;


@@ -351,7 +397,7 @@ void wxDebugMsg(const char *fmt ...)
   va_start(ap, fmt);
 
   wvsprintf(buffer,fmt,ap) ;
   va_start(ap, fmt);
 
   wvsprintf(buffer,fmt,ap) ;

-  OutputDebugString((LPCSTR)buffer) ;
+  OutputDebugString((LPCTSTR)buffer) ;

 
   va_end(ap);
 }
 
   va_end(ap);
 }


@@ -359,8 +405,8 @@ void wxDebugMsg(const char *fmt ...)
 // Non-fatal error: pop up message box and (possibly) continue
 void wxError(const wxString& msg, const wxString& title)
 {
 // Non-fatal error: pop up message box and (possibly) continue
 void wxError(const wxString& msg, const wxString& title)
 {

-  sprintf(wxBuffer, "%s\nContinue?", WXSTRINGCAST msg);
-  if (MessageBox(NULL, (LPCSTR)wxBuffer, (LPCSTR)WXSTRINGCAST title,
+  wxSprintf(wxBuffer, _T("%s\nContinue?"), WXSTRINGCAST msg);
+  if (MessageBox(NULL, (LPCTSTR)wxBuffer, (LPCTSTR)WXSTRINGCAST title,

              MB_ICONSTOP | MB_YESNO) == IDNO)
     wxExit();
 }
              MB_ICONSTOP | MB_YESNO) == IDNO)
     wxExit();
 }


@@ -368,12 +414,12 @@ void wxError(const wxString& msg, const wxString& title)
 // Fatal error: pop up message box and abort
 void wxFatalError(const wxString& msg, const wxString& title)
 {
 // Fatal error: pop up message box and abort
 void wxFatalError(const wxString& msg, const wxString& title)
 {

-  sprintf(wxBuffer, "%s: %s", WXSTRINGCAST title, WXSTRINGCAST msg);
-  FatalAppExit(0, (LPCSTR)wxBuffer);
+  wxSprintf(wxBuffer, _T("%s: %s"), WXSTRINGCAST title, WXSTRINGCAST msg);
+  FatalAppExit(0, (LPCTSTR)wxBuffer);

 }
 
 // Emit a beeeeeep
 }
 
 // Emit a beeeeeep

-void wxBell(void)
+void wxBell()

 {
     // Removed by RD because IHMO syncronous sound is a Bad Thing.  MessageBeep
     // will do a similar thing anyway if there is no sound card...
 {
     // Removed by RD because IHMO syncronous sound is a Bad Thing.  MessageBeep
     // will do a similar thing anyway if there is no sound card...


@@ -436,48 +482,48 @@ int wxGetOsVersion(int *majorVsn, int *minorVsn)
 #if wxUSE_RESOURCES
 bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)
 {
 #if wxUSE_RESOURCES
 bool wxWriteResource(const wxString& section, const wxString& entry, const wxString& value, const wxString& file)
 {

-  if (file != "")
-    return (WritePrivateProfileString((LPCSTR)WXSTRINGCAST section, (LPCSTR)WXSTRINGCAST entry, (LPCSTR)value, (LPCSTR)WXSTRINGCAST file) != 0);
+  if (file != _T(""))
+    return (WritePrivateProfileString((LPCTSTR)WXSTRINGCAST section, (LPCTSTR)WXSTRINGCAST entry, (LPCTSTR)value, (LPCTSTR)WXSTRINGCAST file) != 0);

   else
   else

-    return (WriteProfileString((LPCSTR)WXSTRINGCAST section, (LPCSTR)WXSTRINGCAST entry, (LPCSTR)WXSTRINGCAST value) != 0);
+    return (WriteProfileString((LPCTSTR)WXSTRINGCAST section, (LPCTSTR)WXSTRINGCAST entry, (LPCTSTR)WXSTRINGCAST value) != 0);

 }
 
 bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file)
 {
 }
 
 bool wxWriteResource(const wxString& section, const wxString& entry, float value, const wxString& file)
 {

-  char buf[50];
-  sprintf(buf, "%.4f", value);
+  wxChar buf[50];
+  wxSprintf(buf, _T("%.4f"), value);

   return wxWriteResource(section, entry, buf, file);
 }
 
 bool wxWriteResource(const wxString& section, const wxString& entry, long value, const wxString& file)
 {
   return wxWriteResource(section, entry, buf, file);
 }
 
 bool wxWriteResource(const wxString& section, const wxString& entry, long value, const wxString& file)
 {

-  char buf[50];
-  sprintf(buf, "%ld", value);
+  wxChar buf[50];
+  wxSprintf(buf, _T("%ld"), value);

   return wxWriteResource(section, entry, buf, file);
 }
 
 bool wxWriteResource(const wxString& section, const wxString& entry, int value, const wxString& file)
 {
   return wxWriteResource(section, entry, buf, file);
 }
 
 bool wxWriteResource(const wxString& section, const wxString& entry, int value, const wxString& file)
 {

-  char buf[50];
-  sprintf(buf, "%d", value);
+  wxChar buf[50];
+  wxSprintf(buf, _T("%d"), value);

   return wxWriteResource(section, entry, buf, file);
 }
 
   return wxWriteResource(section, entry, buf, file);
 }
 

-bool wxGetResource(const wxString& section, const wxString& entry, char **value, const wxString& file)
+bool wxGetResource(const wxString& section, const wxString& entry, wxChar **value, const wxString& file)

 {
 {

-  static const char defunkt[] = "$$default";
-  if (file != "")
+  static const wxChar defunkt[] = _T("$$default");
+  if (file != _T(""))

   {
   {

-    int n = GetPrivateProfileString((LPCSTR)WXSTRINGCAST section, (LPCSTR)WXSTRINGCAST entry, (LPCSTR)defunkt,
-                                    (LPSTR)wxBuffer, 1000, (LPCSTR)WXSTRINGCAST file);
-    if (n == 0 || strcmp(wxBuffer, defunkt) == 0)
+    int n = GetPrivateProfileString((LPCTSTR)WXSTRINGCAST section, (LPCTSTR)WXSTRINGCAST entry, (LPCTSTR)defunkt,
+                                    (LPTSTR)wxBuffer, 1000, (LPCTSTR)WXSTRINGCAST file);
+    if (n == 0 || wxStrcmp(wxBuffer, defunkt) == 0)

      return FALSE;
   }
   else
   {
      return FALSE;
   }
   else
   {

-    int n = GetProfileString((LPCSTR)WXSTRINGCAST section, (LPCSTR)WXSTRINGCAST entry, (LPCSTR)defunkt,
-                                    (LPSTR)wxBuffer, 1000);
-    if (n == 0 || strcmp(wxBuffer, defunkt) == 0)
+    int n = GetProfileString((LPCTSTR)WXSTRINGCAST section, (LPCTSTR)WXSTRINGCAST entry, (LPCTSTR)defunkt,
+                                    (LPTSTR)wxBuffer, 1000);
+    if (n == 0 || wxStrcmp(wxBuffer, defunkt) == 0)

       return FALSE;
   }
   if (*value) delete[] (*value);
       return FALSE;
   }
   if (*value) delete[] (*value);


@@ -487,11 +533,11 @@ bool wxGetResource(const wxString& section, const wxString& entry, char **value,
 
 bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file)
 {
 
 bool wxGetResource(const wxString& section, const wxString& entry, float *value, const wxString& file)
 {

-  char *s = NULL;
-  bool succ = wxGetResource(section, entry, (char **)&s, file);
+  wxChar *s = NULL;
+  bool succ = wxGetResource(section, entry, (wxChar **)&s, file);

   if (succ)
   {
   if (succ)
   {

-    *value = (float)strtod(s, NULL);
+    *value = (float)wxStrtod(s, NULL);

     delete[] s;
     return TRUE;
   }
     delete[] s;
     return TRUE;
   }


@@ -500,11 +546,11 @@ bool wxGetResource(const wxString& section, const wxString& entry, float *value,
 
 bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file)
 {
 
 bool wxGetResource(const wxString& section, const wxString& entry, long *value, const wxString& file)
 {

-  char *s = NULL;
-  bool succ = wxGetResource(section, entry, (char **)&s, file);
+  wxChar *s = NULL;
+  bool succ = wxGetResource(section, entry, (wxChar **)&s, file);

   if (succ)
   {
   if (succ)
   {

-    *value = strtol(s, NULL, 10);
+    *value = wxStrtol(s, NULL, 10);

     delete[] s;
     return TRUE;
   }
     delete[] s;
     return TRUE;
   }


@@ -513,11 +559,11 @@ bool wxGetResource(const wxString& section, const wxString& entry, long *value,
 
 bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file)
 {
 
 bool wxGetResource(const wxString& section, const wxString& entry, int *value, const wxString& file)
 {

-  char *s = NULL;
-  bool succ = wxGetResource(section, entry, (char **)&s, file);
+  wxChar *s = NULL;
+  bool succ = wxGetResource(section, entry, (wxChar **)&s, file);

   if (succ)
   {
   if (succ)
   {

-    *value = (int)strtol(s, NULL, 10);
+    *value = (int)wxStrtol(s, NULL, 10);

     delete[] s;
     return TRUE;
   }
     delete[] s;
     return TRUE;
   }


@@ -525,67 +571,69 @@ bool wxGetResource(const wxString& section, const wxString& entry, int *value, c
 }
 #endif // wxUSE_RESOURCES
 
 }
 #endif // wxUSE_RESOURCES
 

-// Old cursor
-static HCURSOR wxBusyCursorOld = 0;
-static int wxBusyCursorCount = 0;
+// ---------------------------------------------------------------------------
+// helper functions for showing a "busy" cursor
+// ---------------------------------------------------------------------------
+
+HCURSOR gs_wxBusyCursor = 0;     // new, busy cursor
+HCURSOR gs_wxBusyCursorOld = 0;  // old cursor
+static int gs_wxBusyCursorCount = 0;

 
 // Set the cursor to the busy cursor for all windows
 void wxBeginBusyCursor(wxCursor *cursor)
 {
 
 // Set the cursor to the busy cursor for all windows
 void wxBeginBusyCursor(wxCursor *cursor)
 {

-  wxBusyCursorCount ++;
-  if (wxBusyCursorCount == 1)
-  {
-    wxBusyCursorOld = ::SetCursor((HCURSOR) cursor->GetHCURSOR());
-  }
-  else
-  {
-    (void)::SetCursor((HCURSOR) cursor->GetHCURSOR());
-  }
+    if ( gs_wxBusyCursorCount++ == 0 )
+    {
+        gs_wxBusyCursor = (HCURSOR)cursor->GetHCURSOR();
+        gs_wxBusyCursorOld = ::SetCursor(gs_wxBusyCursor);
+    }
+    //else: nothing to do, already set

 }
 
 // Restore cursor to normal
 }
 
 // Restore cursor to normal

-void wxEndBusyCursor(void)
+void wxEndBusyCursor()

 {
 {

-  if (wxBusyCursorCount == 0)
-    return;
+    wxCHECK_RET( gs_wxBusyCursorCount > 0,
+                 _T("no matching wxBeginBusyCursor() for wxEndBusyCursor()") );

 
 

-  wxBusyCursorCount --;
-  if (wxBusyCursorCount == 0)
-  {
-    ::SetCursor(wxBusyCursorOld);
-    wxBusyCursorOld = 0;
-  }
+    if ( --gs_wxBusyCursorCount == 0 )
+    {
+        ::SetCursor(gs_wxBusyCursorOld);
+
+        gs_wxBusyCursorOld = 0;
+    }

 }
 
 // TRUE if we're between the above two calls
 }
 
 // TRUE if we're between the above two calls

-bool wxIsBusy(void)
+bool wxIsBusy()

 {
 {

-  return (wxBusyCursorCount > 0);
+  return (gs_wxBusyCursorCount > 0);

 }
 
 }
 

-const char* wxGetHomeDir(wxString *pstr)
+// ---------------------------------------------------------------------------
+const wxChar* wxGetHomeDir(wxString *pstr)

 {
   wxString& strDir = *pstr;
 
 {
   wxString& strDir = *pstr;
 

-  #ifdef __UNIX__
-    const char *szHome = getenv("HOME");
+  #if defined(__UNIX__) && !defined(__TWIN32__)
+    const wxChar *szHome = wxGetenv("HOME");

     if ( szHome == NULL ) {
       // we're homeless...
       wxLogWarning(_("can't find user's HOME, using current directory."));
     if ( szHome == NULL ) {
       // we're homeless...
       wxLogWarning(_("can't find user's HOME, using current directory."));

-      strDir = ".";
+      strDir = _T(".");

     }
     else
        strDir = szHome;
 
     // add a trailing slash if needed
     }
     else
        strDir = szHome;
 
     // add a trailing slash if needed

-    if ( strDir.Last() != '/' )
-      strDir << '/';
+    if ( strDir.Last() != _T('/') )
+      strDir << _T('/');

   #else   // Windows
     #ifdef  __WIN32__
   #else   // Windows
     #ifdef  __WIN32__

-      const char *szHome = getenv("HOMEDRIVE");
+      const wxChar *szHome = wxGetenv(_T("HOMEDRIVE"));

       if ( szHome != NULL )
         strDir << szHome;
       if ( szHome != NULL )
         strDir << szHome;

-      szHome = getenv("HOMEPATH");
+      szHome = wxGetenv(_T("HOMEPATH"));

       if ( szHome != NULL ) {
         strDir << szHome;
 
       if ( szHome != NULL ) {
         strDir << szHome;
 


@@ -595,7 +643,7 @@ const char* wxGetHomeDir(wxString *pstr)
         // create it in our program's dir. However, if the user took care
         // to set HOMEPATH to something other than "\\", we suppose that he
         // knows what he is doing and use the supplied value.
         // create it in our program's dir. However, if the user took care
         // to set HOMEPATH to something other than "\\", we suppose that he
         // knows what he is doing and use the supplied value.

-        if ( strcmp(szHome, "\\") != 0 )
+        if ( wxStrcmp(szHome, _T("\\")) != 0 )

           return strDir.c_str();
       }
 
           return strDir.c_str();
       }
 


@@ -622,29 +670,29 @@ const char* wxGetHomeDir(wxString *pstr)
 }
 
 // Hack for MS-DOS
 }
 
 // Hack for MS-DOS

-char *wxGetUserHome (const wxString& user)
+wxChar *wxGetUserHome (const wxString& user)

 {
 {

-  char *home;
+  wxChar *home;

   wxString user1(user);
 
   wxString user1(user);
 

-  if (user1 != "") {
-    char tmp[64];
+  if (user1 != _T("")) {
+    wxChar tmp[64];

     if (wxGetUserId(tmp, sizeof(tmp)/sizeof(char))) {
       // Guests belong in the temp dir
     if (wxGetUserId(tmp, sizeof(tmp)/sizeof(char))) {
       // Guests belong in the temp dir

-      if (Stricmp(tmp, "annonymous") == 0) {
-        if ((home = getenv("TMP")) != NULL ||
-            (home = getenv("TMPDIR")) != NULL ||
-            (home = getenv("TEMP")) != NULL)
-            return *home ? home : "\\";
+      if (wxStricmp(tmp, _T("annonymous")) == 0) {
+        if ((home = wxGetenv(_T("TMP"))) != NULL ||
+            (home = wxGetenv(_T("TMPDIR"))) != NULL ||
+            (home = wxGetenv(_T("TEMP"))) != NULL)
+            return *home ? home : (wxChar*)_T("\\");

       }
       }

-      if (Stricmp(tmp, WXSTRINGCAST user1) == 0)
-        user1 = "";
+      if (wxStricmp(tmp, WXSTRINGCAST user1) == 0)
+        user1 = _T("");

     }
   }
     }
   }

-  if (user1 == "")
-    if ((home = getenv("HOME")) != NULL)
+  if (user1 == _T(""))
+    if ((home = wxGetenv(_T("HOME"))) != NULL)

     {
     {

-      strcpy(wxBuffer, home);
+      wxStrcpy(wxBuffer, home);

       Unix2DosFilename(wxBuffer);
       return wxBuffer;
     }
       Unix2DosFilename(wxBuffer);
       return wxBuffer;
     }


@@ -665,7 +713,8 @@ bool wxCheckForInterrupt(wxWindow *wnd)
     return TRUE;//*** temporary?
   }
   else{
     return TRUE;//*** temporary?
   }
   else{

-    wxError("wnd==NULL !!!");
+    wxFAIL_MSG(_T("wnd==NULL !!!"));
+

     return FALSE;//*** temporary?
   }
 }
     return FALSE;//*** temporary?
   }
 }


@@ -674,10 +723,10 @@ bool wxCheckForInterrupt(wxWindow *wnd)
 // Returns NULL or newly-allocated memory, so use delete[] to clean up.
 
 #ifdef __WXMSW__
 // Returns NULL or newly-allocated memory, so use delete[] to clean up.
 
 #ifdef __WXMSW__

-char *wxLoadUserResource(const wxString& resourceName, const wxString& resourceType)
+wxChar *wxLoadUserResource(const wxString& resourceName, const wxString& resourceType)

 {
 {

-  char *s = NULL;
-#ifndef __WIN32__
+  wxChar *s = NULL;
+#if !defined(__WIN32__) || defined(__TWIN32__)

   HRSRC hResource = ::FindResource(wxGetInstance(), WXSTRINGCAST resourceName, WXSTRINGCAST resourceType);
 #else
 #ifdef UNICODE
   HRSRC hResource = ::FindResource(wxGetInstance(), WXSTRINGCAST resourceName, WXSTRINGCAST resourceType);
 #else
 #ifdef UNICODE


@@ -692,7 +741,7 @@ char *wxLoadUserResource(const wxString& resourceName, const wxString& resourceT
   HGLOBAL hData = ::LoadResource(wxGetInstance(), hResource);
   if (hData == 0)
     return NULL;
   HGLOBAL hData = ::LoadResource(wxGetInstance(), hResource);
   if (hData == 0)
     return NULL;

-  char *theText = (char *)LockResource(hData);
+  wxChar *theText = (wxChar *)LockResource(hData);

   if (!theText)
     return NULL;
 
   if (!theText)
     return NULL;
 


@@ -719,36 +768,36 @@ void wxGetMousePosition( int* x, int* y )
 };
 
 // Return TRUE if we have a colour display
 };
 
 // Return TRUE if we have a colour display

-bool wxColourDisplay(void)
+bool wxColourDisplay()

 {
 {

-  HDC dc = ::GetDC(NULL);
+  HDC dc = ::GetDC((HWND) NULL);

   bool flag;
   int noCols = GetDeviceCaps(dc, NUMCOLORS);
   if ((noCols == -1) || (noCols > 2))
     flag = TRUE;
   else
     flag = FALSE;
   bool flag;
   int noCols = GetDeviceCaps(dc, NUMCOLORS);
   if ((noCols == -1) || (noCols > 2))
     flag = TRUE;
   else
     flag = FALSE;

-  ReleaseDC(NULL, dc);
+  ReleaseDC((HWND) NULL, dc);

   return flag;
 }
 
 // Returns depth of screen
   return flag;
 }
 
 // Returns depth of screen

-int wxDisplayDepth(void)
+int wxDisplayDepth()

 {
 {

-  HDC dc = ::GetDC(NULL);
+  HDC dc = ::GetDC((HWND) NULL);

   int planes = GetDeviceCaps(dc, PLANES);
   int bitsPerPixel = GetDeviceCaps(dc, BITSPIXEL);
   int depth = planes*bitsPerPixel;
   int planes = GetDeviceCaps(dc, PLANES);
   int bitsPerPixel = GetDeviceCaps(dc, BITSPIXEL);
   int depth = planes*bitsPerPixel;

-  ReleaseDC(NULL, dc);
+  ReleaseDC((HWND) NULL, dc);

   return depth;
 }
 
 // Get size of display
 void wxDisplaySize(int *width, int *height)
 {
   return depth;
 }
 
 // Get size of display
 void wxDisplaySize(int *width, int *height)
 {

-  HDC dc = ::GetDC(NULL);
+  HDC dc = ::GetDC((HWND) NULL);

   *width = GetDeviceCaps(dc, HORZRES); *height = GetDeviceCaps(dc, VERTRES);
   *width = GetDeviceCaps(dc, HORZRES); *height = GetDeviceCaps(dc, VERTRES);

-  ReleaseDC(NULL, dc);
+  ReleaseDC((HWND) NULL, dc);

 }
 
 bool wxDirExists(const wxString& dir)
 }
 
 bool wxDirExists(const wxString& dir)


@@ -765,14 +814,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


@@ -785,6 +834,10 @@ bool wxDirExists(const wxString& dir)
 #endif
 }
 
 #endif
 }
 

+// ---------------------------------------------------------------------------
+// window information functions
+// ---------------------------------------------------------------------------
+

 wxString WXDLLEXPORT wxGetWindowText(WXHWND hWnd)
 {
     wxString str;
 wxString WXDLLEXPORT wxGetWindowText(WXHWND hWnd)
 {
     wxString str;


@@ -795,6 +848,58 @@ wxString WXDLLEXPORT wxGetWindowText(WXHWND hWnd)
     return str;
 }
 
     return str;
 }
 

+wxString WXDLLEXPORT wxGetWindowClass(WXHWND hWnd)
+{
+    wxString str;
+
+    int len = 256; // some starting value
+
+    for ( ;; )
+    {
+        // as we've #undefined GetClassName we must now manually choose the
+        // right function to call
+        int count =
+
+        #ifndef __WIN32__
+            GetClassName
+        #else // Win32
+            #ifdef UNICODE
+                GetClassNameW
+            #else // !Unicode
+                #ifdef __TWIN32__
+                    GetClassName
+                #else // !Twin32
+                    GetClassNameA
+                #endif // Twin32/!Twin32
+            #endif // Unicode/ANSI
+        #endif // Win16/32
+                                    ((HWND)hWnd, str.GetWriteBuf(len), len);
+
+        str.UngetWriteBuf();
+        if ( count == len )
+        {
+            // the class name might have been truncated, retry with larger
+            // buffer
+            len *= 2;
+        }
+        else
+        {
+            break;
+        }
+    }
+
+    return str;
+}
+
+WXWORD WXDLLEXPORT wxGetWindowId(WXHWND hWnd)
+{
+#ifndef __WIN32__
+    return GetWindowWord((HWND)hWnd, GWW_ID);
+#else // Win32
+    return GetWindowLong((HWND)hWnd, GWL_ID);
+#endif // Win16/32
+}
+

 #if 0
 //------------------------------------------------------------------------
 // wild character routines
 #if 0
 //------------------------------------------------------------------------
 // wild character routines


@@ -805,13 +910,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;
 };


@@ -831,124 +936,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'));
 };
 


@@ -982,22 +1087,22 @@ To download dbwin32, see e.g.:
 http://ftp.digital.com/pub/micro/NT/WinSite/programr/dbwin32.zip
 */
 
 http://ftp.digital.com/pub/micro/NT/WinSite/programr/dbwin32.zip
 */
 

-#if !defined(__MWERKS__) && !defined(__SALFORDC__)
+#if !defined(__MWERKS__) && !defined(__SALFORDC__) && !defined(__TWIN32__)

 #include <process.h>
 #endif
 
 #include <process.h>
 #endif
 

-void OutputDebugStringW95(const char* lpOutputString, ...)
+void OutputDebugStringW95(const wxChar* lpOutputString, ...)

 {
     HANDLE heventDBWIN;  /* DBWIN32 synchronization object */
     HANDLE heventData;   /* data passing synch object */
     HANDLE hSharedFile;  /* memory mapped file shared data */
     LPSTR lpszSharedMem;
 {
     HANDLE heventDBWIN;  /* DBWIN32 synchronization object */
     HANDLE heventData;   /* data passing synch object */
     HANDLE hSharedFile;  /* memory mapped file shared data */
     LPSTR lpszSharedMem;

-    char achBuffer[500];
+    wxChar achBuffer[500];

 
     /* create the output buffer */
     va_list args;
     va_start(args, lpOutputString);
 
     /* create the output buffer */
     va_list args;
     va_start(args, lpOutputString);

-    vsprintf(achBuffer, lpOutputString, args);
+    wxVsprintf(achBuffer, lpOutputString, args);

     va_end(args);
 
     /*
     va_end(args);
 
     /*


@@ -1009,8 +1114,12 @@ void OutputDebugStringW95(const char* lpOutputString, ...)
     */
 #ifdef _UNICODE
     ::OutputDebugStringW(achBuffer);
     */
 #ifdef _UNICODE
     ::OutputDebugStringW(achBuffer);

+#else
+#ifdef __TWIN32__
+    ::OutputDebugString(achBuffer);

 #else
     ::OutputDebugStringA(achBuffer);
 #else
     ::OutputDebugStringA(achBuffer);

+#endif

 #endif
 
     /* bail if it's not Win95 */
 #endif
 
     /* bail if it's not Win95 */


@@ -1023,26 +1132,26 @@ void OutputDebugStringW95(const char* lpOutputString, ...)
     }
 
     /* make sure DBWIN is open and waiting */
     }
 
     /* make sure DBWIN is open and waiting */

-    heventDBWIN = OpenEvent(EVENT_MODIFY_STATE, FALSE, "DBWIN_BUFFER_READY");
+    heventDBWIN = OpenEvent(EVENT_MODIFY_STATE, FALSE, _T("DBWIN_BUFFER_READY"));

     if ( !heventDBWIN )
     {
     if ( !heventDBWIN )
     {

-        //MessageBox(NULL, "DBWIN_BUFFER_READY nonexistent", NULL, MB_OK);
+        //MessageBox(NULL, _T("DBWIN_BUFFER_READY nonexistent"), NULL, MB_OK);

         return;
     }
 
     /* get a handle to the data synch object */
         return;
     }
 
     /* get a handle to the data synch object */

-    heventData = OpenEvent(EVENT_MODIFY_STATE, FALSE, "DBWIN_DATA_READY");
+    heventData = OpenEvent(EVENT_MODIFY_STATE, FALSE, _T("DBWIN_DATA_READY"));

     if ( !heventData )
     {
     if ( !heventData )
     {

-        // MessageBox(NULL, "DBWIN_DATA_READY nonexistent", NULL, MB_OK);
+        // MessageBox(NULL, _T("DBWIN_DATA_READY nonexistent"), NULL, MB_OK);

         CloseHandle(heventDBWIN);
         return;
     }
 
         CloseHandle(heventDBWIN);
         return;
     }
 

-    hSharedFile = CreateFileMapping((HANDLE)-1, NULL, PAGE_READWRITE, 0, 4096, "DBWIN_BUFFER");
+    hSharedFile = CreateFileMapping((HANDLE)-1, NULL, PAGE_READWRITE, 0, 4096, _T("DBWIN_BUFFER"));

     if (!hSharedFile)
     {
     if (!hSharedFile)
     {

-        //MessageBox(NULL, "DebugTrace: Unable to create file mapping object DBWIN_BUFFER", "Error", MB_OK);
+        //MessageBox(NULL, _T("DebugTrace: Unable to create file mapping object DBWIN_BUFFER"), _T("Error"), MB_OK);

         CloseHandle(heventDBWIN);
         CloseHandle(heventData);
         return;
         CloseHandle(heventDBWIN);
         CloseHandle(heventData);
         return;


@@ -1051,7 +1160,7 @@ void OutputDebugStringW95(const char* lpOutputString, ...)
     lpszSharedMem = (LPSTR)MapViewOfFile(hSharedFile, FILE_MAP_WRITE, 0, 0, 512);
     if (!lpszSharedMem)
     {
     lpszSharedMem = (LPSTR)MapViewOfFile(hSharedFile, FILE_MAP_WRITE, 0, 0, 512);
     if (!lpszSharedMem)
     {

-        //MessageBox(NULL, "DebugTrace: Unable to map shared memory", "Error", MB_OK);
+        //MessageBox(NULL, _T("DebugTrace: Unable to map shared memory"), _T("Error"), MB_OK);

         CloseHandle(heventDBWIN);
         CloseHandle(heventData);
         return;
         CloseHandle(heventDBWIN);
         CloseHandle(heventData);
         return;


@@ -1067,7 +1176,7 @@ void OutputDebugStringW95(const char* lpOutputString, ...)
     *((LPDWORD)lpszSharedMem) = _getpid();
 #endif
 
     *((LPDWORD)lpszSharedMem) = _getpid();
 #endif
 

-    wsprintf(lpszSharedMem + sizeof(DWORD), "%s", achBuffer);
+    wsprintf((LPTSTR)(lpszSharedMem + sizeof(DWORD)), _T("%s"), achBuffer);

 
     /* signal data ready event */
     SetEvent(heventData);
 
     /* signal data ready event */
     SetEvent(heventData);


@@ -1084,14 +1193,14 @@ void OutputDebugStringW95(const char* lpOutputString, ...)
 #endif
 
 
 #endif
 
 

-#ifdef wxUSE_VC_CRTDBG
+#if 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()


@@ -1105,10 +1214,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


@@ -1134,13 +1243,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