using on all OSX variants

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

diff --git a/src/msw/snglinst.cpp b/src/msw/snglinst.cpp
index 465365814d25e47dabea9d822f548fcf9cb6e0c9..1e5d08ef79e5210ca08b707b10c79abce8709470 100644 (file)
--- a/src/msw/snglinst.cpp
+++ b/src/msw/snglinst.cpp
@@ -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,10 +52,10 @@ 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;
         }


@@ -73,7 +69,7 @@ public:
     bool WasOpened() const
     {
         wxCHECK_MSG( m_hMutex, false,
     bool WasOpened() const
     {
         wxCHECK_MSG( m_hMutex, false,

-                     _T("can't be called if mutex creation failed") );
+                     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