Use wxGenericImageList for wxMSW/wxUniv now; this

allows us to remove the MSW-specific code in wxUniv's wxNotebook
(maybe elsewhere?)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/cw.rsp b/distrib/msw/cw.rsp
index 6eac39eb26b2c60b402895ca534b3494abfe5708..0493ffe4397ccccd7083932c347ba11e29119f56 100644 (file)
--- a/distrib/msw/cw.rsp
+++ b/distrib/msw/cw.rsp
@@ -87,4 +87,7 @@ samples/widgets/*W7.xml
 samples/wizard/*W7.xml
 samples/wxtest/*W7.xml
 
 samples/wizard/*W7.xml
 samples/wxtest/*W7.xml
 

+utils/dialoged/src/*.xml
+utils/helpview/src/*.xml
+utils/tex2rtf/src/*.xml

 
 

diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp
index df1b6e93434f57e76aa6cf2fad230c0574d93495..14b0c624996281d2cef0d538a2089c2d2062cec2 100644 (file)
--- a/distrib/msw/makefile.rsp
+++ b/distrib/msw/makefile.rsp
@@ -173,3 +173,5 @@ src/unix/descrip.mms
 src/zlib/descrip.mms
 src/regex/descrip.mms
 utils/dialoged/src/descrip.mms
 src/zlib/descrip.mms
 src/regex/descrip.mms
 utils/dialoged/src/descrip.mms

+utils/helpview/src/descrip.mms
+utils/tex2rtf/src/descrip.mms

diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp
index 9b7e955f1df789802dcc84f6457155ed500eb76b..940fdff5bad4de63fe2edfe814b3ed70c7768cbf 100644 (file)
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -283,6 +283,9 @@ utils/hhp2cached/hhp2cached.dsw
 utils/helpgen/src/HelpGenVC.dsp
 utils/helpgen/src/HelpGenVC.dsw
 
 utils/helpgen/src/HelpGenVC.dsp
 utils/helpgen/src/HelpGenVC.dsw
 

+utils/helpview/src/helpview.dsp
+utils/helpview/src/helpview.dsw
+

 contrib/src/ogl/OglVC.dsp
 contrib/src/ogl/OglVC.dsw
 
 contrib/src/ogl/OglVC.dsp
 contrib/src/ogl/OglVC.dsw
 

diff --git a/docs/univ/readme.txt b/docs/univ/readme.txt
index 5ac6c5c07faf7cf65ffa3ed0d4e355840a5825d7..6f35784ab3414e6b2951fb3389001635675825c2 100644 (file)
--- a/docs/univ/readme.txt
+++ b/docs/univ/readme.txt
@@ -48,6 +48,8 @@ toolkit.
 a) Using Visual C++ 6.0
 
    Simply open the src/wxUniv.dsw file in DevStudio and build it.
 a) Using Visual C++ 6.0
 
    Simply open the src/wxUniv.dsw file in DevStudio and build it.

+   Then open the widgetsUniv.dsp file in samples/widgets to build
+   the widgets sample.

 
 b) Cygwin
 
 
 b) Cygwin
 

diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp
index d3d4b29fe1b982e757a0f35b69aa6662747fc783..39bf56b22863c6d923f98311880fbc7dcee8c5a0 100644 (file)
--- a/src/univ/notebook.cpp
+++ b/src/univ/notebook.cpp
@@ -462,7 +462,9 @@ void wxNotebook::DoDrawTab(wxDC& dc, const wxRect& rect, size_t n)
     {
         int image = m_images[n];
 
     {
         int image = m_images[n];
 

-#ifdef __WXMSW__    // FIXME
+        // Not needed now that wxGenericImageList is being
+        // used for wxUniversal under MSW
+#if 0 // def __WXMSW__    // FIXME

         int w, h;
         m_imageList->GetSize(n, w, h);
         bmp.Create(w, h);
         int w, h;
         m_imageList->GetSize(n, w, h);
         bmp.Create(w, h);

diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp
index aa532ef5912d153ee75c28e5b21aca8f327824ae..8f76e41b4074a7231f5da3609ee786515b15aab5 100644 (file)
--- a/src/wxUniv.dsp
+++ b/src/wxUniv.dsp
@@ -49,7 +49,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo /out:"..\lib\wxuniv.lib"
+# ADD LIB32 /nologo

 
 !ELSEIF  "$(CFG)" == "wxUniv - Win32 Debug"
 
 
 !ELSEIF  "$(CFG)" == "wxUniv - Win32 Debug"
 


@@ -221,6 +221,11 @@ SOURCE=.\common\event.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\extended.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+

 SOURCE=.\common\fddlgcmn.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\fddlgcmn.cpp
 # End Source File
 # Begin Source File


@@ -549,6 +554,11 @@ SOURCE=.\common\txtstrm.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\common\unzip.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+

 SOURCE=.\common\url.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\common\url.cpp
 # End Source File
 # Begin Source File


@@ -599,18 +609,6 @@ SOURCE=.\common\zipstrm.cpp
 
 SOURCE=.\common\zstream.cpp
 # End Source File
 
 SOURCE=.\common\zstream.cpp
 # End Source File

-
-# Begin Source File
-
-SOURCE=.\common\extended.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=.\common\unzip.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-

 # End Group
 # Begin Group "Generic Files"
 
 # End Group
 # Begin Group "Generic Files"
 


@@ -689,6 +687,10 @@ SOURCE=.\generic\helphtml.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\generic\imaglist.cpp
+# End Source File
+# Begin Source File
+

 SOURCE=.\generic\laywin.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\generic\laywin.cpp
 # End Source File
 # Begin Source File


@@ -787,7 +789,6 @@ SOURCE=.\generic\treelay.cpp
 
 SOURCE=.\generic\wizard.cpp
 # End Source File
 
 SOURCE=.\generic\wizard.cpp
 # End Source File

-

 # End Group
 # Begin Group "wxHTML Files"
 
 # End Group
 # Begin Group "wxHTML Files"
 


@@ -876,18 +877,12 @@ SOURCE=.\html\m_tables.cpp
 
 SOURCE=.\html\winpars.cpp
 # End Source File
 
 SOURCE=.\html\winpars.cpp
 # End Source File

-

 # End Group
 # Begin Group "MSW Files"
 
 # PROP Default_Filter ""
 # Begin Source File
 
 # End Group
 # Begin Group "MSW Files"
 
 # PROP Default_Filter ""
 # Begin Source File
 

-SOURCE=.\msw\dummy.cpp
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-

 SOURCE=.\msw\app.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\msw\app.cpp
 # End Source File
 # Begin Source File


@@ -952,6 +947,11 @@ SOURCE=.\msw\dir.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

+SOURCE=.\msw\dummy.cpp
+# ADD CPP /Yc"wx/wxprec.h"
+# End Source File
+# Begin Source File
+

 SOURCE=.\msw\evtloop.cpp
 # End Source File
 # Begin Source File
 SOURCE=.\msw\evtloop.cpp
 # End Source File
 # Begin Source File


@@ -976,11 +976,17 @@ SOURCE=.\msw\gdiobj.cpp
 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\msw\icon.cpp
+SOURCE=.\msw\gsocket.c
+# SUBTRACT CPP /YX /Yc /Yu

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\msw\imaglist.cpp
+SOURCE=.\msw\gsockmsw.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=.\msw\icon.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 


@@ -1050,22 +1056,26 @@ SOURCE=.\msw\volume.cpp
 
 SOURCE=.\msw\window.cpp
 # End Source File
 
 SOURCE=.\msw\window.cpp
 # End Source File

+# End Group
+# Begin Group "Universal Files"
+
+# PROP Default_Filter ""
+# Begin Group "Theme Files"

 
 

+# PROP Default_Filter ""

 # Begin Source File
 
 # Begin Source File
 

-SOURCE=.\msw\gsocket.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\univ\themes\gtk.cpp

 # End Source File
 # Begin Source File
 
 # End Source File
 # Begin Source File
 

-SOURCE=.\msw\gsockmsw.c
-# SUBTRACT CPP /YX /Yc /Yu
+SOURCE=.\univ\themes\metal.cpp

 # End Source File
 # End Source File

+# Begin Source File

 
 

+SOURCE=.\univ\themes\win32.cpp
+# End Source File

 # End Group
 # End Group

-# Begin Group "Universal Files"
-
-# PROP Default_Filter ""

 # Begin Source File
 
 SOURCE=.\univ\bmpbuttn.cpp
 # Begin Source File
 
 SOURCE=.\univ\bmpbuttn.cpp


@@ -1202,24 +1212,6 @@ SOURCE=.\univ\topluniv.cpp
 
 SOURCE=.\univ\winuniv.cpp
 # End Source File
 
 SOURCE=.\univ\winuniv.cpp
 # End Source File

-
-# Begin Group "Theme Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\univ\themes\gtk.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\themes\metal.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\univ\themes\win32.cpp
-# End Source File
-
-# End Group

 # End Group
 # Begin Group "Headers"
 
 # End Group
 # Begin Group "Headers"
 


@@ -1230,7 +1222,9 @@ SOURCE=.\univ\themes\win32.cpp
 # Begin Source File
 
 SOURCE=..\include\wx\univ\setup.h
 # Begin Source File
 
 SOURCE=..\include\wx\univ\setup.h

+

 !IF  "$(CFG)" == "wxUniv - Win32 Release"
 !IF  "$(CFG)" == "wxUniv - Win32 Release"

+

 # Begin Custom Build - Creating lib\univ\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating lib\univ\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\univ\setup.h
 


@@ -1238,7 +1232,9 @@ InputPath=..\include\wx\univ\setup.h
        copy "$(InputPath)" ..\lib\univ\wx\setup.h
 
 # End Custom Build
        copy "$(InputPath)" ..\lib\univ\wx\setup.h
 
 # End Custom Build

+

 !ELSEIF  "$(CFG)" == "wxUniv - Win32 Debug"
 !ELSEIF  "$(CFG)" == "wxUniv - Win32 Debug"

+

 # Begin Custom Build - Creating lib\univd\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\univ\setup.h
 
 # Begin Custom Build - Creating lib\univd\wx\setup.h from $(InputPath)
 InputPath=..\include\wx\univ\setup.h
 


@@ -1246,7 +1242,9 @@ InputPath=..\include\wx\univ\setup.h
        copy "$(InputPath)" ..\lib\univd\wx\setup.h
 
 # End Custom Build
        copy "$(InputPath)" ..\lib\univd\wx\setup.h
 
 # End Custom Build

+

 !ENDIF 
 !ENDIF 

+

 # End Source File
 # End Group
 # Begin Group "Common"
 # End Source File
 # End Group
 # Begin Group "Common"


@@ -2196,7 +2194,6 @@ SOURCE=..\include\wx\zipstrm.h
 
 SOURCE=..\include\wx\zstream.h
 # End Source File
 
 SOURCE=..\include\wx\zstream.h
 # End Source File

-

 # End Group
 # Begin Group "MSW"
 
 # End Group
 # Begin Group "MSW"
 


@@ -2361,7 +2358,6 @@ SOURCE=..\include\wx\generic\treectlg.h
 
 SOURCE=..\include\wx\generic\wizard.h
 # End Source File
 
 SOURCE=..\include\wx\generic\wizard.h
 # End Source File

-

 # End Group
 # Begin Group "HTML"
 
 # End Group
 # Begin Group "HTML"
 


@@ -2418,7 +2414,6 @@ SOURCE=..\include\wx\html\m_templ.h
 
 SOURCE=..\include\wx\html\winpars.h
 # End Source File
 
 SOURCE=..\include\wx\html\winpars.h
 # End Source File

-

 # End Group
 # Begin Group "Universal"
 
 # End Group
 # Begin Group "Universal"