added wxNativeContainerWindow and implemented it for wxMSW and wxGTK

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-10 15:50:48 +00:00
parent 478c805363
commit dfba244cbf
12 changed files with 466 additions and 1 deletions
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -837,6 +837,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/mdi.h
    wx/menu.h
    wx/msgdlg.h
+    wx/nativewin.h
    wx/numdlg.h
    wx/overlay.h
    wx/palette.h
@@ -1100,6 +1101,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/gtk/menu.cpp
    src/gtk/mnemonics.cpp
    src/gtk/msgdlg.cpp
+    src/gtk/nativewin.cpp
    src/gtk/notebook.cpp
    src/gtk/radiobox.cpp
    src/gtk/radiobut.cpp
@@ -1675,6 +1677,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/msw/metafile.cpp
    src/msw/msgdlg.cpp
    src/msw/nativdlg.cpp
+    src/msw/nativewin.cpp
    src/msw/notebook.cpp
    src/msw/ole/access.cpp
    src/msw/ownerdrw.cpp
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1552,6 +1552,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_metafile.obj \
 	$(OBJS)\monodll_msgdlg.obj \
 	$(OBJS)\monodll_nativdlg.obj \
+	$(OBJS)\monodll_nativewin.obj \
 	$(OBJS)\monodll_notebook.obj \
 	$(OBJS)\monodll_access.obj \
 	$(OBJS)\monodll_ownerdrw.obj \
@@ -2195,6 +2196,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_metafile.obj \
 	$(OBJS)\monolib_msgdlg.obj \
 	$(OBJS)\monolib_nativdlg.obj \
+	$(OBJS)\monolib_nativewin.obj \
 	$(OBJS)\monolib_notebook.obj \
 	$(OBJS)\monolib_access.obj \
 	$(OBJS)\monolib_ownerdrw.obj \
@@ -2753,6 +2755,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_metafile.obj \
 	$(OBJS)\coredll_msgdlg.obj \
 	$(OBJS)\coredll_nativdlg.obj \
+	$(OBJS)\coredll_nativewin.obj \
 	$(OBJS)\coredll_notebook.obj \
 	$(OBJS)\coredll_access.obj \
 	$(OBJS)\coredll_ownerdrw.obj \
@@ -3217,6 +3220,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_metafile.obj \
 	$(OBJS)\corelib_msgdlg.obj \
 	$(OBJS)\corelib_nativdlg.obj \
+	$(OBJS)\corelib_nativewin.obj \
 	$(OBJS)\corelib_notebook.obj \
 	$(OBJS)\corelib_access.obj \
 	$(OBJS)\corelib_ownerdrw.obj \
@@ -5559,6 +5563,9 @@ $(OBJS)\monodll_msgdlg.obj: ..\..\src\msw\msgdlg.cpp
 $(OBJS)\monodll_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nativdlg.cpp

+$(OBJS)\monodll_nativewin.obj: ..\..\src\msw\nativewin.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nativewin.cpp
+
 $(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp

@@ -7665,6 +7672,9 @@ $(OBJS)\monolib_msgdlg.obj: ..\..\src\msw\msgdlg.cpp
 $(OBJS)\monolib_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nativdlg.cpp

+$(OBJS)\monolib_nativewin.obj: ..\..\src\msw\nativewin.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nativewin.cpp
+
 $(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp

@@ -10155,6 +10165,9 @@ $(OBJS)\coredll_msgdlg.obj: ..\..\src\msw\msgdlg.cpp
 $(OBJS)\coredll_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nativdlg.cpp

+$(OBJS)\coredll_nativewin.obj: ..\..\src\msw\nativewin.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nativewin.cpp
+
 $(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp

@@ -11466,6 +11479,9 @@ $(OBJS)\corelib_msgdlg.obj: ..\..\src\msw\msgdlg.cpp
 $(OBJS)\corelib_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nativdlg.cpp

+$(OBJS)\corelib_nativewin.obj: ..\..\src\msw\nativewin.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nativewin.cpp
+
 $(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp

--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1569,6 +1569,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_metafile.o \
 	$(OBJS)\monodll_msgdlg.o \
 	$(OBJS)\monodll_nativdlg.o \
+	$(OBJS)\monodll_nativewin.o \
 	$(OBJS)\monodll_notebook.o \
 	$(OBJS)\monodll_access.o \
 	$(OBJS)\monodll_ownerdrw.o \
@@ -2218,6 +2219,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_metafile.o \
 	$(OBJS)\monolib_msgdlg.o \
 	$(OBJS)\monolib_nativdlg.o \
+	$(OBJS)\monolib_nativewin.o \
 	$(OBJS)\monolib_notebook.o \
 	$(OBJS)\monolib_access.o \
 	$(OBJS)\monolib_ownerdrw.o \
@@ -2792,6 +2794,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_metafile.o \
 	$(OBJS)\coredll_msgdlg.o \
 	$(OBJS)\coredll_nativdlg.o \
+	$(OBJS)\coredll_nativewin.o \
 	$(OBJS)\coredll_notebook.o \
 	$(OBJS)\coredll_access.o \
 	$(OBJS)\coredll_ownerdrw.o \
@@ -3264,6 +3267,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_metafile.o \
 	$(OBJS)\corelib_msgdlg.o \
 	$(OBJS)\corelib_nativdlg.o \
+	$(OBJS)\corelib_nativewin.o \
 	$(OBJS)\corelib_notebook.o \
 	$(OBJS)\corelib_access.o \
 	$(OBJS)\corelib_ownerdrw.o \
@@ -5701,6 +5705,9 @@ $(OBJS)\monodll_msgdlg.o: ../../src/msw/msgdlg.cpp
 $(OBJS)\monodll_nativdlg.o: ../../src/msw/nativdlg.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\monodll_nativewin.o: ../../src/msw/nativewin.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monodll_access.o: ../../src/msw/ole/access.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

@@ -7909,6 +7916,9 @@ $(OBJS)\monolib_msgdlg.o: ../../src/msw/msgdlg.cpp
 $(OBJS)\monolib_nativdlg.o: ../../src/msw/nativdlg.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\monolib_nativewin.o: ../../src/msw/nativewin.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monolib_access.o: ../../src/msw/ole/access.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

@@ -10501,6 +10511,9 @@ $(OBJS)\coredll_msgdlg.o: ../../src/msw/msgdlg.cpp
 $(OBJS)\coredll_nativdlg.o: ../../src/msw/nativdlg.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\coredll_nativewin.o: ../../src/msw/nativewin.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\coredll_access.o: ../../src/msw/ole/access.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<

@@ -11912,6 +11925,9 @@ $(OBJS)\corelib_msgdlg.o: ../../src/msw/msgdlg.cpp
 $(OBJS)\corelib_nativdlg.o: ../../src/msw/nativdlg.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\corelib_nativewin.o: ../../src/msw/nativewin.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\corelib_access.o: ../../src/msw/ole/access.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<

--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1726,6 +1726,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_metafile.obj \
 	$(OBJS)\monodll_msgdlg.obj \
 	$(OBJS)\monodll_nativdlg.obj \
+	$(OBJS)\monodll_nativewin.obj \
 	$(OBJS)\monodll_notebook.obj \
 	$(OBJS)\monodll_access.obj \
 	$(OBJS)\monodll_ownerdrw.obj \
@@ -2375,6 +2376,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_metafile.obj \
 	$(OBJS)\monolib_msgdlg.obj \
 	$(OBJS)\monolib_nativdlg.obj \
+	$(OBJS)\monolib_nativewin.obj \
 	$(OBJS)\monolib_notebook.obj \
 	$(OBJS)\monolib_access.obj \
 	$(OBJS)\monolib_ownerdrw.obj \
@@ -2963,6 +2965,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_metafile.obj \
 	$(OBJS)\coredll_msgdlg.obj \
 	$(OBJS)\coredll_nativdlg.obj \
+	$(OBJS)\coredll_nativewin.obj \
 	$(OBJS)\coredll_notebook.obj \
 	$(OBJS)\coredll_access.obj \
 	$(OBJS)\coredll_ownerdrw.obj \
@@ -3433,6 +3436,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_metafile.obj \
 	$(OBJS)\corelib_msgdlg.obj \
 	$(OBJS)\corelib_nativdlg.obj \
+	$(OBJS)\corelib_nativewin.obj \
 	$(OBJS)\corelib_notebook.obj \
 	$(OBJS)\corelib_access.obj \
 	$(OBJS)\corelib_ownerdrw.obj \
@@ -5891,6 +5895,9 @@ $(OBJS)\monodll_msgdlg.obj: ..\..\src\msw\msgdlg.cpp
 $(OBJS)\monodll_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nativdlg.cpp

+$(OBJS)\monodll_nativewin.obj: ..\..\src\msw\nativewin.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nativewin.cpp
+
 $(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp

@@ -7997,6 +8004,9 @@ $(OBJS)\monolib_msgdlg.obj: ..\..\src\msw\msgdlg.cpp
 $(OBJS)\monolib_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nativdlg.cpp

+$(OBJS)\monolib_nativewin.obj: ..\..\src\msw\nativewin.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nativewin.cpp
+
 $(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp

@@ -10487,6 +10497,9 @@ $(OBJS)\coredll_msgdlg.obj: ..\..\src\msw\msgdlg.cpp
 $(OBJS)\coredll_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nativdlg.cpp

+$(OBJS)\coredll_nativewin.obj: ..\..\src\msw\nativewin.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nativewin.cpp
+
 $(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp

@@ -11798,6 +11811,9 @@ $(OBJS)\corelib_msgdlg.obj: ..\..\src\msw\msgdlg.cpp
 $(OBJS)\corelib_nativdlg.obj: ..\..\src\msw\nativdlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nativdlg.cpp

+$(OBJS)\corelib_nativewin.obj: ..\..\src\msw\nativewin.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nativewin.cpp
+
 $(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp

--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -288,6 +288,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_metafile.obj &
 	$(OBJS)\monodll_msgdlg.obj &
 	$(OBJS)\monodll_nativdlg.obj &
+	$(OBJS)\monodll_nativewin.obj &
 	$(OBJS)\monodll_notebook.obj &
 	$(OBJS)\monodll_access.obj &
 	$(OBJS)\monodll_ownerdrw.obj &
@@ -942,6 +943,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_metafile.obj &
 	$(OBJS)\monolib_msgdlg.obj &
 	$(OBJS)\monolib_nativdlg.obj &
+	$(OBJS)\monolib_nativewin.obj &
 	$(OBJS)\monolib_notebook.obj &
 	$(OBJS)\monolib_access.obj &
 	$(OBJS)\monolib_ownerdrw.obj &
@@ -1527,6 +1529,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_metafile.obj &
 	$(OBJS)\coredll_msgdlg.obj &
 	$(OBJS)\coredll_nativdlg.obj &
+	$(OBJS)\coredll_nativewin.obj &
 	$(OBJS)\coredll_notebook.obj &
 	$(OBJS)\coredll_access.obj &
 	$(OBJS)\coredll_ownerdrw.obj &
@@ -2001,6 +2004,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_metafile.obj &
 	$(OBJS)\corelib_msgdlg.obj &
 	$(OBJS)\corelib_nativdlg.obj &
+	$(OBJS)\corelib_nativewin.obj &
 	$(OBJS)\corelib_notebook.obj &
 	$(OBJS)\corelib_access.obj &
 	$(OBJS)\corelib_ownerdrw.obj &
@@ -5933,6 +5937,9 @@ $(OBJS)\monodll_msgdlg.obj :  .AUTODEPEND ..\..\src\msw\msgdlg.cpp
 $(OBJS)\monodll_nativdlg.obj :  .AUTODEPEND ..\..\src\msw\nativdlg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<

+$(OBJS)\monodll_nativewin.obj :  .AUTODEPEND ..\..\src\msw\nativewin.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_access.obj :  .AUTODEPEND ..\..\src\msw\ole\access.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<

@@ -8141,6 +8148,9 @@ $(OBJS)\monolib_msgdlg.obj :  .AUTODEPEND ..\..\src\msw\msgdlg.cpp
 $(OBJS)\monolib_nativdlg.obj :  .AUTODEPEND ..\..\src\msw\nativdlg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<

+$(OBJS)\monolib_nativewin.obj :  .AUTODEPEND ..\..\src\msw\nativewin.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_access.obj :  .AUTODEPEND ..\..\src\msw\ole\access.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<

@@ -10733,6 +10743,9 @@ $(OBJS)\coredll_msgdlg.obj :  .AUTODEPEND ..\..\src\msw\msgdlg.cpp
 $(OBJS)\coredll_nativdlg.obj :  .AUTODEPEND ..\..\src\msw\nativdlg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<

+$(OBJS)\coredll_nativewin.obj :  .AUTODEPEND ..\..\src\msw\nativewin.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+
 $(OBJS)\coredll_access.obj :  .AUTODEPEND ..\..\src\msw\ole\access.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<

@@ -12144,6 +12157,9 @@ $(OBJS)\corelib_msgdlg.obj :  .AUTODEPEND ..\..\src\msw\msgdlg.cpp
 $(OBJS)\corelib_nativdlg.obj :  .AUTODEPEND ..\..\src\msw\nativdlg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<

+$(OBJS)\corelib_nativewin.obj :  .AUTODEPEND ..\..\src\msw\nativewin.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+
 $(OBJS)\corelib_access.obj :  .AUTODEPEND ..\..\src\msw\ole\access.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<

--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -1777,6 +1777,41 @@ SOURCE=..\..\src\msw\nativdlg.cpp
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"


+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\msw\nativewin.cpp
+
+!IF  "$(CFG)" == "core - Win32 DLL Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+
 !ENDIF

 # End Source File
@@ -6056,6 +6091,10 @@ SOURCE=..\..\include\wx\msgdlg.h
 # End Source File
 # Begin Source File

+SOURCE=..\..\include\wx\nativewin.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\nonownedwnd.h
 # End Source File
 # Begin Source File
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -1333,6 +1333,21 @@
 					Name="Universal Debug|Win32"
 					ExcludedFromBuild="true"/>
 			</File>
+			<File
+				RelativePath="..\..\src\msw\nativewin.cpp">
+				<FileConfiguration
+					Name="DLL Universal Release|Win32"
+					ExcludedFromBuild="true"/>
+				<FileConfiguration
+					Name="DLL Universal Debug|Win32"
+					ExcludedFromBuild="true"/>
+				<FileConfiguration
+					Name="Universal Release|Win32"
+					ExcludedFromBuild="true"/>
+				<FileConfiguration
+					Name="Universal Debug|Win32"
+					ExcludedFromBuild="true"/>
+			</File>
 			<File
 				RelativePath="..\..\src\msw\notebook.cpp">
 				<FileConfiguration
@@ -3363,6 +3378,8 @@
 				RelativePath="..\..\include\wx\minifram.h"/>
 			<File
 				RelativePath="..\..\include\wx\msgdlg.h"/>
+			<File
+				RelativePath="..\..\include\wx\nativewin.h"/>
 			<File
 				RelativePath="..\..\include\wx\nonownedwnd.h"/>
 			<File