Added wxToggleButton handler

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

diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index e56792a52de548ee510ab5aa077aa139fc0ee27b..9d83179e0aeade6a99b3c5ef4bdf0be620614d38 100644 (file)
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -119,14 +119,14 @@ static const wxChar eUSERNAME[]  = wxT("UserName");
 bool wxGetHostName(wxChar *buf, int maxSize)
 {
 #if defined(__WXWINCE__)
 bool wxGetHostName(wxChar *buf, int maxSize)
 {
 #if defined(__WXWINCE__)

-    return FALSE;
+    return false;

 #elif defined(__WIN32__) && !defined(__WXMICROWIN__)
     DWORD nSize = maxSize;
     if ( !::GetComputerName(buf, &nSize) )
     {
         wxLogLastError(wxT("GetComputerName"));
 
 #elif defined(__WIN32__) && !defined(__WXMICROWIN__)
     DWORD nSize = maxSize;
     if ( !::GetComputerName(buf, &nSize) )
     {
         wxLogLastError(wxT("GetComputerName"));
 

-        return FALSE;
+        return false;

     }
 
     return TRUE;
     }
 
     return TRUE;


@@ -231,7 +231,7 @@ bool wxGetFullHostName(wxChar *buf, int maxSize)
 bool wxGetUserId(wxChar *buf, int maxSize)
 {
 #if defined(__WXWINCE__)
 bool wxGetUserId(wxChar *buf, int maxSize)
 {
 #if defined(__WXWINCE__)

-    return FALSE;
+    return false;

 #elif defined(__WIN32__) && !defined(__WXMICROWIN__)
     DWORD nSize = maxSize;
     if ( ::GetUserName(buf, &nSize) == 0 )
 #elif defined(__WIN32__) && !defined(__WXMICROWIN__)
     DWORD nSize = maxSize;
     if ( ::GetUserName(buf, &nSize) == 0 )


@@ -255,7 +255,7 @@ bool wxGetUserId(wxChar *buf, int maxSize)
     if (  (user = wxGetenv(wxT("USER"))) == NULL &&
             (user = wxGetenv(wxT("LOGNAME"))) == NULL )
     {
     if (  (user = wxGetenv(wxT("USER"))) == NULL &&
             (user = wxGetenv(wxT("LOGNAME"))) == NULL )
     {

-        // Use wxWindows configuration data (comming soon)
+        // Use wxWidgets configuration data (comming soon)

         GetProfileString(WX_SECTION, eUSERID, default_id, buf, maxSize - 1);
     }
     else
         GetProfileString(WX_SECTION, eUSERID, default_id, buf, maxSize - 1);
     }
     else


@@ -271,11 +271,11 @@ bool wxGetUserId(wxChar *buf, int maxSize)
 bool wxGetUserName(wxChar *buf, int maxSize)
 {
 #if defined(__WXWINCE__)
 bool wxGetUserName(wxChar *buf, int maxSize)
 {
 #if defined(__WXWINCE__)

-    return FALSE;
+    return false;

 #elif defined(USE_NET_API)
     CHAR szUserName[256];
     if ( !wxGetUserId(szUserName, WXSIZEOF(szUserName)) )
 #elif defined(USE_NET_API)
     CHAR szUserName[256];
     if ( !wxGetUserId(szUserName, WXSIZEOF(szUserName)) )

-        return FALSE;
+        return false;

 
     // TODO how to get the domain name?
     CHAR *szDomain = "";
 
     // TODO how to get the domain name?
     CHAR *szDomain = "";


@@ -340,7 +340,7 @@ error:
     return FALSE;
 #else  // !USE_NET_API
     // Could use NIS, MS-Mail or other site specific programs
     return FALSE;
 #else  // !USE_NET_API
     // Could use NIS, MS-Mail or other site specific programs

-    // Use wxWindows configuration data
+    // Use wxWidgets configuration data

     bool ok = GetProfileString(WX_SECTION, eUSERNAME, wxEmptyString, buf, maxSize - 1) != 0;
     if ( !ok )
     {
     bool ok = GetProfileString(WX_SECTION, eUSERNAME, wxEmptyString, buf, maxSize - 1) != 0;
     if ( !ok )
     {


@@ -469,10 +469,10 @@ bool wxDirExists(const wxString& dir)
 bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 {
 #ifdef __WXWINCE__
 bool wxGetDiskSpace(const wxString& path, wxLongLong *pTotal, wxLongLong *pFree)
 {
 #ifdef __WXWINCE__

-    return FALSE;
+    return false;

 #else
     if ( path.empty() )
 #else
     if ( path.empty() )

-        return FALSE;
+        return false;

 
 // old w32api don't have ULARGE_INTEGER
 #if defined(__WIN32__) && \
 
 // old w32api don't have ULARGE_INTEGER
 #if defined(__WIN32__) && \


@@ -817,14 +817,15 @@ int wxKill(long pid, wxSignal sig, wxKillError *krc)
 // Execute a program in an Interactive Shell
 bool wxShell(const wxString& command)
 {
 // Execute a program in an Interactive Shell
 bool wxShell(const wxString& command)
 {

+    wxString cmd;
+

 #ifdef __WXWINCE__
 #ifdef __WXWINCE__

-    return FALSE;
+    cmd = command;

 #else
     wxChar *shell = wxGetenv(wxT("COMSPEC"));
     if ( !shell )
         shell = (wxChar*) wxT("\\COMMAND.COM");
 
 #else
     wxChar *shell = wxGetenv(wxT("COMSPEC"));
     if ( !shell )
         shell = (wxChar*) wxT("\\COMMAND.COM");
 

-    wxString cmd;

     if ( !command )
     {
         // just the shell
     if ( !command )
     {
         // just the shell


@@ -835,9 +836,9 @@ bool wxShell(const wxString& command)
         // pass the command to execute to the command processor
         cmd.Printf(wxT("%s /c %s"), shell, command.c_str());
     }
         // pass the command to execute to the command processor
         cmd.Printf(wxT("%s /c %s"), shell, command.c_str());
     }

+#endif

 
     return wxExecute(cmd, wxEXEC_SYNC) == 0;
 
     return wxExecute(cmd, wxEXEC_SYNC) == 0;

-#endif

 }
 
 // Shutdown or reboot the PC
 }
 
 // Shutdown or reboot the PC


@@ -1030,14 +1031,19 @@ wxToolkitInfo& wxAppTraits::GetToolkitInfo()
 // sleep functions
 // ----------------------------------------------------------------------------
 
 // sleep functions
 // ----------------------------------------------------------------------------
 

-void wxUsleep(unsigned long milliseconds)
+void wxMilliSleep(unsigned long milliseconds)

 {
     ::Sleep(milliseconds);
 }
 
 {
     ::Sleep(milliseconds);
 }
 

+void wxMicroSleep(unsigned long microseconds)
+{
+    wxMilliSleep(microseconds/1000);
+}
+

 void wxSleep(int nSecs)
 {
 void wxSleep(int nSecs)
 {

-    wxUsleep(1000*nSecs);
+    wxMilliSleep(1000*nSecs);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -1197,7 +1203,7 @@ extern long wxCharsetToCodepage(const wxChar *name)
   Creates a hidden window with supplied window proc registering the class for
   it if necesssary (i.e. the first time only). Caller is responsible for
   destroying the window and unregistering the class (note that this must be
   Creates a hidden window with supplied window proc registering the class for
   it if necesssary (i.e. the first time only). Caller is responsible for
   destroying the window and unregistering the class (note that this must be

-  done because wxWindows may be used as a DLL and so may be loaded/unloaded
+  done because wxWidgets may be used as a DLL and so may be loaded/unloaded

   multiple times into/from the same process so we cna't rely on automatic
   Windows class unregistration).
 
   multiple times into/from the same process so we cna't rely on automatic
   Windows class unregistration).