Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ditribution script mods;

Browse Source 
Use wxImageList instead of wxGenericImageList where possible
in wxListCtrl


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-08-28 08:54:00 +00:00
parent d8f591c4d9
commit f9ceab7ce6
7 changed files with 143 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
distrib/msw/lower.bat Executable file
View File

@@ -0,0 +1,11 @@
@echo off
Rem Make all files in a directory lower-case
dir /B > %TEMP%\files.tmp
set len=%@LINES[%TEMP%\files.tmp]
do i = 0 to %len by 1
set line=%@LINE[%TEMP%\files.tmp,%i]
ren %line% _%line%
ren _%line% %@LOWER[%line%]
enddo

2
distrib/msw/mac.rsp
View File

@@ -8,6 +8,8 @@ docs/mac/*.applescript
distrib/mac/*-sh
src/wxWindows.pbproj/project.pbxproj
src/common/dosyacc.c
src/common/doslex.c
src/common/y_tab.c

40
distrib/msw/zipdistinno.bat
View File

@@ -57,13 +57,12 @@ Rem Copy setup0.h files to setup.h
copy %src%\include\wx\os2\setup0.h %src%\include\wx\os2\setup.h
copy %src%\include\wx\msw\setup0.h %src%\include\wx\msw\setup.h
cd %src
cd %src%
echo Zipping...
Rem Zip up the complete wxOS2-xxx.zip file
zip32 -@ %dest\wxOS2-%version%.zip < %src\distrib\msw\generic.rsp
zip32 -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\os2.rsp
zip32 -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\wx_chm.rsp
zip32 -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\jpeg.rsp
zip32 -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\tiff.rsp
zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\tiff.rsp
@@ -77,9 +76,27 @@ zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\contrib.rsp
zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\makefile.rsp
Rem Rearchive under wxWindows-%version%
call %WXWIN%\distrib\msw\rearchive wxOS2-%version%.zip wxWindows-%version% %dest%
if direxist %dest%\wxWindows-%version% erase /sxyz %dirname%\wxWindows-%version%
zip32 -d %dest%\wxOS2-%version%.zip %dest%/src/gtk/descrip.mms %dest%/src/motif/descrip.mms
mkdir %dest%\wxWindows-%version%
cd %dest%\wxWindows-%version%
unzip32 ..\wxOS2-%version%.zip
erase /Y src\gtk\descrip.mms src\motif\descrip.mms docs\pdf\*.pdf
erase /Y src\tiff\*.mcp src\jpeg\*.mcp src\png\*.mcp src\zlib\*.mcp
erase /SXY docs\html\dialoged docs\html\tex2rtf
echo Making files lower case...
cd src\os2
call %src%\distrib\msw\lower.bat
cd ..\..\include\wx\os2
call %src%\distrib\msw\lower.bat
cd %dest%
erase wxOS2-%version%.zip
zip32 -r wxOS2-%version%.zip wxWindows-%version%/*
cd %src%
echo Zipping wxMac distribution
@@ -101,9 +118,20 @@ zip32 -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\makefile.rsp
erase /Y %src%\include\wx\setup.h
call %WXWIN%\distrib\msw\rearchive wxMac-%version%.zip wxWindows-%version% %dest%
if direxist %dest%\wxWindows-%version% erase /sxyz %dirname%\wxWindows-%version%
zip32 -d %dest%\wxMac-%version%.zip %dest%/src/gtk/descrip.mms %dest%/src/motif/descrip.mms
mkdir %dest%\wxWindows-%version%
cd %dest%\wxWindows-%version%
unzip32 ..\wxMac-%version%.zip
erase /Y src\gtk\descrip.mms src\motif\descrip.mms docs\pdf\*.pdf
erase /SXY docs\html\dialoged docs\html\tex2rtf docs\htmlhelp
cd %dest%
erase wxMac-%version%.zip
zip32 -r wxMac-%version%.zip wxWindows-%version%/*
cd %src%
Rem Create wxWindows-%version%-win.zip which is used to create wxMSW
echo Zipping individual components

8
distrib/msw/zipwxmac.bat
View File

@@ -53,12 +53,12 @@ mkdir %dest%\wxWindows-%version%
cd %dest%\wxWindows-%version%
unzip32 ..\wxMac-%version%.zip
erase /Y src\gtk\descrip.mms src\motif\descrip.mms docs\pdf\*.pdf
erase /SXY docs\html\dialoged
erase /SXY docs\html\dialoged docs\html\tex2rtf
cd ..
cd %dest%
erase ..\wxMac-%version%.zip
zip32 -r ..\wxMac-%version%.zip %dest%/wxWindows-%version%/*
erase wxMac-%version%.zip
zip32 -r wxMac-%version%.zip wxWindows-%version%/*
Rem echo Making StuffIt archive...
Rem set stuffitcmd=%stuffit% -stuff -create wxMac-%version%.sit wxWindows-%version%\*

76
distrib/msw/zipwxos2.bat Executable file
View File

@@ -0,0 +1,76 @@
@echo off
rem Zip up a wxOS2 distribution.
set src=%wxwin
set dest=%src\deliver
set webfiles=c:\wx2dev\wxWebSite
Rem Set this to the required version
set version=2.3.3
if "%src" == "" goto usage
if "%dest" == "" goto usage
if "%1" == "-help" goto usage
if "%1" == "--help" goto usage
if "%1" == "/?" goto usage
echo About to archive an external wxOS2 distribution:
echo From %src
echo To %dest
echo CTRL-C if this is not correct.
pause
erase %dest\wxOS2*.zip
if not direxist %dest mkdir %dest
if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
echo Zipping wxOS2 distribution
cd %src%
Rem copy %src%\include\wx\os2\setup0.h %src%\include\wx\setup.h
zip32 -@ %dest\wxOS2-%version%.zip < %src\distrib\msw\generic.rsp
zip32 -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\os2.rsp
zip32 -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\jpeg.rsp
zip32 -@ -u %dest%\wxOS2-%version%.zip < %src\distrib\msw\tiff.rsp
zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\tiff.rsp
zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\jpeg.rsp
zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\utils.rsp
zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\tex2rtf.rsp
zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\dialoged.rsp
zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\ogl.rsp
zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\xml.rsp
zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\contrib.rsp
zip32 -u -@ %dest%\wxOS2-%version%.zip < %src%\distrib\msw\makefile.rsp
Rem erase /Y %src%\include\wx\setup.h
if direxist %dest%\wxWindows-%version% erase /sxyz %dirname%\wxWindows-%version%
mkdir %dest%\wxWindows-%version%
cd %dest%\wxWindows-%version%
unzip32 ..\wxOS2-%version%.zip
erase /Y src\gtk\descrip.mms src\motif\descrip.mms docs\pdf\*.pdf
erase /Y src\tiff\*.mcp src\jpeg\*.mcp src\png\*.mcp src\zlib\*.mcp
erase /SXY docs\html\dialoged docs\html\tex2rtf
echo Making files lower case...
cd src\os2
call %src%\distrib\msw\lower.bat
cd ..\..\include\wx\os2
call %src%\distrib\msw\lower.bat
cd %dest%
erase wxOS2-%version%.zip
zip32 -r wxOS2-%version%.zip wxWindows-%version%/*
echo wxOS2 archived.
goto end
:usage
echo DOS wxWindows distribution. Zips up wxOS2.
echo.
echo "Usage: zipwxos2"
:end

18
include/wx/generic/listctrl.h
View File

@@ -36,7 +36,13 @@ class WXDLLEXPORT wxDropTarget;
class WXDLLEXPORT wxListItem;
class WXDLLEXPORT wxListEvent;
#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__)
class WXDLLEXPORT wxListCtrl;
#define wxImageListType wxImageList
#else
#define wxImageListType wxGenericImageList
#endif
//-----------------------------------------------------------------------------
// internal classes
@@ -116,9 +122,9 @@ public:
void SetWindowStyleFlag( long style );
void RecreateWindow() {}
long GetNextItem( long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE ) const;
wxGenericImageList *GetImageList( int which ) const;
void SetImageList( wxGenericImageList *imageList, int which );
void AssignImageList( wxGenericImageList *imageList, int which );
wxImageListType *GetImageList( int which ) const;
void SetImageList( wxImageListType *imageList, int which );
void AssignImageList( wxImageListType *imageList, int which );
bool Arrange( int flag = wxLIST_ALIGN_DEFAULT ); // always wxLIST_ALIGN_LEFT in wxGLC
void ClearAll();
@@ -185,9 +191,9 @@ public:
// implementation
// --------------
wxGenericImageList *m_imageListNormal;
wxGenericImageList *m_imageListSmall;
wxGenericImageList *m_imageListState; // what's that ?
wxImageListType *m_imageListNormal;
wxImageListType *m_imageListSmall;
wxImageListType *m_imageListState; // what's that ?
bool m_ownsImageListNormal,
m_ownsImageListSmall,
m_ownsImageListState;

4
src/generic/listctrl.cpp
View File

@@ -54,8 +54,12 @@
#if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
#include "wx/generic/listctrl.h"
#define wxImageListType wxGenericImageList
#else
#include "wx/listctrl.h"
#define wxImageListType wxImageList
#endif
#if defined(__WXGTK__)