Compilation fix for !wxUSE_OWNER_DRAWN.

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

diff --git a/src/msw/snglinst.cpp b/src/msw/snglinst.cpp
index 0e71909e160980ee957436c2a64eb75b41a17d6a..9dd07ebeab1c46c5e1391f1ee91d375b220c325a 100644 (file)
--- a/src/msw/snglinst.cpp
+++ b/src/msw/snglinst.cpp
@@ -1,13 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        msw/snglinst.cpp
+// Name:        src/msw/snglinst.cpp
 // Purpose:     implements wxSingleInstanceChecker class for Win32 using
 //              named mutexes
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.06.01
-// RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWidgets licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -18,10 +17,6 @@
 // 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"
 
@@ -44,7 +39,7 @@
 // wxSingleInstanceCheckerImpl: the real implementation class
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxSingleInstanceCheckerImpl
+class WXDLLIMPEXP_BASE wxSingleInstanceCheckerImpl
 {
 public:
     wxSingleInstanceCheckerImpl()
@@ -56,24 +51,24 @@ public:
 
     bool Create(const wxString& name)
     {
-        m_hMutex = ::CreateMutex(NULL, FALSE, name);
+        m_hMutex = ::CreateMutex(NULL, FALSE, name.t_str());
         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;
 
-        return TRUE;
+        return true;
     }
 
     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;
     }
@@ -84,7 +79,7 @@ public:
         {
             if ( !::CloseHandle(m_hMutex) )
             {
-                wxLogLastError(_T("CloseHandle(mutex)"));
+                wxLogLastError(wxT("CloseHandle(mutex)"));
             }
         }
     }
@@ -96,7 +91,7 @@ private:
     // the mutex handle, may be NULL
     HANDLE m_hMutex;
 
-    DECLARE_NO_COPY_CLASS(wxSingleInstanceCheckerImpl)
+    wxDECLARE_NO_COPY_CLASS(wxSingleInstanceCheckerImpl);
 };
 
 // ============================================================================
@@ -107,19 +102,19 @@ bool wxSingleInstanceChecker::Create(const wxString& name,
                                      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!
-    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);
 }
 
-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