Route data from wxDataViewModel in a wxVariant

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

diff --git a/include/wx/snglinst.h b/include/wx/snglinst.h
index 817e7d45fe67c7f8ad419e1cba28ec8ccad0d2f4..da34c90e5ae6954cbe39a859386a0d85c4a53f59 100644 (file)
--- a/include/wx/snglinst.h
+++ b/include/wx/snglinst.h
@@ -13,17 +13,13 @@
 #ifndef _WX_SNGLINST_H_
 #define _WX_SNGLINST_H_
 
-#ifdef __GNUG__
-    #pragma interface "snglinst.h"
-#endif
-
 #if wxUSE_SNGLINST_CHECKER
 
 // ----------------------------------------------------------------------------
 // wxSingleInstanceChecker
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxSingleInstanceChecker
+class WXDLLIMPEXP_BASE wxSingleInstanceChecker
 {
 public:
     // default ctor, use Create() after it
@@ -44,22 +40,13 @@ 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())
     //
-    // 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);
 
     // is another copy of this program already running?
     bool IsAnotherRunning() const;
-    
-#ifdef __WXMSW__
-    // Activates Previous Instance if a window whose Title contains the search string is found
-    bool ActivatePrevInstance(const wxString & sSearch);
-    
-    // Activates Previous Instance and passes CommandLine to wxCommandLineEvent
-    // if a window with matching Title is found
-    bool PassCommandLineToPrevInstance(const wxString & sSearch, const wxString & sCmdLine);
-#endif
-    
+
     // dtor is not virtual, this class is not meant to be used polymorphically
     ~wxSingleInstanceChecker();
 
@@ -68,7 +55,9 @@ private:
     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)
 };
 
 #endif // wxUSE_SNGLINST_CHECKER