fix bug with wxCSConv("ASCII")

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

diff --git a/src/msw/snglinst.cpp b/src/msw/snglinst.cpp
index 0f9ba062766526045fd48a4250adf5f7b7751cc6..85b76977abfc4baed1d09835d009c829b77dd616 100644 (file)
--- a/src/msw/snglinst.cpp
+++ b/src/msw/snglinst.cpp
@@ -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 license
+// License:     wxWindows licence

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


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

-#ifdef __GNUG__
-    #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,23 +52,23 @@ 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 )
         {
             wxLogLastError(_T("CreateMutex"));
 
         if ( !m_hMutex )
         {
             wxLogLastError(_T("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,
+        wxCHECK_MSG( m_hMutex, false,

                      _T("can't be called if mutex creation failed") );
 
         return m_wasOpened;
                      _T("can't be called if mutex creation failed") );
 
         return m_wasOpened;


@@ -95,6 +91,8 @@ private:
 
     // the mutex handle, may be NULL
     HANDLE m_hMutex;
 
     // the mutex handle, may be NULL
     HANDLE m_hMutex;

+
+    DECLARE_NO_COPY_CLASS(wxSingleInstanceCheckerImpl)

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


@@ -102,7 +100,7 @@ private:
 // ============================================================================
 
 bool wxSingleInstanceChecker::Create(const wxString& name,
 // ============================================================================
 
 bool wxSingleInstanceChecker::Create(const wxString& name,

-                                     const wxString& path)
+                                     const wxString& WXUNUSED(path))

 {
     wxASSERT_MSG( !m_impl,
                   _T("calling wxSingleInstanceChecker::Create() twice?") );
 {
     wxASSERT_MSG( !m_impl,
                   _T("calling wxSingleInstanceChecker::Create() twice?") );


@@ -117,7 +115,7 @@ bool wxSingleInstanceChecker::Create(const wxString& name,
 
 bool wxSingleInstanceChecker::IsAnotherRunning() const
 {
 
 bool wxSingleInstanceChecker::IsAnotherRunning() const
 {

-    wxCHECK_MSG( m_impl, FALSE, _T("must call Create() first") );
+    wxCHECK_MSG( m_impl, false, _T("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