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

Updated release scripts

Browse Source 
No change to toolbar and scrlwing.cpp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-12-28 18:37:06 +00:00
parent cd84d4a071
commit 6418db84dc
7 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
distrib/msw/contrib.rsp
View File

@@ -120,6 +120,19 @@ contrib/samples/gizmos/dynsash_switch/*.rc
contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsp contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsp
contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsw contrib/samples/gizmos/dynsash_switch/dynsash_switch.dsw
contrib/samples/gizmos/led/*.cpp
contrib/samples/gizmos/led/*.h
contrib/samples/gizmos/led/*.def
contrib/samples/gizmos/led/makefile*
contrib/samples/gizmos/led/*.xbm
contrib/samples/gizmos/led/*.xpm
contrib/samples/gizmos/led/*.txt
contrib/samples/gizmos/led/*.ico
contrib/samples/gizmos/led/*.bmp
contrib/samples/gizmos/led/*.rc
contrib/samples/gizmos/led/led.dsp
contrib/samples/gizmos/led/led.dsw
contrib/samples/animate/*.cpp contrib/samples/animate/*.cpp
contrib/samples/animate/*.h contrib/samples/animate/*.h
contrib/samples/animate/*.def contrib/samples/animate/*.def

1
distrib/msw/makefile.rsp
View File

@@ -121,6 +121,7 @@ contrib/samples/gizmos/splittree/Makefile.in
contrib/samples/gizmos/editlbox/Makefile.in contrib/samples/gizmos/editlbox/Makefile.in
contrib/samples/gizmos/dynsash/Makefile.in contrib/samples/gizmos/dynsash/Makefile.in
contrib/samples/gizmos/dynsash_switch/Makefile.in contrib/samples/gizmos/dynsash_switch/Makefile.in
contrib/samples/gizmos/led/Makefile.in
contrib/samples/ogl/Makefile.in contrib/samples/ogl/Makefile.in
contrib/samples/ogl/ogledit/Makefile.in contrib/samples/ogl/ogledit/Makefile.in
contrib/samples/ogl/studio/Makefile.in contrib/samples/ogl/studio/Makefile.in

1
distrib/msw/stc.rsp
View File

@@ -43,7 +43,6 @@ contrib/samples/stc/*.rc
contrib/samples/stc/*.def contrib/samples/stc/*.def
contrib/samples/stc/*.xbm contrib/samples/stc/*.xbm
contrib/samples/stc/make*.* contrib/samples/stc/make*.*
contrib/samples/stc/Makefile
contrib/samples/stc/*.txt contrib/samples/stc/*.txt
contrib/samples/stc/*.ico contrib/samples/stc/*.ico
contrib/samples/stc/*.bmp contrib/samples/stc/*.bmp

6
distrib/msw/tardist
View File

@@ -66,7 +66,7 @@ dospinwxgtk()
echo Tarring wxGTK... echo Tarring wxGTK...
cd $WXSRC cd $WXSRC
cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/tex2rtf.rsp $WXSRC/distrib/msw/dialoged.rsp $WXSRC/distrib/msw/gtk.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxgtk_in.txt cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/tex2rtf.rsp $WXSRC/distrib/msw/dialoged.rsp $WXSRC/distrib/msw/gtk.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxgtk_in.txt
expandlines /tmp/wxgtk_in.txt /tmp/wxgtk.txt expandlines /tmp/wxgtk_in.txt /tmp/wxgtk.txt
$TAR cf $WXDEST/wxGTK-${WXVER}.tar -T /tmp/wxgtk.txt $TAR cf $WXDEST/wxGTK-${WXVER}.tar -T /tmp/wxgtk.txt
@@ -87,7 +87,7 @@ dospinwxmotif()
echo Tarring wxMotif... echo Tarring wxMotif...
cd $WXSRC cd $WXSRC
cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxmotif_in.txt cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxmotif_in.txt
expandlines /tmp/wxmotif_in.txt /tmp/wxmotif.txt expandlines /tmp/wxmotif_in.txt /tmp/wxmotif.txt
$TAR cf $WXDEST/wxMotif-${WXVER}.tar -T /tmp/wxmotif.txt $TAR cf $WXDEST/wxMotif-${WXVER}.tar -T /tmp/wxmotif.txt
@@ -109,7 +109,7 @@ echo Tarring wxX11...
### wxX11: combined wxMotif and wxX11 distributions ### wxX11: combined wxMotif and wxX11 distributions
cd $WXSRC cd $WXSRC
cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/univ.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/dialoged.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxx11_in.txt cat $WXSRC/distrib/msw/generic.rsp $WXSRC/distrib/msw/motif.rsp $WXSRC/distrib/msw/x11.rsp $WXSRC/distrib/msw/univ.rsp $WXSRC/distrib/msw/contrib.rsp $WXSRC/distrib/msw/stc.rsp $WXSRC/distrib/msw/utils.rsp $WXSRC/distrib/msw/xml.rsp $WXSRC/distrib/msw/dialoged.rsp $WXSRC/distrib/msw/ogl.rsp $WXSRC/distrib/msw/makefile.rsp $WXSRC/distrib/msw/tiff.rsp $WXSRC/distrib/msw/jpeg.rsp > /tmp/wxx11_in.txt
expandlines /tmp/wxx11_in.txt /tmp/wxx11.txt expandlines /tmp/wxx11_in.txt /tmp/wxx11.txt
$TAR cf $WXDEST/wxX11-${WXVER}.tar -T /tmp/wxx11.txt $TAR cf $WXDEST/wxX11-${WXVER}.tar -T /tmp/wxx11.txt

6
docs/latex/wx/scrolwin.tex
View File

@@ -17,7 +17,7 @@ An additional method of manual control, which requires a little less
computation of your own, is to set the total size of the scrolling area by computation of your own, is to set the total size of the scrolling area by
calling either \helpref{wxWindow::SetVirtualSize}{wxwindowsetvirtualsize}, calling either \helpref{wxWindow::SetVirtualSize}{wxwindowsetvirtualsize},
or \helpref{wxWindow::FitInside}{wxwindowfitinside}, and setting the or \helpref{wxWindow::FitInside}{wxwindowfitinside}, and setting the
scrolling increments for it by calling scrolling increments for it by calling
\helpref{wxScrolledWindow::SetScrollRate}{wxscrolledwindowsetscrollrate}. \helpref{wxScrolledWindow::SetScrollRate}{wxscrolledwindowsetscrollrate}.
Scrolling in some orientation is enabled by setting a non zero increment Scrolling in some orientation is enabled by setting a non zero increment
for it. for it.
@@ -435,7 +435,7 @@ adjusting the scrollbars appropriately.
\membersection{wxScrolledWindow::SetScrollRate}\label{wxscrolledwindowsetscrollrate} \membersection{wxScrolledWindow::SetScrollRate}\label{wxscrolledwindowsetscrollrate}
\func{void}{SetScrollRate}{\param{int}{xstep}, \param{int}{ystep}} \func{void}{SetScrollRate}{\param{int}{ xstep}, \param{int}{ ystep}}
Set the horizontal and vertical scrolling increment only. See the pixelsPerUnit Set the horizontal and vertical scrolling increment only. See the pixelsPerUnit
parameter in SetScrollbars. parameter in SetScrollbars.
@@ -445,5 +445,5 @@ parameter in SetScrollbars.
\func{void}{SetTargetWindow}{\param{wxWindow* }{window}} \func{void}{SetTargetWindow}{\param{wxWindow* }{window}}
Call this function to tell wxScrolledWindow to perform the actual scrolling on Call this function to tell wxScrolledWindow to perform the actual scrolling on
a different window (not on itself). a different window (and not on itself).

6
include/wx/univ/frame.h
View File

@@ -64,12 +64,12 @@ public:
virtual int GetMinWidth() const; virtual int GetMinWidth() const;
virtual int GetMinHeight() const; virtual int GetMinHeight() const;
protected:
void OnSize(wxSizeEvent& event);
// sends wxSizeEvent to itself (used after attaching xxxBar) // sends wxSizeEvent to itself (used after attaching xxxBar)
void SendSizeEvent(); void SendSizeEvent();
protected:
void OnSize(wxSizeEvent& event);
virtual void DoGetClientSize(int *width, int *height) const; virtual void DoGetClientSize(int *width, int *height) const;
virtual void DoSetClientSize(int width, int height); virtual void DoSetClientSize(int width, int height);

2
samples/toolbar/toolbar.cpp
View File

@@ -156,7 +156,7 @@ private:
const int ID_TOOLBAR = 500; const int ID_TOOLBAR = 500;
static const long TOOLBAR_STYLE = wxTB_FLAT | wxTB_DOCKABLE | wxTB_TEXT; static const long TOOLBAR_STYLE = wxTB_FLAT | wxTB_DOCKABLE | wxTB_TEXT ;
enum enum
{ {