use WPARAM (which is 64 bit under Win64) for timer ids instead of long (which is...

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

diff --git a/include/wx/snglinst.h b/include/wx/snglinst.h
index 2bcce17a820da4ebb62962d9b43b6d19a8ce264f..a8f508aefbbecb32c2acb6693388b51462954c85 100644 (file)
--- a/include/wx/snglinst.h
+++ b/include/wx/snglinst.h
@@ -13,17 +13,13 @@
 #ifndef _WX_SNGLINST_H_
 #define _WX_SNGLINST_H_
 
 #ifndef _WX_SNGLINST_H_
 #define _WX_SNGLINST_H_
 

-#ifdef __GNUG__
-    #pragma interface "snglinst.h"
-#endif
-

 #if wxUSE_SNGLINST_CHECKER
 
 // ----------------------------------------------------------------------------
 // wxSingleInstanceChecker
 // ----------------------------------------------------------------------------
 
 #if wxUSE_SNGLINST_CHECKER
 
 // ----------------------------------------------------------------------------
 // wxSingleInstanceChecker
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxSingleInstanceChecker
+class WXDLLIMPEXP_BASE wxSingleInstanceChecker

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


@@ -44,7 +40,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 +55,9 @@ 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_FWD_BASE wxSingleInstanceCheckerImpl *m_impl;
+
+    wxDECLARE_NO_COPY_CLASS(wxSingleInstanceChecker);

 };
 
 #endif // wxUSE_SNGLINST_CHECKER
 };
 
 #endif // wxUSE_SNGLINST_CHECKER