Use wxGetTranslation() instead of _() in the public headers.

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

diff --git a/include/wx/fswatcher.h b/include/wx/fswatcher.h
index cb31a78f53555f39298d5186403e043da9baf678..2955407864e9b3cadce4342f1c473550ac6a5dae 100644 (file)
--- a/include/wx/fswatcher.h
+++ b/include/wx/fswatcher.h
@@ -3,7 +3,6 @@
 // Purpose:     wxFileSystemWatcherBase
 // Author:      Bartosz Bekier
 // Created:     2009-05-23
 // Purpose:     wxFileSystemWatcherBase
 // Author:      Bartosz Bekier
 // Created:     2009-05-23

-// RCS-ID:      $Id$

 // Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -53,6 +52,9 @@ enum
                          wxFSW_EVENT_RENAME | wxFSW_EVENT_MODIFY |
                          wxFSW_EVENT_ACCESS | wxFSW_EVENT_ATTRIB |
                          wxFSW_EVENT_WARNING | wxFSW_EVENT_ERROR
                          wxFSW_EVENT_RENAME | wxFSW_EVENT_MODIFY |
                          wxFSW_EVENT_ACCESS | wxFSW_EVENT_ATTRIB |
                          wxFSW_EVENT_WARNING | wxFSW_EVENT_ERROR

+#ifdef wxHAS_INOTIFY
+    ,wxFSW_EVENT_UNMOUNT = 0x2000
+#endif

 };
 
 // Type of the path watched, used only internally for now.
 };
 
 // Type of the path watched, used only internally for now.


@@ -75,7 +77,7 @@ wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_BASE, wxEVT_FSWATCHER,
 class WXDLLIMPEXP_BASE wxFileSystemWatcherEvent: public wxEvent
 {
 public:
 class WXDLLIMPEXP_BASE wxFileSystemWatcherEvent: public wxEvent
 {
 public:

-    wxFileSystemWatcherEvent(int changeType, int watchid = wxID_ANY) :
+    wxFileSystemWatcherEvent(int changeType = 0, int watchid = wxID_ANY) :

         wxEvent(watchid, wxEVT_FSWATCHER),
         m_changeType(changeType)
     {
         wxEvent(watchid, wxEVT_FSWATCHER),
         m_changeType(changeType)
     {


@@ -149,7 +151,7 @@ public:
 
     virtual wxEventCategory GetEventCategory() const
     {
 
     virtual wxEventCategory GetEventCategory() const
     {

-        // TODO this has to be merged with "similiar" categories and changed
+        // TODO this has to be merged with "similar" categories and changed

         return wxEVT_CATEGORY_UNKNOWN;
     }
 
         return wxEVT_CATEGORY_UNKNOWN;
     }
 


@@ -176,6 +178,8 @@ protected:
     wxFileName m_path;
     wxFileName m_newPath;
     wxString m_errorMsg;
     wxFileName m_path;
     wxFileName m_newPath;
     wxString m_errorMsg;

+private:
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFileSystemWatcherEvent)

 };
 
 typedef void (wxEvtHandler::*wxFileSystemWatcherEventFunction)
 };
 
 typedef void (wxEvtHandler::*wxFileSystemWatcherEventFunction)