applied part of patch 1169925: fix errors with multibyte <-> wx conversions

[wxWidgets.git] / include / wx / snglinst.h

diff --git a/include/wx/snglinst.h b/include/wx/snglinst.h
index 114b73b3d1afb911af18bbfc69d5839b14e99652..5c6f33fe1c2adaeb7b7b9a7cfe4e86d0088aaf0c 100644 (file)
--- a/include/wx/snglinst.h
+++ b/include/wx/snglinst.h
@@ -13,7 +13,7 @@
 #ifndef _WX_SNGLINST_H_
 #define _WX_SNGLINST_H_
 
 #ifndef _WX_SNGLINST_H_
 #define _WX_SNGLINST_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "snglinst.h"
 #endif
 
     #pragma interface "snglinst.h"
 #endif
 


@@ -23,7 +23,7 @@
 // wxSingleInstanceChecker
 // ----------------------------------------------------------------------------
 
 // wxSingleInstanceChecker
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxSingleInstanceChecker
+class WXDLLIMPEXP_BASE wxSingleInstanceChecker

 {
 public:
     // default ctor, use Create() after it
 {
 public:
     // default ctor, use Create() after it


@@ -44,7 +44,7 @@ public:
     // path is optional and is ignored under Win32 and used as the directory to
     // create the lock file in under Unix (default is wxGetHomeDir())
     //
     // path is optional and is ignored under Win32 and used as the directory to
     // create the lock file in under Unix (default is wxGetHomeDir())
     //

-    // returns FALSE if initialization failed, it doesn't mean that another
+    // returns false if initialization failed, it doesn't mean that another

     // instance is running - use IsAnotherRunning() to check it
     bool Create(const wxString& name, const wxString& path = wxEmptyString);
 
     // instance is running - use IsAnotherRunning() to check it
     bool Create(const wxString& name, const wxString& path = wxEmptyString);
 


@@ -59,7 +59,7 @@ private:
     void Init() { m_impl = NULL; }
 
     // the implementation details (platform specific)
     void Init() { m_impl = NULL; }
 
     // the implementation details (platform specific)

-    class WXDLLEXPORT wxSingleInstanceCheckerImpl *m_impl;
+    class WXDLLIMPEXP_BASE wxSingleInstanceCheckerImpl *m_impl;

 
     DECLARE_NO_COPY_CLASS(wxSingleInstanceChecker)
 };
 
     DECLARE_NO_COPY_CLASS(wxSingleInstanceChecker)
 };