Ditribution script mods;

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

diff --git a/distrib/msw/lower.bat b/distrib/msw/lower.bat
new file mode 100755 (executable)
index 0000000..adb4a74
--- /dev/null
+++ b/distrib/msw/lower.bat
@@ -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
+

diff --git a/distrib/msw/mac.rsp b/distrib/msw/mac.rsp
index 051bc349237c793bc0842c0c2486e6211ef2d662..095432ae2e354940bdcf4f2e330948a3145c4bac 100644 (file)
--- a/distrib/msw/mac.rsp
+++ b/distrib/msw/mac.rsp
@@ -8,6 +8,8 @@ docs/mac/*.applescript
 
 distrib/mac/*-sh
 
 
 distrib/mac/*-sh
 

+src/wxWindows.pbproj/project.pbxproj
+

 src/common/dosyacc.c
 src/common/doslex.c
 src/common/y_tab.c
 src/common/dosyacc.c
 src/common/doslex.c
 src/common/y_tab.c

diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat
index d931591fcd92b0954685fd453c0f395e76a77ac5..768a9d43958893fec5ef3235d8221e9acfd6197c 100755 (executable)
--- a/distrib/msw/zipdistinno.bat
+++ b/distrib/msw/zipdistinno.bat
@@ -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
 
 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
 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
 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%
 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
 
 
 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
 
 
 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%
+
+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%/*

 
 

-zip32 -d %dest%\wxMac-%version%.zip %dest%/src/gtk/descrip.mms %dest%/src/motif/descrip.mms
+cd %src%

 
 Rem Create wxWindows-%version%-win.zip which is used to create wxMSW
 echo Zipping individual components
 
 Rem Create wxWindows-%version%-win.zip which is used to create wxMSW
 echo Zipping individual components

diff --git a/distrib/msw/zipwxmac.bat b/distrib/msw/zipwxmac.bat
index 6497b7ca88d45d7be6d51f69115e2959140e5b52..e09f5f3aaa779e6691023e06a435de4e157ab81d 100755 (executable)
--- a/distrib/msw/zipwxmac.bat
+++ b/distrib/msw/zipwxmac.bat
@@ -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
 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%\*
 
 Rem echo Making StuffIt archive...
 Rem set stuffitcmd=%stuffit% -stuff -create wxMac-%version%.sit wxWindows-%version%\*

diff --git a/distrib/msw/zipwxos2.bat b/distrib/msw/zipwxos2.bat
new file mode 100755 (executable)
index 0000000..691c3fb
--- /dev/null
+++ b/distrib/msw/zipwxos2.bat
@@ -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

diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index 5c745a1c819d895d8e05c3417629d6a26d07537d..c6c02d9802a2784f8a4df50b69318e3a9bfd9518 100644 (file)
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -36,7 +36,13 @@ class WXDLLEXPORT wxDropTarget;
 
 class WXDLLEXPORT wxListItem;
 class WXDLLEXPORT wxListEvent;
 
 class WXDLLEXPORT wxListItem;
 class WXDLLEXPORT wxListEvent;

+
+#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__)

 class WXDLLEXPORT wxListCtrl;
 class WXDLLEXPORT wxListCtrl;

+#define wxImageListType wxImageList
+#else
+#define wxImageListType wxGenericImageList
+#endif

 
 //-----------------------------------------------------------------------------
 // internal classes
 
 //-----------------------------------------------------------------------------
 // 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;
     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();
     bool Arrange( int flag = wxLIST_ALIGN_DEFAULT ); // always wxLIST_ALIGN_LEFT in wxGLC
 
     void ClearAll();


@@ -185,9 +191,9 @@ public:
     // implementation
     // --------------
 
     // 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;
     bool                 m_ownsImageListNormal,
                          m_ownsImageListSmall,
                          m_ownsImageListState;

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index aeee3f956f66fa30bc52973e5dd919ca68737614..289e132500339f76eb8539e6df23be7eddc6279a 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -54,8 +54,12 @@
 
 #if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
     #include "wx/generic/listctrl.h"
 
 #if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
     #include "wx/generic/listctrl.h"

+
+    #define wxImageListType wxGenericImageList

 #else
     #include "wx/listctrl.h"
 #else
     #include "wx/listctrl.h"

+    
+    #define wxImageListType wxImageList

 #endif
 
 #if defined(__WXGTK__)
 #endif
 
 #if defined(__WXGTK__)