Corrected some casting errors -> XtPointer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
parent
3f030b4804
commit
d7dcb93990
@ -77,6 +77,8 @@ demos/life/Makefile.in
|
||||
demos/dbbrowse/Makefile.in
|
||||
utils/dialoged/Makefile.in
|
||||
utils/dialoged/src/Makefile.in
|
||||
utils/tex2rtf/Makefile.in
|
||||
utils/tex2rtf/src/Makefile.in
|
||||
utils/makegen/Makefile.in
|
||||
utils/HelpGen/Makefile.in
|
||||
utils/HelpGen/src/Makefile.in
|
||||
|
||||
@ -54,11 +54,16 @@ cd $1
|
||||
echo Removing backup files...
|
||||
rm *~ */*~ */*/*~ */*/*/*~ */*/*/*/*~
|
||||
|
||||
rm -f $2/wxWindows-${WXVER}*.tgz
|
||||
rm -f $2/tex2rtf2.tgz
|
||||
rm -f $2/ogl3.tgz
|
||||
rm -f $2/jpeg.tgz
|
||||
rm -f $2/tiff.tgz
|
||||
rm -f $2/wx*-${WXVER}*.tgz
|
||||
rm -f $2/tex2rtf2-*.tgz
|
||||
rm -f $2/dialoged-*.tgz
|
||||
rm -f $2/ogl3-*.tgz
|
||||
rm -f $2/jpeg-*.tgz
|
||||
rm -f $2/tiff-*.tgz
|
||||
rm -f $2/stc-*.tgz
|
||||
rm -f $2/canvas-*.tgz
|
||||
rm -f $2/contrib-*.tgz
|
||||
rm -f $2/applet-*.tgz
|
||||
|
||||
echo Tarring...
|
||||
|
||||
@ -69,22 +74,22 @@ gzip $2/wxWindows-${WXVER}-gen.tar
|
||||
mv $2/wxWindows-${WXVER}-gen.tar.gz $2/wxWindows-${WXVER}-gen.tgz
|
||||
|
||||
### wxGTK
|
||||
ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/gtk.rsp $1/distrib/msw/makefile.rsp` > /tmp/wxgtk.txt
|
||||
tar cvf $2/wxWindows-${WXVER}-gtk.tar -T /tmp/wxgtk.txt
|
||||
gzip $2/wxWindows-${WXVER}-gtk.tar
|
||||
mv $2/wxWindows-${WXVER}-gtk.tar.gz $2/wxWindows-${WXVER}-gtk.tgz
|
||||
ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/gtk.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp` > /tmp/wxgtk.txt
|
||||
tar cvf $2/wxGTK-${WXVER}.tar -T /tmp/wxgtk.txt
|
||||
gzip $2/wxGTK-${WXVER}.tar
|
||||
mv $2/wxGTK-${WXVER}.tar.gz $2/wxGTK-${WXVER}.tgz
|
||||
|
||||
### wxMotif
|
||||
ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/makefile.rsp` > /tmp/wxmotif.txt
|
||||
ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp` > /tmp/wxmotif.txt
|
||||
tar cvf $2/wxWindows-${WXVER}-mot.tar -T /tmp/wxmotif.txt
|
||||
gzip $2/wxWindows-${WXVER}-mot.tar
|
||||
mv $2/wxWindows-${WXVER}-mot.tar.gz $2/wxWindows-${WXVER}-mot.tgz
|
||||
gzip $2/wxMotif-${WXVER}.tar
|
||||
mv $2/wxMotif-${WXVER}.tar.gz $2/wxMotif-${WXVER}.tgz
|
||||
|
||||
### wxMSW
|
||||
ls `cat $1/distrib/msw/msw.rsp $1/distrib/msw/vc.rsp` > /tmp/wxmsw.txt
|
||||
tar cvf $2/wxWindows-${WXVER}-msw.tar -T /tmp/wxmsw.txt
|
||||
gzip $2/wxWindows-${WXVER}-msw.tar
|
||||
mv $2/wxWindows-${WXVER}-msw.tar.gz $2/wxWindows-${WXVER}-msw.tgz
|
||||
ls `cat $1/distrib/msw/msw.rsp $1/distrib/msw/vc.rsp $1/distrib/msw/bc.rsp $1/distrib/msw/contrib.rsp $1/distrib/msw/xml.rsp $1/distrib/msw/makefile.rsp $1/distrib/msw/tiff.rsp $1/distrib/msw/jpeg.rsp` > /tmp/wxmsw.txt
|
||||
tar cvf $2/wxMSW-${WXVER}.tar -T /tmp/wxmsw.txt
|
||||
gzip $2/wxMSW-${WXVER}.tar
|
||||
mv $2/wxMSW-${WXVER}.tar.gz $2/wxMSW-${WXVER}.tgz
|
||||
|
||||
### Doc sources
|
||||
ls `cat $1/distrib/msw/docsrc.rsp` > /tmp/docsrc.txt
|
||||
@ -105,33 +110,33 @@ gzip $2/wxWindows-${WXVER}-pdf.tar
|
||||
mv $2/wxWindows-${WXVER}-pdf.tar.gz $2/wxWindows-${WXVER}-pdf.tgz
|
||||
|
||||
### Stubs files
|
||||
ls `cat $1/distrib/msw/stubs.rsp` > /tmp/stubs.txt
|
||||
tar cvf $2/wxWindows-${WXVER}-stubs.tar -T /tmp/stubs.txt
|
||||
gzip $2/wxWindows-${WXVER}-stubs.tar
|
||||
mv $2/wxWindows-${WXVER}-stubs.tar.gz $2/wxWindows-${WXVER}-stubs.tgz
|
||||
#ls `cat $1/distrib/msw/stubs.rsp` > /tmp/stubs.txt
|
||||
#tar cvf $2/wxWindows-${WXVER}-stubs.tar -T /tmp/stubs.txt
|
||||
#gzip $2/wxWindows-${WXVER}-stubs.tar
|
||||
#mv $2/wxWindows-${WXVER}-stubs.tar.gz $2/wxWindows-${WXVER}-stubs.tgz
|
||||
|
||||
### Tex2RTF
|
||||
ls `cat $1/distrib/msw/tex2rtf.rsp` > /tmp/tex2rtf.txt
|
||||
tar cvf $2/tex2rtf2.tar -T /tmp/tex2rtf.txt
|
||||
gzip $2/tex2rtf2.tar
|
||||
mv $2/tex2rtf2.tar.gz $2/tex2rtf2.tgz
|
||||
tar cvf $2/tex2rtf2-${WXVER}.tar -T /tmp/tex2rtf.txt
|
||||
gzip $2/tex2rtf2-${WXVER}.tar
|
||||
mv $2/tex2rtf2-${WXVER}.tar.gz $2/tex2rtf2-${WXVER}.tgz
|
||||
|
||||
### OGL
|
||||
ls `cat $1/distrib/msw/ogl.rsp` > /tmp/ogl.txt
|
||||
tar cvf $2/ogl3.tar -T /tmp/ogl.txt
|
||||
gzip $2/ogl3.tar
|
||||
mv $2/ogl3.tar.gz $2/ogl3.tgz
|
||||
tar cvf $2/ogl3-${WXVER}.tar -T /tmp/ogl.txt
|
||||
gzip $2/ogl3-${WXVER}.tar
|
||||
mv $2/ogl3-${WXVER}.tar.gz $2/ogl3-${WXVER}.tgz
|
||||
|
||||
### JPEG
|
||||
ls `cat $1/distrib/msw/jpeg.rsp` > /tmp/jpeg.txt
|
||||
tar cvf $2/jpeg.tar -T /tmp/jpeg.txt
|
||||
gzip $2/jpeg.tar
|
||||
mv $2/jpeg.tar.gz $2/jpeg.tgz
|
||||
tar cvf $2/jpeg-${WXVER}.tar -T /tmp/jpeg.txt
|
||||
gzip $2/jpeg-${WXVER}.tar
|
||||
mv $2/jpeg-${WXVER}.tar.gz $2/jpeg-${WXVER}.tgz
|
||||
|
||||
### TIFF
|
||||
ls `cat $1/distrib/msw/tiff.rsp` > /tmp/tiff.txt
|
||||
tar cvf $2/tiff.tar -T /tmp/tiff.txt
|
||||
gzip $2/tiff.tar
|
||||
mv $2/tiff.tar.gz $2/tiff.tgz
|
||||
tar cvf $2/tiff-${WXVER}.tar -T /tmp/tiff.txt
|
||||
gzip $2/tiff-${WXVER}.tar
|
||||
mv $2/tiff-${WXVER}.tar.gz $2/tiff-${WXVER}.tgz
|
||||
|
||||
echo Done!
|
||||
|
||||
@ -9,7 +9,6 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifdef __GNUG__
|
||||
#pragma interface "text.cpp"
|
||||
#pragma implementation "text.cpp"
|
||||
#endif
|
||||
|
||||
|
||||
@ -175,18 +175,8 @@ bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title,
|
||||
#endif
|
||||
XmNfontList, fontList,
|
||||
NULL);
|
||||
#ifdef __VMS__
|
||||
#pragma message disable voiincconext
|
||||
// VMS gives here the compiler warning:
|
||||
// conversion from pointer to function to void* permitted
|
||||
// as an extension
|
||||
#endif
|
||||
XtAddCallback ((Widget) m_radioButtons[i], XmNvalueChangedCallback, (XtCallbackProc) wxRadioBoxCallback,
|
||||
(XtCallbackProc) this);
|
||||
#ifdef __VMS__
|
||||
#pragma message enable voiincconext
|
||||
#endif
|
||||
|
||||
(XtPointer) this);
|
||||
}
|
||||
SetSelection (0);
|
||||
|
||||
|
||||
@ -87,17 +87,8 @@ bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
|
||||
NULL);
|
||||
XmStringFree (text);
|
||||
|
||||
#ifdef __VMS__
|
||||
#pragma message disable voiincconext
|
||||
// VMS gives here the compiler warning:
|
||||
// conversion from pointer to function to void* permitted
|
||||
// as an extension
|
||||
#endif
|
||||
XtAddCallback (radioButtonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxRadioButtonCallback,
|
||||
(XtCallbackProc) this);
|
||||
#ifdef __VMS__
|
||||
#pragma message enable voiincconext
|
||||
#endif
|
||||
(XtPointer) this);
|
||||
|
||||
m_mainWidget = (WXWidget) radioButtonWidget;
|
||||
|
||||
|
||||
@ -34,6 +34,10 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#ifdef XmNselectionCallback
|
||||
#undef XmNselectionCallback
|
||||
#endif
|
||||
|
||||
#define XmNselectionCallback "selectionCallback"
|
||||
#define XmCSelectionCallback "SelectionCallback"
|
||||
#define XmNunselectionCallback "unselectionCallback"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user