missing commit

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

diff --git a/src/msw/snglinst.cpp b/src/msw/snglinst.cpp
index b3f621b44d269d339b3c0de41ed026d2f9e49f1e..1c81a9b398fcf05df20e8e7c3143cb13f522eede 100644 (file)
--- a/src/msw/snglinst.cpp
+++ b/src/msw/snglinst.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/snglinst.cpp
+// Name:        src/msw/snglinst.cpp

 // Purpose:     implements wxSingleInstanceChecker class for Win32 using
 //              named mutexes
 // Author:      Vadim Zeitlin
 // Purpose:     implements wxSingleInstanceChecker class for Win32 using
 //              named mutexes
 // Author:      Vadim Zeitlin


@@ -7,7 +7,7 @@
 // Created:     08.06.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     08.06.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

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

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -18,10 +18,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "snglinst.h"
-#endif
-

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


@@ -44,7 +40,7 @@
 // wxSingleInstanceCheckerImpl: the real implementation class
 // ----------------------------------------------------------------------------
 
 // wxSingleInstanceCheckerImpl: the real implementation class
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxSingleInstanceCheckerImpl
+class WXDLLIMPEXP_BASE wxSingleInstanceCheckerImpl

 {
 public:
     wxSingleInstanceCheckerImpl()
 {
 public:
     wxSingleInstanceCheckerImpl()


@@ -56,24 +52,24 @@ public:
 
     bool Create(const wxString& name)
     {
 
     bool Create(const wxString& name)
     {

-        m_hMutex = ::CreateMutex(NULL, FALSE, name);
+        m_hMutex = ::CreateMutex(NULL, FALSE, name.t_str());

         if ( !m_hMutex )
         {
         if ( !m_hMutex )
         {

-            wxLogLastError(_T("CreateMutex"));
+            wxLogLastError(wxT("CreateMutex"));

 
 

-            return FALSE;
+            return false;

         }
 
         // mutex was either created or opened - see what really happened
         m_wasOpened = ::GetLastError() == ERROR_ALREADY_EXISTS;
 
         }
 
         // mutex was either created or opened - see what really happened
         m_wasOpened = ::GetLastError() == ERROR_ALREADY_EXISTS;
 

-        return TRUE;
+        return true;

     }
 
     bool WasOpened() const
     {
     }
 
     bool WasOpened() const
     {

-        wxCHECK_MSG( m_hMutex, FALSE,
-                     _T("can't be called if mutex creation failed") );
+        wxCHECK_MSG( m_hMutex, false,
+                     wxT("can't be called if mutex creation failed") );

 
         return m_wasOpened;
     }
 
         return m_wasOpened;
     }


@@ -84,7 +80,7 @@ public:
         {
             if ( !::CloseHandle(m_hMutex) )
             {
         {
             if ( !::CloseHandle(m_hMutex) )
             {

-                wxLogLastError(_T("CloseHandle(mutex)"));
+                wxLogLastError(wxT("CloseHandle(mutex)"));

             }
         }
     }
             }
         }
     }


@@ -96,7 +92,7 @@ private:
     // the mutex handle, may be NULL
     HANDLE m_hMutex;
 
     // the mutex handle, may be NULL
     HANDLE m_hMutex;
 

-    DECLARE_NO_COPY_CLASS(wxSingleInstanceCheckerImpl)
+    wxDECLARE_NO_COPY_CLASS(wxSingleInstanceCheckerImpl);

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -107,19 +103,19 @@ bool wxSingleInstanceChecker::Create(const wxString& name,
                                      const wxString& WXUNUSED(path))
 {
     wxASSERT_MSG( !m_impl,
                                      const wxString& WXUNUSED(path))
 {
     wxASSERT_MSG( !m_impl,

-                  _T("calling wxSingleInstanceChecker::Create() twice?") );
+                  wxT("calling wxSingleInstanceChecker::Create() twice?") );

 
     // creating unnamed mutex doesn't have the same semantics!
 
     // creating unnamed mutex doesn't have the same semantics!

-    wxASSERT_MSG( !name.empty(), _T("mutex name can't be empty") );
+    wxASSERT_MSG( !name.empty(), wxT("mutex name can't be empty") );

 
     m_impl = new wxSingleInstanceCheckerImpl;
 
     return m_impl->Create(name);
 }
 
 
     m_impl = new wxSingleInstanceCheckerImpl;
 
     return m_impl->Create(name);
 }
 

-bool wxSingleInstanceChecker::IsAnotherRunning() const
+bool wxSingleInstanceChecker::DoIsAnotherRunning() const

 {
 {

-    wxCHECK_MSG( m_impl, FALSE, _T("must call Create() first") );
+    wxCHECK_MSG( m_impl, false, wxT("must call Create() first") );

 
     // if the mutex had been opened, another instance is running - otherwise we
     // would have created it
 
     // if the mutex had been opened, another instance is running - otherwise we
     // would have created it