Remove support for Win9x from wxMSW.

Most importantly, this allows us to remove all MSLU-related stuff. Some functions which were previously loaded dynamically can now be just used directly, too. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
yangjidong · May 16, 2014 · 0d4ad16 · 0d4ad16
1 parent e3c2531
commit 0d4ad16
Show file tree

Hide file tree

Showing 1,036 changed files with 12,129 additions and 16,796 deletions.
diff --git a/Makefile.in b/Makefile.in
diff --git a/build/bakefiles/build_cfg.bkl b/build/bakefiles/build_cfg.bkl
@@ -34,7 +34,6 @@
                 @echo DEBUG_FLAG=$(DEBUG_FLAG) >>$(BUILD_CFG_FILE)
                 @echo DEBUG_INFO=$(DEBUG_INFO) >>$(BUILD_CFG_FILE)
                 @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)
-                @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)
                 @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)
                 @echo USE_RTTI=$(USE_RTTI) >>$(BUILD_CFG_FILE)
                 @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
@@ -292,18 +292,12 @@
         <if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if>
         <if cond="FORMAT!='autoconf' and UNICODE=='0'">wxUSE_UNICODE=0</if>
     </set>
-    <set var="MSLU_DEFINE">
-        <if cond="FORMAT!='autoconf' and MSLU=='1'">wxUSE_UNICODE_MSLU=1</if>
-    </set>
 
     <!-- fill for the specific case of the format/compiler -->
     <set var="WIN32_WINNT">
         <if cond="FORMAT=='dmars' or FORMAT=='dmars_smake'">_WIN32_WINNT=0x0400</if>
     </set>
 
-    <set var="UNICOWS_LIB">
-        <if cond="MSLU=='1'">unicows</if>
-    </set>
     <set var="CAIRO_LIB">
         <if cond="USE_CAIRO=='1'">cairo</if>
     </set>
@@ -529,7 +523,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
         <define>$(RTTI_DEFINE)</define>
         <define>$(THREAD_DEFINE)</define>
         <define>$(UNICODE_DEFINE)</define>
-        <define>$(MSLU_DEFINE)</define>
         <include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
         <include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
         <include cond="FORMAT!='autoconf'">$(CAIRO_INCLUDEDIR)</include>
@@ -560,7 +553,6 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
 
         <!-- system libraries on windows: -->
         <if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
-            <sys-lib>$(UNICOWS_LIB)</sys-lib>
             <sys-lib>$(CAIRO_LIB)</sys-lib>
             <lib-path>$(CAIRO_LIBDIR)</lib-path>
             <if cond="FORMAT=='borland'">

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
@@ -109,19 +109,6 @@
         </option>
     </if>
 
-    <if cond="FORMAT!='autoconf' and FORMAT!='watcom'">
-        <option name="MSLU">
-            <values>0,1</values>
-            <default-value>0</default-value>
-            <description>
-                Use MSLU library when building Unicode version.
-            </description>
-        </option>
-    </if>
-    <if cond="FORMAT=='autoconf' or FORMAT=='watcom'">
-        <set var="MSLU">0</set>
-    </if>
-
     <option name="BUILD">
         <values>debug,release</values>
         <values-description>Debug,Release</values-description>
@@ -563,7 +550,6 @@ For example, add "-F pe-i386" here if using 64 bit windres for 32 bit build.
         <set var="USE_CAIRO">0</set>
         <set var="DEBUG_INFO">$(DEBUG_INFO_DEFAULT)</set>
         <set var="DEBUG_FLAG">default</set>
-        <set var="MSLU">0</set>
     </if>
 
 

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
@@ -147,7 +147,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="BASE_AND_GUI_WIN32_SRC" hints="files">
     src/msw/main.cpp
-    src/msw/mslu.cpp
     src/msw/volume.cpp
 </set>
 <set var="BASE_WINCE_SRC" hints="files">
@@ -164,7 +163,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/msw/gccpriv.h
     wx/msw/libraries.h
     wx/msw/mimetype.h
-    wx/msw/mslu.h
     wx/msw/private.h
     wx/msw/regconf.h
     wx/msw/registry.h

diff --git a/build/msw/config.bcc b/build/msw/config.bcc
@@ -65,11 +65,6 @@ WXUNIV = 0
 UNICODE = 1
 !endif
 
-# Use MSLU library when building Unicode version. [0,1]
-!ifndef MSLU
-MSLU = 0
-!endif
-
 # Type of compiled binaries [debug,release]
 !ifndef BUILD
 BUILD = debug

diff --git a/build/msw/config.gcc b/build/msw/config.gcc
@@ -49,9 +49,6 @@ WXUNIV ?= 0
 # Compile Unicode build of wxWidgets? [0,1]
 UNICODE ?= 1
 
-# Use MSLU library when building Unicode version. [0,1]
-MSLU ?= 0
-
 # Type of compiled binaries [debug,release]
 BUILD ?= debug
 

diff --git a/build/msw/config.vc b/build/msw/config.vc
@@ -43,9 +43,6 @@ WXUNIV = 0
 # Compile Unicode build of wxWidgets? [0,1]
 UNICODE = 1
 
-# Use MSLU library when building Unicode version. [0,1]
-MSLU = 0
-
 # Type of compiled binaries [debug,release]
 BUILD = debug
 

diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
diff --git a/build/msw/wx_vc10_base.vcxproj b/build/msw/wx_vc10_base.vcxproj
@@ -596,7 +596,6 @@
     <ClCompile Include="..\..\src\msw\fswatcher.cpp" />
     <ClCompile Include="..\..\src\msw\main.cpp" />
     <ClCompile Include="..\..\src\msw\mimetype.cpp" />
-    <ClCompile Include="..\..\src\msw\mslu.cpp" />
     <ClCompile Include="..\..\src\msw\power.cpp" />
     <ClCompile Include="..\..\src\msw\regconf.cpp" />
     <ClCompile Include="..\..\src\msw\registry.cpp" />
@@ -650,7 +649,6 @@
     </CustomBuild>
     <ClInclude Include="..\..\include\wx\msw\libraries.h" />
     <ClInclude Include="..\..\include\wx\msw\mimetype.h" />
-    <ClInclude Include="..\..\include\wx\msw\mslu.h" />
     <ClInclude Include="..\..\include\wx\msw\private.h" />
     <ClInclude Include="..\..\include\wx\msw\regconf.h" />
     <ClInclude Include="..\..\include\wx\msw\registry.h" />
@@ -824,4 +822,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/build/msw/wx_vc10_base.vcxproj.filters b/build/msw/wx_vc10_base.vcxproj.filters
@@ -327,9 +327,6 @@
     <ClCompile Include="..\..\src\msw\mimetype.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\msw\mslu.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\msw\power.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
@@ -409,9 +406,6 @@
     <ClInclude Include="..\..\include\wx\msw\mimetype.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\wx\msw\mslu.h">
-      <Filter>MSW Headers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\wx\msw\private.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>

diff --git a/build/msw/wx_vc10_core.vcxproj b/build/msw/wx_vc10_core.vcxproj
@@ -803,7 +803,6 @@
     <ClCompile Include="..\..\src\msw\metafile.cpp" />
     <ClCompile Include="..\..\src\msw\minifram.cpp" />
     <ClCompile Include="..\..\src\msw\msgdlg.cpp" />
-    <ClCompile Include="..\..\src\msw\mslu.cpp" />
     <ClCompile Include="..\..\src\msw\nativdlg.cpp" />
     <ClCompile Include="..\..\src\msw\nativewin.cpp" />
     <ClCompile Include="..\..\src\msw\nonownedwnd.cpp" />

diff --git a/build/msw/wx_vc10_core.vcxproj.filters b/build/msw/wx_vc10_core.vcxproj.filters
@@ -615,9 +615,6 @@
     <ClCompile Include="..\..\src\msw\msgdlg.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\msw\mslu.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\msw\nativdlg.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>