From c482b99ec93fc52a1a10507d4b338ac217a28364 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 18 Aug 2002 22:42:58 +0000 Subject: [PATCH] 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 --- distrib/msw/cw.rsp | 3 ++ distrib/msw/makefile.rsp | 2 + distrib/msw/vc.rsp | 3 ++ docs/univ/readme.txt | 2 + src/univ/notebook.cpp | 4 +- src/wxUniv.dsp | 95 +++++++++++++++++++--------------------- 6 files changed, 58 insertions(+), 51 deletions(-) diff --git a/distrib/msw/cw.rsp b/distrib/msw/cw.rsp index 6eac39eb26..0493ffe439 100644 --- 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 +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 df1b6e9343..14b0c62499 100644 --- 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 +utils/helpview/src/descrip.mms +utils/tex2rtf/src/descrip.mms diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp index 9b7e955f1d..940fdff5ba 100644 --- 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/helpview/src/helpview.dsp +utils/helpview/src/helpview.dsw + contrib/src/ogl/OglVC.dsp contrib/src/ogl/OglVC.dsw diff --git a/docs/univ/readme.txt b/docs/univ/readme.txt index 5ac6c5c07f..6f35784ab3 100644 --- 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. + Then open the widgetsUniv.dsp file in samples/widgets to build + the widgets sample. b) Cygwin diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp index d3d4b29fe1..39bf56b228 100644 --- 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]; -#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); diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp index aa532ef591..8f76e41b40 100644 --- 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 LIB32 /nologo /out:"..\lib\wxuniv.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "wxUniv - Win32 Debug" @@ -221,6 +221,11 @@ SOURCE=.\common\event.cpp # 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 @@ -549,6 +554,11 @@ SOURCE=.\common\txtstrm.cpp # 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 @@ -599,18 +609,6 @@ SOURCE=.\common\zipstrm.cpp 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" @@ -689,6 +687,10 @@ SOURCE=.\generic\helphtml.cpp # 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 @@ -787,7 +789,6 @@ SOURCE=.\generic\treelay.cpp SOURCE=.\generic\wizard.cpp # End Source File - # End Group # Begin Group "wxHTML Files" @@ -876,18 +877,12 @@ SOURCE=.\html\m_tables.cpp SOURCE=.\html\winpars.cpp # End 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 @@ -952,6 +947,11 @@ SOURCE=.\msw\dir.cpp # 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 @@ -976,11 +976,17 @@ SOURCE=.\msw\gdiobj.cpp # 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 -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 @@ -1050,22 +1056,26 @@ SOURCE=.\msw\volume.cpp 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 -SOURCE=.\msw\gsocket.c -# SUBTRACT CPP /YX /Yc /Yu +SOURCE=.\univ\themes\gtk.cpp # End Source File # Begin Source File -SOURCE=.\msw\gsockmsw.c -# SUBTRACT CPP /YX /Yc /Yu +SOURCE=.\univ\themes\metal.cpp # End Source File +# Begin Source File +SOURCE=.\univ\themes\win32.cpp +# End Source File # End Group -# Begin Group "Universal Files" - -# PROP Default_Filter "" # Begin Source File SOURCE=.\univ\bmpbuttn.cpp @@ -1202,24 +1212,6 @@ SOURCE=.\univ\topluniv.cpp 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" @@ -1230,7 +1222,9 @@ SOURCE=.\univ\themes\win32.cpp # Begin Source File SOURCE=..\include\wx\univ\setup.h + !IF "$(CFG)" == "wxUniv - Win32 Release" + # 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 + !ELSEIF "$(CFG)" == "wxUniv - Win32 Debug" + # 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 + !ENDIF + # 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 - # End Group # Begin Group "MSW" @@ -2361,7 +2358,6 @@ SOURCE=..\include\wx\generic\treectlg.h SOURCE=..\include\wx\generic\wizard.h # End Source File - # 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 - # End Group # Begin Group "Universal" -- 2.47.2