Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge SOC2009_FSWATCHER branch into trunk.

Browse Source 
Merges everything from the branch with only some minor changes, mostly renamed
wxUSE_FSWATCHER_{INOTIFY,KQUEUE} to wxHAS_{INOTIFY,KQUEUE}.

Add wxFileSystemWatcher and related classes.

Also introduces wxEventLoopSource.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-10-22 11:35:43 +00:00
parent 40152925d5
commit 6b8ef0b35d
75 changed files with 69755 additions and 60720 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build/bakefiles/files.bkl
View File

@@ -70,6 +70,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/unix/timerunx.cpp
src/unix/threadpsx.cpp
src/unix/utilsunx.cpp
src/unix/fswatcher_kqueue.cpp
</set>
<set var="BASE_UNIX_AND_DARWIN_HDR" hints="files">
@@ -82,6 +83,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/unix/stdpaths.h
wx/unix/stackwalk.h
wx/unix/tls.h
wx/unix/fswatcher_kqueue.h
</set>
<!--
@@ -108,9 +110,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
-->
<set var="BASE_UNIX_SRC" hints="files">
$(BASE_UNIX_AND_DARWIN_NOTWXMAC_SRC)
src/unix/fswatcher_inotify.cpp
</set>
<set var="BASE_UNIX_HDR" hints="files">
$(BASE_UNIX_AND_DARWIN_NOTWXMAC_HDR)
wx/unix/fswatcher_inotify.h
</set>
<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
@@ -134,6 +138,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/timer.cpp
src/msw/utils.cpp
src/msw/utilsexc.cpp
src/msw/fswatcher.cpp
</set>
<set var="BASE_AND_GUI_WIN32_SRC" hints="files">
src/msw/evtloop.cpp
@@ -165,6 +170,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/wrapcctl.h
wx/msw/wrapcdlg.h
wx/msw/wrapwin.h
wx/msw/fswatcher.h
</set>
<set var="BASE_WINCE_HDR" hints="files">
<if cond="TOOLKIT=='WINCE'">
@@ -384,6 +390,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/common/xtistrm.cpp
src/common/zipstrm.cpp
src/common/zstream.cpp
src/common/fswatchercmn.cpp
src/generic/fswatcherg.cpp
</set>
<set var="BASE_AND_GUI_CMN_SRC" hints="files">
src/common/event.cpp
@@ -535,6 +543,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/meta/if.h
wx/meta/int2type.h
wx/meta/movable.h
wx/fswatcher.h
wx/generic/fswatcher.h
</set>

28500
build/msw/makefile.bcc
View File

File diff suppressed because it is too large Load Diff

28832
build/msw/makefile.gcc
View File

File diff suppressed because it is too large Load Diff

29264
build/msw/makefile.vc
View File

File diff suppressed because it is too large Load Diff

29350
build/msw/makefile.wat
View File

File diff suppressed because it is too large Load Diff

32
build/msw/wx_base.dsp
View File

@@ -391,6 +391,10 @@ SOURCE=..\..\src\common\fs_mem.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\fswatchercmn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\hash.cpp
# End Source File
# Begin Source File
@@ -619,6 +623,10 @@ SOURCE=..\..\src\msw\evtloop.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\fswatcher.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\main.cpp
# End Source File
# Begin Source File
@@ -709,6 +717,14 @@ SOURCE=..\..\src\msw\version.rc
SOURCE=..\..\src\msw\volume.cpp
# End Source File
# End Group
# Begin Group "Generic Sources"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\generic\fswatcherg.cpp
# End Source File
# End Group
# Begin Group "Setup Headers"
# PROP Default_Filter ""
@@ -884,6 +900,10 @@ SOURCE=..\..\include\wx\msw\debughlp.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\fswatcher.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\gccpriv.h
# End Source File
# Begin Source File
@@ -1026,6 +1046,14 @@ SOURCE=..\..\include\wx\msw\wrapcdlg.h
SOURCE=..\..\include\wx\msw\wrapwin.h
# End Source File
# End Group
# Begin Group "Generic Headers"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\generic\fswatcher.h
# End Source File
# End Group
# Begin Group "wxHTML Headers"
# PROP Default_Filter ""
@@ -1251,6 +1279,10 @@ SOURCE=..\..\include\wx\fs_zip.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\fswatcher.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\hash.h
# End Source File
# Begin Source File

26
build/msw/wx_vc7_base.vcproj
View File

@@ -733,6 +733,9 @@
RelativePath="..\..\src\common\fs_mem.cpp">
</File>
<File
RelativePath="..\..\src\common\fswatchercmn.cpp">
</File>
<File
RelativePath="..\..\src\common\hash.cpp">
</File>
<File
@@ -905,6 +908,9 @@
RelativePath="..\..\src\msw\evtloop.cpp">
</File>
<File
RelativePath="..\..\src\msw\fswatcher.cpp">
</File>
<File
RelativePath="..\..\src\msw\main.cpp">
</File>
<File
@@ -963,6 +969,13 @@
</File>
</Filter>
<Filter
Name="Generic Sources"
UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}">
<File
RelativePath="..\..\src\generic\fswatcherg.cpp">
</File>
</Filter>
<Filter
Name="Setup Headers"
UniqueIdentifier="{63537534-1833-5C1F-8DBD-359A84F294C8}">
<File
@@ -1082,6 +1095,9 @@
RelativePath="..\..\include\wx\msw\debughlp.h">
</File>
<File
RelativePath="..\..\include\wx\msw\fswatcher.h">
</File>
<File
RelativePath="..\..\include\wx\msw\gccpriv.h">
</File>
<File
@@ -1200,6 +1216,13 @@
</File>
</Filter>
<Filter
Name="Generic Headers"
UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}">
<File
RelativePath="..\..\include\wx\generic\fswatcher.h">
</File>
</Filter>
<Filter
Name="wxHTML Headers"
UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}">
<File
@@ -1369,6 +1392,9 @@
RelativePath="..\..\include\wx\fs_zip.h">
</File>
<File
RelativePath="..\..\include\wx\fswatcher.h">
</File>
<File
RelativePath="..\..\include\wx\hash.h">
</File>
<File

34
build/msw/wx_vc8_base.vcproj
View File

@@ -1011,6 +1011,10 @@
>
</File>
<File
RelativePath="..\..\src\common\fswatchercmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\hash.cpp"
>
</File>
@@ -1240,6 +1244,10 @@
>
</File>
<File
RelativePath="..\..\src\msw\fswatcher.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\main.cpp"
>
</File>
@@ -1317,6 +1325,15 @@
</File>
</Filter>
<Filter
Name="Generic Sources"
UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}"
>
<File
RelativePath="..\..\src\generic\fswatcherg.cpp"
>
</File>
</Filter>
<Filter
Name="Setup Headers"
UniqueIdentifier="{63537534-1833-5C1F-8DBD-359A84F294C8}"
>
@@ -1470,6 +1487,10 @@
>
</File>
<File
RelativePath="..\..\include\wx\msw\fswatcher.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\gccpriv.h"
>
</File>
@@ -1619,6 +1640,15 @@
</File>
</Filter>
<Filter
Name="Generic Headers"
UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"
>
<File
RelativePath="..\..\include\wx\generic\fswatcher.h"
>
</File>
</Filter>
<Filter
Name="wxHTML Headers"
UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}"
>
@@ -1844,6 +1874,10 @@
>
</File>
<File
RelativePath="..\..\include\wx\fswatcher.h"
>
</File>
<File
RelativePath="..\..\include\wx\hash.h"
>
</File>

34
build/msw/wx_vc9_base.vcproj
View File

@@ -1007,6 +1007,10 @@
>
</File>
<File
RelativePath="..\..\src\common\fswatchercmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\hash.cpp"
>
</File>
@@ -1236,6 +1240,10 @@
>
</File>
<File
RelativePath="..\..\src\msw\fswatcher.cpp"
>
</File>
<File
RelativePath="..\..\src\msw\main.cpp"
>
</File>
@@ -1313,6 +1321,15 @@
</File>
</Filter>
<Filter
Name="Generic Sources"
UniqueIdentifier="{FEA0C02F-F300-53BA-B784-52A5086B8093}"
>
<File
RelativePath="..\..\src\generic\fswatcherg.cpp"
>
</File>
</Filter>
<Filter
Name="Setup Headers"
UniqueIdentifier="{63537534-1833-5C1F-8DBD-359A84F294C8}"
>
@@ -1466,6 +1483,10 @@
>
</File>
<File
RelativePath="..\..\include\wx\msw\fswatcher.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\gccpriv.h"
>
</File>
@@ -1615,6 +1636,15 @@
</File>
</Filter>
<Filter
Name="Generic Headers"
UniqueIdentifier="{61C63C83-EF8C-51CA-A418-51936E7FCD4A}"
>
<File
RelativePath="..\..\include\wx\generic\fswatcher.h"
>
</File>
</Filter>
<Filter
Name="wxHTML Headers"
UniqueIdentifier="{B4103426-A5DB-5CF0-A30E-BC9546513AAF}"
>
@@ -1840,6 +1870,10 @@
>
</File>
<File
RelativePath="..\..\include\wx\fswatcher.h"
>
</File>
<File
RelativePath="..\..\include\wx\hash.h"
>
</File>