#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#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 <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
#if defined(__GNUWIN32__) && !defined(__TWIN32__)
-#include <sys/unistd.h>
-#include <sys/stat.h>
+ #include <sys/unistd.h>
+ #include <sys/stat.h>
#endif //GNUWIN32
#include "wx/log.h"
#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
-#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 <stdarg.h>
//// BEGIN for console support: VC++ only
+#ifdef __VISUALC__
#include "wx/msw/msvcrt.h"
# define new new(__FILE__,__LINE__)
# endif
+#endif
+ // __VISUALC__
/// 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[] = wxT("wxWindows");
+static const wxChar eHOSTNAME[] = wxT("HostName");
+static const wxChar eUSERID[] = wxT("UserId");
+static const wxChar eUSERNAME[] = wxT("UserName");
// For the following functions we SHOULD fill in support
// for Windows-NT (which I don't know) as I assume it begin
// 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)
{
#if defined(__WIN32__) && !defined(__TWIN32__)
DWORD nSize = maxSize;
return (::GetComputerName(buf, &nSize) != 0);
#else
- char *sysname;
- const char *default_host = "noname";
+ wxChar *sysname;
+ const wxChar *default_host = wxT("noname");
- if ((sysname = getenv("SYSTEM_NAME")) == NULL) {
+ if ((sysname = wxGetenv(wxT("SYSTEM_NAME"))) == NULL) {
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] = wxT('\0');
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__) && !defined(__TWIN32__)
-
- // 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
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(wxT("username"), buf, maxSize);
+ if ( res == 0 )
+ {
+ // not found
+ return FALSE;
+ }
}
return TRUE;
-#endif // 0/1
-
#else // Win16 or Win32s
- char *user;
- const char *default_id = "anonymous";
+ wxChar *user;
+ const wxChar *default_id = wxT("anonymous");
// 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(wxT("USER"))) == NULL &&
+ (user = wxGetenv(wxT("LOGNAME"))) == NULL )
+ {
// 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
-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?
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(wxT("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(wxT("Invalid domain controller name."));
+
+ goto error;
+
+ case NERR_UserNotFound:
+ wxLogError(wxT("Invalid user name '%s'."), szUserName);
+
+ goto error;
+
+ default:
+ wxLogSysError(wxT("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(wxT("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
- bool ok = GetProfileString(WX_SECTION, eUSERNAME, "", buf, maxSize - 1) != 0;
+ bool ok = GetProfileString(WX_SECTION, eUSERNAME, wxT(""), buf, maxSize - 1) != 0;
if ( !ok )
{
ok = wxGetUserId(buf, maxSize);
if ( !ok )
{
- strncpy(buf, "Unknown User", maxSize);
+ wxStrncpy(buf, wxT("Unknown User"), maxSize);
}
+#endif // Win32/16
}
return TRUE;
bool
wxShell(const wxString& command)
{
- char *shell;
- if ((shell = getenv("COMSPEC")) == NULL)
- shell = "\\COMMAND.COM";
+ wxChar *shell;
+ if ((shell = wxGetenv(wxT("COMSPEC"))) == NULL)
+ shell = wxT("\\COMMAND.COM");
- char tmp[255];
- if (command != "")
- sprintf(tmp, "%s /c %s", shell, WXSTRINGCAST command);
+ wxChar tmp[255];
+ if (command != wxT(""))
+ wxSprintf(tmp, wxT("%s /c %s"), shell, WXSTRINGCAST command);
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)
-long wxGetFreeMemory(void)
+long wxGetFreeMemory()
{
#if defined(__WIN32__) && !defined(__BORLANDC__) && !defined(__TWIN32__)
MEMORYSTATUS memStatus;
class wxSleepTimer: public wxTimer
{
public:
- inline void Notify(void)
+ inline void Notify()
{
inTimer = FALSE;
Stop();
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
}
// Consume all events until no more left
-void wxFlushEvents(void)
+void wxFlushEvents()
{
// wxYield();
}
// Output a debug mess., in a system dependent fashion.
-void wxDebugMsg(const char *fmt ...)
+void wxDebugMsg(const wxChar *fmt ...)
{
va_list ap;
- static char buffer[512];
+ static wxChar buffer[512];
if (!wxTheApp->GetWantDebugOutput())
return ;
va_start(ap, fmt);
wvsprintf(buffer,fmt,ap) ;
- OutputDebugString((LPCSTR)buffer) ;
+ OutputDebugString((LPCTSTR)buffer) ;
va_end(ap);
}
// 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, wxT("%s\nContinue?"), WXSTRINGCAST msg);
+ if (MessageBox(NULL, (LPCTSTR)wxBuffer, (LPCTSTR)WXSTRINGCAST title,
MB_ICONSTOP | MB_YESNO) == IDNO)
wxExit();
}
// 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, wxT("%s: %s"), WXSTRINGCAST title, WXSTRINGCAST msg);
+ FatalAppExit(0, (LPCTSTR)wxBuffer);
}
// 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...
// detect WindowsNT correctly
int wxGetOsVersion(int *majorVsn, int *minorVsn)
{
- extern char *wxOsVersion;
if (majorVsn) *majorVsn = 0;
if (minorVsn) *minorVsn = 0;
#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 != wxT(""))
+ return (WritePrivateProfileString((LPCTSTR)WXSTRINGCAST section, (LPCTSTR)WXSTRINGCAST entry, (LPCTSTR)value, (LPCTSTR)WXSTRINGCAST file) != 0);
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)
{
- char buf[50];
- sprintf(buf, "%.4f", value);
+ wxChar buf[50];
+ wxSprintf(buf, wxT("%.4f"), value);
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, wxT("%ld"), value);
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, wxT("%d"), value);
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[] = wxT("$$default");
+ if (file != wxT(""))
{
- 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
{
- 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);
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)
{
- *value = (float)strtod(s, NULL);
+ *value = (float)wxStrtod(s, NULL);
delete[] s;
return TRUE;
}
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)
{
- *value = strtol(s, NULL, 10);
+ *value = wxStrtol(s, NULL, 10);
delete[] s;
return TRUE;
}
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)
{
- *value = (int)strtol(s, NULL, 10);
+ *value = (int)wxStrtol(s, NULL, 10);
delete[] s;
return TRUE;
}
}
#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)
{
- 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
-void wxEndBusyCursor(void)
+void wxEndBusyCursor()
{
- if (wxBusyCursorCount == 0)
- return;
+ wxCHECK_RET( gs_wxBusyCursorCount > 0,
+ wxT("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
-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;
#if defined(__UNIX__) && !defined(__TWIN32__)
- const char *szHome = getenv("HOME");
+ const wxChar *szHome = wxGetenv("HOME");
if ( szHome == NULL ) {
// we're homeless...
wxLogWarning(_("can't find user's HOME, using current directory."));
- strDir = ".";
+ strDir = wxT(".");
}
else
strDir = szHome;
// add a trailing slash if needed
- if ( strDir.Last() != '/' )
- strDir << '/';
+ if ( strDir.Last() != wxT('/') )
+ strDir << wxT('/');
#else // Windows
#ifdef __WIN32__
- const char *szHome = getenv("HOMEDRIVE");
+ const wxChar *szHome = wxGetenv(wxT("HOMEDRIVE"));
if ( szHome != NULL )
strDir << szHome;
- szHome = getenv("HOMEPATH");
+ szHome = wxGetenv(wxT("HOMEPATH"));
if ( szHome != NULL ) {
strDir << szHome;
// 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, wxT("\\")) != 0 )
return strDir.c_str();
}
}
// Hack for MS-DOS
-char *wxGetUserHome (const wxString& user)
+wxChar *wxGetUserHome (const wxString& user)
{
- char *home;
+ wxChar *home;
wxString user1(user);
- if (user1 != "") {
- char tmp[64];
+ if (user1 != wxT("")) {
+ wxChar tmp[64];
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, wxT("annonymous")) == 0) {
+ if ((home = wxGetenv(wxT("TMP"))) != NULL ||
+ (home = wxGetenv(wxT("TMPDIR"))) != NULL ||
+ (home = wxGetenv(wxT("TEMP"))) != NULL)
+ return *home ? home : (wxChar*)wxT("\\");
}
- if (Stricmp(tmp, WXSTRINGCAST user1) == 0)
- user1 = "";
+ if (wxStricmp(tmp, WXSTRINGCAST user1) == 0)
+ user1 = wxT("");
}
}
- if (user1 == "")
- if ((home = getenv("HOME")) != NULL)
+ if (user1 == wxT(""))
+ if ((home = wxGetenv(wxT("HOME"))) != NULL)
{
- strcpy(wxBuffer, home);
+ wxStrcpy(wxBuffer, home);
Unix2DosFilename(wxBuffer);
return wxBuffer;
}
return TRUE;//*** temporary?
}
else{
- wxError("wnd==NULL !!!");
+ wxFAIL_MSG(wxT("wnd==NULL !!!"));
+
return FALSE;//*** temporary?
}
}
// 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;
+ wxChar *s = NULL;
#if !defined(__WIN32__) || defined(__TWIN32__)
HRSRC hResource = ::FindResource(wxGetInstance(), WXSTRINGCAST resourceName, WXSTRINGCAST resourceType);
#else
HGLOBAL hData = ::LoadResource(wxGetInstance(), hResource);
if (hData == 0)
return NULL;
- char *theText = (char *)LockResource(hData);
+ wxChar *theText = (wxChar *)LockResource(hData);
if (!theText)
return NULL;
};
// Return TRUE if we have a colour display
-bool wxColourDisplay(void)
+bool wxColourDisplay()
{
HDC dc = ::GetDC((HWND) NULL);
bool flag;
}
// Returns depth of screen
-int wxDisplayDepth(void)
+int wxDisplayDepth()
{
HDC dc = ::GetDC((HWND) NULL);
int planes = GetDeviceCaps(dc, PLANES);
#endif
}
+// ---------------------------------------------------------------------------
+// window information functions
+// ---------------------------------------------------------------------------
+
wxString WXDLLEXPORT wxGetWindowText(WXHWND hWnd)
{
wxString 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
#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;
- char achBuffer[500];
+ wxChar achBuffer[500];
/* create the output buffer */
va_list args;
va_start(args, lpOutputString);
- vsprintf(achBuffer, lpOutputString, args);
+ wxVsprintf(achBuffer, lpOutputString, args);
va_end(args);
/*
}
/* make sure DBWIN is open and waiting */
- heventDBWIN = OpenEvent(EVENT_MODIFY_STATE, FALSE, "DBWIN_BUFFER_READY");
+ heventDBWIN = OpenEvent(EVENT_MODIFY_STATE, FALSE, wxT("DBWIN_BUFFER_READY"));
if ( !heventDBWIN )
{
- //MessageBox(NULL, "DBWIN_BUFFER_READY nonexistent", NULL, MB_OK);
+ //MessageBox(NULL, wxT("DBWIN_BUFFER_READY nonexistent"), NULL, MB_OK);
return;
}
/* get a handle to the data synch object */
- heventData = OpenEvent(EVENT_MODIFY_STATE, FALSE, "DBWIN_DATA_READY");
+ heventData = OpenEvent(EVENT_MODIFY_STATE, FALSE, wxT("DBWIN_DATA_READY"));
if ( !heventData )
{
- // MessageBox(NULL, "DBWIN_DATA_READY nonexistent", NULL, MB_OK);
+ // MessageBox(NULL, wxT("DBWIN_DATA_READY nonexistent"), NULL, MB_OK);
CloseHandle(heventDBWIN);
return;
}
- hSharedFile = CreateFileMapping((HANDLE)-1, NULL, PAGE_READWRITE, 0, 4096, "DBWIN_BUFFER");
+ hSharedFile = CreateFileMapping((HANDLE)-1, NULL, PAGE_READWRITE, 0, 4096, wxT("DBWIN_BUFFER"));
if (!hSharedFile)
{
- //MessageBox(NULL, "DebugTrace: Unable to create file mapping object DBWIN_BUFFER", "Error", MB_OK);
+ //MessageBox(NULL, wxT("DebugTrace: Unable to create file mapping object DBWIN_BUFFER"), wxT("Error"), MB_OK);
CloseHandle(heventDBWIN);
CloseHandle(heventData);
return;
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, wxT("DebugTrace: Unable to map shared memory"), wxT("Error"), MB_OK);
CloseHandle(heventDBWIN);
CloseHandle(heventData);
return;
*((LPDWORD)lpszSharedMem) = _getpid();
#endif
- wsprintf(lpszSharedMem + sizeof(DWORD), "%s", achBuffer);
+ wsprintf((LPTSTR)(lpszSharedMem + sizeof(DWORD)), wxT("%s"), achBuffer);
/* signal data ready event */
SetEvent(heventData);
#endif
-#ifdef 0
+#if 0
// maximum mumber of lines the output console should have
static const WORD MAX_CONSOLE_LINES = 500;
projects / wxWidgets.git / blobdiff