use wxWindowIDRef to transparently implement auto-generated ids ref-counting (slightly modified patch 1835458)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-06 14:38:44 +00:00
parent 7d287e713f
commit cf2810aa39
34 changed files with 748 additions and 189 deletions
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -732,6 +732,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/common/validate.cpp
    src/common/valtext.cpp
    src/common/wincmn.cpp
+    src/common/windowid.cpp
    src/common/xpmdecod.cpp
    src/generic/busyinfo.cpp
    src/generic/buttonbar.cpp
@@ -852,6 +853,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/validate.h
    wx/valtext.h
    wx/window.h
+    wx/windowid.h
    wx/wupdlock.h

    wx/accel.h
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1666,6 +1666,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_validate.obj \
 	$(OBJS)\monodll_valtext.obj \
 	$(OBJS)\monodll_wincmn.obj \
+	$(OBJS)\monodll_windowid.obj \
 	$(OBJS)\monodll_xpmdecod.obj \
 	$(OBJS)\monodll_busyinfo.obj \
 	$(OBJS)\monodll_buttonbar.obj \
@@ -1896,6 +1897,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_validate.obj \
 	$(OBJS)\monodll_valtext.obj \
 	$(OBJS)\monodll_wincmn.obj \
+	$(OBJS)\monodll_windowid.obj \
 	$(OBJS)\monodll_xpmdecod.obj \
 	$(OBJS)\monodll_busyinfo.obj \
 	$(OBJS)\monodll_buttonbar.obj \
@@ -2307,6 +2309,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_validate.obj \
 	$(OBJS)\monolib_valtext.obj \
 	$(OBJS)\monolib_wincmn.obj \
+	$(OBJS)\monolib_windowid.obj \
 	$(OBJS)\monolib_xpmdecod.obj \
 	$(OBJS)\monolib_busyinfo.obj \
 	$(OBJS)\monolib_buttonbar.obj \
@@ -2537,6 +2540,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_validate.obj \
 	$(OBJS)\monolib_valtext.obj \
 	$(OBJS)\monolib_wincmn.obj \
+	$(OBJS)\monolib_windowid.obj \
 	$(OBJS)\monolib_xpmdecod.obj \
 	$(OBJS)\monolib_busyinfo.obj \
 	$(OBJS)\monolib_buttonbar.obj \
@@ -2863,6 +2867,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_validate.obj \
 	$(OBJS)\coredll_valtext.obj \
 	$(OBJS)\coredll_wincmn.obj \
+	$(OBJS)\coredll_windowid.obj \
 	$(OBJS)\coredll_xpmdecod.obj \
 	$(OBJS)\coredll_busyinfo.obj \
 	$(OBJS)\coredll_buttonbar.obj \
@@ -3093,6 +3098,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_validate.obj \
 	$(OBJS)\coredll_valtext.obj \
 	$(OBJS)\coredll_wincmn.obj \
+	$(OBJS)\coredll_windowid.obj \
 	$(OBJS)\coredll_xpmdecod.obj \
 	$(OBJS)\coredll_busyinfo.obj \
 	$(OBJS)\coredll_buttonbar.obj \
@@ -3325,6 +3331,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_validate.obj \
 	$(OBJS)\corelib_valtext.obj \
 	$(OBJS)\corelib_wincmn.obj \
+	$(OBJS)\corelib_windowid.obj \
 	$(OBJS)\corelib_xpmdecod.obj \
 	$(OBJS)\corelib_busyinfo.obj \
 	$(OBJS)\corelib_buttonbar.obj \
@@ -3555,6 +3562,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_validate.obj \
 	$(OBJS)\corelib_valtext.obj \
 	$(OBJS)\corelib_wincmn.obj \
+	$(OBJS)\corelib_windowid.obj \
 	$(OBJS)\corelib_xpmdecod.obj \
 	$(OBJS)\corelib_busyinfo.obj \
 	$(OBJS)\corelib_buttonbar.obj \
@@ -6963,6 +6971,11 @@ $(OBJS)\monodll_wincmn.obj: ..\..\src\common\wincmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_windowid.obj: ..\..\src\common\windowid.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -9061,6 +9074,11 @@ $(OBJS)\monolib_wincmn.obj: ..\..\src\common\wincmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_windowid.obj: ..\..\src\common\windowid.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -11216,6 +11234,11 @@ $(OBJS)\coredll_wincmn.obj: ..\..\src\common\wincmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_windowid.obj: ..\..\src\common\windowid.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -12522,6 +12545,11 @@ $(OBJS)\corelib_wincmn.obj: ..\..\src\common\wincmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_windowid.obj: ..\..\src\common\windowid.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1681,6 +1681,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_validate.o \
 	$(OBJS)\monodll_valtext.o \
 	$(OBJS)\monodll_wincmn.o \
+	$(OBJS)\monodll_windowid.o \
 	$(OBJS)\monodll_xpmdecod.o \
 	$(OBJS)\monodll_busyinfo.o \
 	$(OBJS)\monodll_buttonbar.o \
@@ -1913,6 +1914,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_validate.o \
 	$(OBJS)\monodll_valtext.o \
 	$(OBJS)\monodll_wincmn.o \
+	$(OBJS)\monodll_windowid.o \
 	$(OBJS)\monodll_xpmdecod.o \
 	$(OBJS)\monodll_busyinfo.o \
 	$(OBJS)\monodll_buttonbar.o \
@@ -2328,6 +2330,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_validate.o \
 	$(OBJS)\monolib_valtext.o \
 	$(OBJS)\monolib_wincmn.o \
+	$(OBJS)\monolib_windowid.o \
 	$(OBJS)\monolib_xpmdecod.o \
 	$(OBJS)\monolib_busyinfo.o \
 	$(OBJS)\monolib_buttonbar.o \
@@ -2560,6 +2563,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_validate.o \
 	$(OBJS)\monolib_valtext.o \
 	$(OBJS)\monolib_wincmn.o \
+	$(OBJS)\monolib_windowid.o \
 	$(OBJS)\monolib_xpmdecod.o \
 	$(OBJS)\monolib_busyinfo.o \
 	$(OBJS)\monolib_buttonbar.o \
@@ -2900,6 +2904,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_validate.o \
 	$(OBJS)\coredll_valtext.o \
 	$(OBJS)\coredll_wincmn.o \
+	$(OBJS)\coredll_windowid.o \
 	$(OBJS)\coredll_xpmdecod.o \
 	$(OBJS)\coredll_busyinfo.o \
 	$(OBJS)\coredll_buttonbar.o \
@@ -3132,6 +3137,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_validate.o \
 	$(OBJS)\coredll_valtext.o \
 	$(OBJS)\coredll_wincmn.o \
+	$(OBJS)\coredll_windowid.o \
 	$(OBJS)\coredll_xpmdecod.o \
 	$(OBJS)\coredll_busyinfo.o \
 	$(OBJS)\coredll_buttonbar.o \
@@ -3370,6 +3376,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_validate.o \
 	$(OBJS)\corelib_valtext.o \
 	$(OBJS)\corelib_wincmn.o \
+	$(OBJS)\corelib_windowid.o \
 	$(OBJS)\corelib_xpmdecod.o \
 	$(OBJS)\corelib_busyinfo.o \
 	$(OBJS)\corelib_buttonbar.o \
@@ -3602,6 +3609,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_validate.o \
 	$(OBJS)\corelib_valtext.o \
 	$(OBJS)\corelib_wincmn.o \
+	$(OBJS)\corelib_windowid.o \
 	$(OBJS)\corelib_xpmdecod.o \
 	$(OBJS)\corelib_busyinfo.o \
 	$(OBJS)\corelib_buttonbar.o \
@@ -7203,6 +7211,11 @@ $(OBJS)\monodll_wincmn.o: ../../src/common/wincmn.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif

+ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_windowid.o: ../../src/common/windowid.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_xpmdecod.o: ../../src/common/xpmdecod.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -9403,6 +9416,11 @@ $(OBJS)\monolib_wincmn.o: ../../src/common/wincmn.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif

+ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_windowid.o: ../../src/common/windowid.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_xpmdecod.o: ../../src/common/xpmdecod.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -11660,6 +11678,11 @@ $(OBJS)\coredll_wincmn.o: ../../src/common/wincmn.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif

+ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_windowid.o: ../../src/common/windowid.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_xpmdecod.o: ../../src/common/xpmdecod.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -13066,6 +13089,11 @@ $(OBJS)\corelib_wincmn.o: ../../src/common/wincmn.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif

+ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_windowid.o: ../../src/common/windowid.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_xpmdecod.o: ../../src/common/xpmdecod.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1840,6 +1840,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_validate.obj \
 	$(OBJS)\monodll_valtext.obj \
 	$(OBJS)\monodll_wincmn.obj \
+	$(OBJS)\monodll_windowid.obj \
 	$(OBJS)\monodll_xpmdecod.obj \
 	$(OBJS)\monodll_busyinfo.obj \
 	$(OBJS)\monodll_buttonbar.obj \
@@ -2070,6 +2071,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_validate.obj \
 	$(OBJS)\monodll_valtext.obj \
 	$(OBJS)\monodll_wincmn.obj \
+	$(OBJS)\monodll_windowid.obj \
 	$(OBJS)\monodll_xpmdecod.obj \
 	$(OBJS)\monodll_busyinfo.obj \
 	$(OBJS)\monodll_buttonbar.obj \
@@ -2487,6 +2489,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_validate.obj \
 	$(OBJS)\monolib_valtext.obj \
 	$(OBJS)\monolib_wincmn.obj \
+	$(OBJS)\monolib_windowid.obj \
 	$(OBJS)\monolib_xpmdecod.obj \
 	$(OBJS)\monolib_busyinfo.obj \
 	$(OBJS)\monolib_buttonbar.obj \
@@ -2717,6 +2720,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_validate.obj \
 	$(OBJS)\monolib_valtext.obj \
 	$(OBJS)\monolib_wincmn.obj \
+	$(OBJS)\monolib_windowid.obj \
 	$(OBJS)\monolib_xpmdecod.obj \
 	$(OBJS)\monolib_busyinfo.obj \
 	$(OBJS)\monolib_buttonbar.obj \
@@ -3073,6 +3077,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_validate.obj \
 	$(OBJS)\coredll_valtext.obj \
 	$(OBJS)\coredll_wincmn.obj \
+	$(OBJS)\coredll_windowid.obj \
 	$(OBJS)\coredll_xpmdecod.obj \
 	$(OBJS)\coredll_busyinfo.obj \
 	$(OBJS)\coredll_buttonbar.obj \
@@ -3303,6 +3308,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_validate.obj \
 	$(OBJS)\coredll_valtext.obj \
 	$(OBJS)\coredll_wincmn.obj \
+	$(OBJS)\coredll_windowid.obj \
 	$(OBJS)\coredll_xpmdecod.obj \
 	$(OBJS)\coredll_busyinfo.obj \
 	$(OBJS)\coredll_buttonbar.obj \
@@ -3541,6 +3547,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_validate.obj \
 	$(OBJS)\corelib_valtext.obj \
 	$(OBJS)\corelib_wincmn.obj \
+	$(OBJS)\corelib_windowid.obj \
 	$(OBJS)\corelib_xpmdecod.obj \
 	$(OBJS)\corelib_busyinfo.obj \
 	$(OBJS)\corelib_buttonbar.obj \
@@ -3771,6 +3778,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_validate.obj \
 	$(OBJS)\corelib_valtext.obj \
 	$(OBJS)\corelib_wincmn.obj \
+	$(OBJS)\corelib_windowid.obj \
 	$(OBJS)\corelib_xpmdecod.obj \
 	$(OBJS)\corelib_busyinfo.obj \
 	$(OBJS)\corelib_buttonbar.obj \
@@ -7295,6 +7303,11 @@ $(OBJS)\monodll_wincmn.obj: ..\..\src\common\wincmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_windowid.obj: ..\..\src\common\windowid.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -9393,6 +9406,11 @@ $(OBJS)\monolib_wincmn.obj: ..\..\src\common\wincmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_windowid.obj: ..\..\src\common\windowid.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -11548,6 +11566,11 @@ $(OBJS)\coredll_wincmn.obj: ..\..\src\common\wincmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_windowid.obj: ..\..\src\common\windowid.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
@@ -12854,6 +12877,11 @@ $(OBJS)\corelib_wincmn.obj: ..\..\src\common\wincmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !endif

+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_windowid.obj: ..\..\src\common\windowid.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -406,6 +406,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_validate.obj &
 	$(OBJS)\monodll_valtext.obj &
 	$(OBJS)\monodll_wincmn.obj &
+	$(OBJS)\monodll_windowid.obj &
 	$(OBJS)\monodll_xpmdecod.obj &
 	$(OBJS)\monodll_busyinfo.obj &
 	$(OBJS)\monodll_buttonbar.obj &
@@ -638,6 +639,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_validate.obj &
 	$(OBJS)\monodll_valtext.obj &
 	$(OBJS)\monodll_wincmn.obj &
+	$(OBJS)\monodll_windowid.obj &
 	$(OBJS)\monodll_xpmdecod.obj &
 	$(OBJS)\monodll_busyinfo.obj &
 	$(OBJS)\monodll_buttonbar.obj &
@@ -1058,6 +1060,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_validate.obj &
 	$(OBJS)\monolib_valtext.obj &
 	$(OBJS)\monolib_wincmn.obj &
+	$(OBJS)\monolib_windowid.obj &
 	$(OBJS)\monolib_xpmdecod.obj &
 	$(OBJS)\monolib_busyinfo.obj &
 	$(OBJS)\monolib_buttonbar.obj &
@@ -1290,6 +1293,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_validate.obj &
 	$(OBJS)\monolib_valtext.obj &
 	$(OBJS)\monolib_wincmn.obj &
+	$(OBJS)\monolib_windowid.obj &
 	$(OBJS)\monolib_xpmdecod.obj &
 	$(OBJS)\monolib_busyinfo.obj &
 	$(OBJS)\monolib_buttonbar.obj &
@@ -1641,6 +1645,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_validate.obj &
 	$(OBJS)\coredll_valtext.obj &
 	$(OBJS)\coredll_wincmn.obj &
+	$(OBJS)\coredll_windowid.obj &
 	$(OBJS)\coredll_xpmdecod.obj &
 	$(OBJS)\coredll_busyinfo.obj &
 	$(OBJS)\coredll_buttonbar.obj &
@@ -1873,6 +1878,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_validate.obj &
 	$(OBJS)\coredll_valtext.obj &
 	$(OBJS)\coredll_wincmn.obj &
+	$(OBJS)\coredll_windowid.obj &
 	$(OBJS)\coredll_xpmdecod.obj &
 	$(OBJS)\coredll_busyinfo.obj &
 	$(OBJS)\coredll_buttonbar.obj &
@@ -2113,6 +2119,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_validate.obj &
 	$(OBJS)\corelib_valtext.obj &
 	$(OBJS)\corelib_wincmn.obj &
+	$(OBJS)\corelib_windowid.obj &
 	$(OBJS)\corelib_xpmdecod.obj &
 	$(OBJS)\corelib_busyinfo.obj &
 	$(OBJS)\corelib_buttonbar.obj &
@@ -2345,6 +2352,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_validate.obj &
 	$(OBJS)\corelib_valtext.obj &
 	$(OBJS)\corelib_wincmn.obj &
+	$(OBJS)\corelib_windowid.obj &
 	$(OBJS)\corelib_xpmdecod.obj &
 	$(OBJS)\corelib_busyinfo.obj &
 	$(OBJS)\corelib_buttonbar.obj &
@@ -7437,6 +7445,11 @@ $(OBJS)\monodll_wincmn.obj :  .AUTODEPEND ..\..\src\common\wincmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif

+!ifeq USE_GUI 1
+$(OBJS)\monodll_windowid.obj :  .AUTODEPEND ..\..\src\common\windowid.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monodll_xpmdecod.obj :  .AUTODEPEND ..\..\src\common\xpmdecod.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -9637,6 +9650,11 @@ $(OBJS)\monolib_wincmn.obj :  .AUTODEPEND ..\..\src\common\wincmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif

+!ifeq USE_GUI 1
+$(OBJS)\monolib_windowid.obj :  .AUTODEPEND ..\..\src\common\windowid.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\monolib_xpmdecod.obj :  .AUTODEPEND ..\..\src\common\xpmdecod.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -11894,6 +11912,11 @@ $(OBJS)\coredll_wincmn.obj :  .AUTODEPEND ..\..\src\common\wincmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif

+!ifeq USE_GUI 1
+$(OBJS)\coredll_windowid.obj :  .AUTODEPEND ..\..\src\common\windowid.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\coredll_xpmdecod.obj :  .AUTODEPEND ..\..\src\common\xpmdecod.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -13300,6 +13323,11 @@ $(OBJS)\corelib_wincmn.obj :  .AUTODEPEND ..\..\src\common\wincmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif

+!ifeq USE_GUI 1
+$(OBJS)\corelib_windowid.obj :  .AUTODEPEND ..\..\src\common\windowid.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
 !ifeq USE_GUI 1
 $(OBJS)\corelib_xpmdecod.obj :  .AUTODEPEND ..\..\src\common\xpmdecod.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -646,6 +646,10 @@ SOURCE=..\..\src\common\wincmn.cpp
 # End Source File
 # Begin Source File

+SOURCE=..\..\src\common\windowid.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\common\xpmdecod.cpp
 # End Source File
 # End Group
@@ -6376,6 +6380,10 @@ SOURCE=..\..\include\wx\window.h
 # End Source File
 # Begin Source File

+SOURCE=..\..\include\wx\windowid.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\wizard.h
 # End Source File
 # Begin Source File