Compare commits
1 Commits
BEFORE_PRA
...
v2.6.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
00f12e1acc |
169
Makefile.in
169
Makefile.in
@@ -215,7 +215,7 @@ WXEXPAT_OBJECTS = \
|
||||
wxexpat_xmlrole.o \
|
||||
wxexpat_xmltok.o
|
||||
PLUGINS_INST_DIR = $(libdir)/wx/$(PLUGIN_VERSION0)
|
||||
ALL_HEADERS = \
|
||||
ALL_BASE_HEADERS = \
|
||||
wx/afterstd.h \
|
||||
wx/app.h \
|
||||
wx/apptrait.h \
|
||||
@@ -337,164 +337,10 @@ ALL_HEADERS = \
|
||||
wx/xtixml.h \
|
||||
wx/db.h \
|
||||
wx/dbkeyg.h \
|
||||
wx/dbtable.h \
|
||||
$(ALL_GUI_HEADERS)
|
||||
ALL_BASE_HEADERS = \
|
||||
wx/afterstd.h \
|
||||
wx/app.h \
|
||||
wx/apptrait.h \
|
||||
wx/archive.h \
|
||||
wx/arrimpl.cpp \
|
||||
wx/arrstr.h \
|
||||
wx/beforestd.h \
|
||||
wx/buffer.h \
|
||||
wx/build.h \
|
||||
wx/chkconf.h \
|
||||
wx/clntdata.h \
|
||||
wx/cmdline.h \
|
||||
wx/confbase.h \
|
||||
wx/config.h \
|
||||
wx/containr.h \
|
||||
wx/datetime.h \
|
||||
wx/datstrm.h \
|
||||
wx/dde.h \
|
||||
wx/debug.h \
|
||||
wx/defs.h \
|
||||
wx/dir.h \
|
||||
wx/dlimpexp.h \
|
||||
wx/dynarray.h \
|
||||
wx/dynlib.h \
|
||||
wx/dynload.h \
|
||||
wx/encconv.h \
|
||||
wx/event.h \
|
||||
wx/except.h \
|
||||
wx/features.h \
|
||||
wx/ffile.h \
|
||||
wx/file.h \
|
||||
wx/fileconf.h \
|
||||
wx/filefn.h \
|
||||
wx/filename.h \
|
||||
wx/filesys.h \
|
||||
wx/fontenc.h \
|
||||
wx/fontmap.h \
|
||||
wx/fs_mem.h \
|
||||
wx/fs_zip.h \
|
||||
wx/hash.h \
|
||||
wx/hashmap.h \
|
||||
wx/hashset.h \
|
||||
wx/html/forcelnk.h \
|
||||
wx/iconloc.h \
|
||||
wx/init.h \
|
||||
wx/intl.h \
|
||||
wx/iosfwrap.h \
|
||||
wx/ioswrap.h \
|
||||
wx/ipc.h \
|
||||
wx/ipcbase.h \
|
||||
wx/isql.h \
|
||||
wx/isqlext.h \
|
||||
wx/list.h \
|
||||
wx/listimpl.cpp \
|
||||
wx/log.h \
|
||||
wx/longlong.h \
|
||||
wx/math.h \
|
||||
wx/memconf.h \
|
||||
wx/memory.h \
|
||||
wx/memtext.h \
|
||||
wx/mimetype.h \
|
||||
wx/module.h \
|
||||
wx/msgout.h \
|
||||
wx/mstream.h \
|
||||
wx/object.h \
|
||||
wx/platform.h \
|
||||
wx/process.h \
|
||||
wx/ptr_scpd.h \
|
||||
wx/recguard.h \
|
||||
wx/regex.h \
|
||||
wx/scopeguard.h \
|
||||
wx/snglinst.h \
|
||||
wx/sstream.h \
|
||||
wx/stack.h \
|
||||
wx/stackwalk.h \
|
||||
wx/stdpaths.h \
|
||||
wx/stockitem.h \
|
||||
wx/stopwatch.h \
|
||||
wx/strconv.h \
|
||||
wx/stream.h \
|
||||
wx/string.h \
|
||||
wx/sysopt.h \
|
||||
wx/textbuf.h \
|
||||
wx/textfile.h \
|
||||
wx/thread.h \
|
||||
wx/thrimpl.cpp \
|
||||
wx/timer.h \
|
||||
wx/tokenzr.h \
|
||||
wx/txtstrm.h \
|
||||
wx/types.h \
|
||||
wx/uri.h \
|
||||
wx/utils.h \
|
||||
wx/variant.h \
|
||||
wx/vector.h \
|
||||
wx/version.h \
|
||||
wx/volume.h \
|
||||
wx/wfstream.h \
|
||||
wx/wx.h \
|
||||
wx/wxchar.h \
|
||||
wx/wxprec.h \
|
||||
wx/xti.h \
|
||||
wx/xtistrm.h \
|
||||
wx/zipstrm.h \
|
||||
wx/zstream.h \
|
||||
wx/unix/apptbase.h \
|
||||
wx/unix/apptrait.h \
|
||||
wx/unix/execute.h \
|
||||
wx/unix/mimetype.h \
|
||||
wx/unix/pipe.h \
|
||||
wx/unix/stackwalk.h \
|
||||
wx/unix/stdpaths.h \
|
||||
wx/msw/apptrait.h \
|
||||
wx/msw/apptbase.h \
|
||||
wx/msw/chkconf.h \
|
||||
wx/msw/crashrpt.h \
|
||||
wx/msw/dde.h \
|
||||
wx/msw/debughlp.h \
|
||||
wx/msw/gccpriv.h \
|
||||
wx/msw/mimetype.h \
|
||||
wx/msw/stackwalk.h \
|
||||
wx/msw/stdpaths.h \
|
||||
wx/msw/winundef.h \
|
||||
wx/msw/wrapcctl.h \
|
||||
wx/msw/wrapcdlg.h \
|
||||
wx/msw/wrapwin.h \
|
||||
$(BASE_WINCE_HDR) \
|
||||
$(BASE_MACOSX_HDR) \
|
||||
wx/palmos/apptbase.h \
|
||||
wx/palmos/apptrait.h \
|
||||
wx/palmos/chkconf.h \
|
||||
wx/palmos/mimetype.h \
|
||||
wx/palmos/stdpaths.h \
|
||||
wx/msdos/mimetype.h \
|
||||
wx/fs_inet.h \
|
||||
wx/gsocket.h \
|
||||
wx/protocol/file.h \
|
||||
wx/protocol/ftp.h \
|
||||
wx/protocol/http.h \
|
||||
wx/protocol/protocol.h \
|
||||
wx/sckaddr.h \
|
||||
wx/sckipc.h \
|
||||
wx/sckstrm.h \
|
||||
wx/socket.h \
|
||||
wx/url.h \
|
||||
wx/unix/gsockunx.h \
|
||||
wx/msw/gsockmsw.h \
|
||||
$(NET_WINCE_HDR) \
|
||||
wx/unix/gsockunx.h \
|
||||
wx/unix/gsockunx.h \
|
||||
wx/mac/carbon/gsockmac.h \
|
||||
wx/xml/xml.h \
|
||||
wx/xtixml.h \
|
||||
wx/db.h \
|
||||
wx/dbkeyg.h \
|
||||
wx/dbtable.h
|
||||
ALL_HEADERS = \
|
||||
$(ALL_BASE_HEADERS) \
|
||||
$(ALL_GUI_HEADERS)
|
||||
ALL_BASE_SOURCES = \
|
||||
src/common/appbase.cpp \
|
||||
src/common/archive.cpp \
|
||||
@@ -24333,7 +24179,6 @@ X11DIR = $(WXDIR)/src/x11
|
||||
X11INC = $(WXDIR)/include/wx/x11
|
||||
MGLDIR = $(WXDIR)/src/mgl
|
||||
MOTIFDIR = $(WXDIR)/src/motif
|
||||
MSDOSDIR = $(WXDIR)/src/msdos
|
||||
MSWDIR = $(WXDIR)/src/msw
|
||||
PMDIR = $(WXDIR)/src/os2
|
||||
MACDIR = $(WXDIR)/src/mac
|
||||
@@ -24514,11 +24359,9 @@ BASE_DIST: ALL_DIST
|
||||
mkdir $(DISTDIR)/include/wx/protocol
|
||||
mkdir $(DISTDIR)/include/wx/unix
|
||||
mkdir $(DISTDIR)/include/wx/xml
|
||||
mkdir $(DISTDIR)/include/wx/msdos
|
||||
mkdir $(DISTDIR)/include/wx/msw
|
||||
mkdir $(DISTDIR)/include/wx/html
|
||||
mkdir $(DISTDIR)/src/unix
|
||||
mkdir $(DISTDIR)/src/msdos
|
||||
mkdir $(DISTDIR)/src/msw
|
||||
cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
|
||||
cp $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt
|
||||
@@ -24693,12 +24536,8 @@ UNIV_DIST: ALL_GUI_DIST
|
||||
MGL_DIST: UNIV_DIST
|
||||
cp $(WXDIR)/wxMGL.spec $(DISTDIR)
|
||||
cp $(INCDIR)/wx/mgl/*.h $(DISTDIR)/include/wx/mgl
|
||||
mkdir $(DISTDIR)/include/wx/msdos
|
||||
cp $(INCDIR)/wx/msdos/*.h $(DISTDIR)/include/wx/msdos
|
||||
cp $(SRCDIR)/mgl/make* $(DISTDIR)/src/mgl
|
||||
cp $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl
|
||||
mkdir $(DISTDIR)/src/msdos
|
||||
cp $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos
|
||||
mkdir $(DISTDIR)/contrib
|
||||
cp -R $(WXDIR)/contrib $(DISTDIR)
|
||||
|
||||
|
||||
42
art/back.xpm
42
art/back.xpm
@@ -1,21 +1,21 @@
|
||||
/* XPM */
|
||||
static char * back_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" ",
|
||||
" . ",
|
||||
" .. ",
|
||||
" .X. ",
|
||||
" .XX........ ",
|
||||
" .XXXXXXXXXX. ",
|
||||
" .XXXXXXXXXXX. ",
|
||||
" .XXXXXXXXXXX. ",
|
||||
" .XXXXXXXXXX. ",
|
||||
" .XX........ ",
|
||||
" .X. ",
|
||||
" .. ",
|
||||
" . ",
|
||||
" "};
|
||||
/* XPM */
|
||||
static char * back_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" ",
|
||||
" . ",
|
||||
" .. ",
|
||||
" .X. ",
|
||||
" .XX........ ",
|
||||
" .XXXXXXXXXX. ",
|
||||
" .XXXXXXXXXXX. ",
|
||||
" .XXXXXXXXXXX. ",
|
||||
" .XXXXXXXXXX. ",
|
||||
" .XX........ ",
|
||||
" .X. ",
|
||||
" .. ",
|
||||
" . ",
|
||||
" "};
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
/* XPM */
|
||||
static char *cross_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"10 10 2 1",
|
||||
" c Gray0",
|
||||
"# c None",
|
||||
/* pixels */
|
||||
" ######## ",
|
||||
" #### ",
|
||||
"# ## #",
|
||||
"## ##",
|
||||
"### ###",
|
||||
"### ###",
|
||||
"## ##",
|
||||
"# ## #",
|
||||
" #### ",
|
||||
" ###### "};
|
||||
/* XPM */
|
||||
static char *cross_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"10 10 2 1",
|
||||
" c Gray0",
|
||||
"# c None",
|
||||
/* pixels */
|
||||
" ######## ",
|
||||
" #### ",
|
||||
"# ## #",
|
||||
"## ##",
|
||||
"### ###",
|
||||
"### ###",
|
||||
"## ##",
|
||||
"# ## #",
|
||||
" #### ",
|
||||
" ###### "};
|
||||
|
||||
42
art/down.xpm
42
art/down.xpm
@@ -1,21 +1,21 @@
|
||||
/* XPM */
|
||||
static char * down_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" ...... ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" ....XXXX.... ",
|
||||
" .XXXXXXXX. ",
|
||||
" .XXXXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XX. ",
|
||||
" .. ",
|
||||
" "};
|
||||
/* XPM */
|
||||
static char * down_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" ...... ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" ....XXXX.... ",
|
||||
" .XXXXXXXX. ",
|
||||
" .XXXXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XX. ",
|
||||
" .. ",
|
||||
" "};
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
/* XPM */
|
||||
static char * forward_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" ",
|
||||
" . ",
|
||||
" .. ",
|
||||
" .X. ",
|
||||
" ........XX. ",
|
||||
" .XXXXXXXXXX. ",
|
||||
" .XXXXXXXXXXX. ",
|
||||
" .XXXXXXXXXXX. ",
|
||||
" .XXXXXXXXXX. ",
|
||||
" ........XX. ",
|
||||
" .X. ",
|
||||
" .. ",
|
||||
" . ",
|
||||
" "};
|
||||
/* XPM */
|
||||
static char * forward_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" ",
|
||||
" . ",
|
||||
" .. ",
|
||||
" .X. ",
|
||||
" ........XX. ",
|
||||
" .XXXXXXXXXX. ",
|
||||
" .XXXXXXXXXXX. ",
|
||||
" .XXXXXXXXXXX. ",
|
||||
" .XXXXXXXXXX. ",
|
||||
" ........XX. ",
|
||||
" .X. ",
|
||||
" .. ",
|
||||
" . ",
|
||||
" "};
|
||||
|
||||
@@ -1,25 +1,25 @@
|
||||
/* XPM */
|
||||
static char * htmbook_xpm[] = {
|
||||
"16 16 6 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c #000080",
|
||||
"o c #c0c0c0",
|
||||
"O c #808080",
|
||||
"+ c Gray100",
|
||||
" ",
|
||||
" .. ",
|
||||
" ..XX. ",
|
||||
" ..XXXXX. ",
|
||||
" ..XXXXXXXX. ",
|
||||
".oXXXXXXXXXX. ",
|
||||
".XoXXXXXXXXXX. ",
|
||||
".XXoXXXXXXXXXX. ",
|
||||
".XXXoXXXXXXXXX..",
|
||||
".XXXXoXXXXXX..O ",
|
||||
" .XXXXoXXX..O+O ",
|
||||
" .XXXXo..O++o..",
|
||||
" .XXX.O+++o.. ",
|
||||
" .XX.o+o.. ",
|
||||
" .X.o.. ",
|
||||
" ... "};
|
||||
/* XPM */
|
||||
static char * htmbook_xpm[] = {
|
||||
"16 16 6 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c #000080",
|
||||
"o c #c0c0c0",
|
||||
"O c #808080",
|
||||
"+ c Gray100",
|
||||
" ",
|
||||
" .. ",
|
||||
" ..XX. ",
|
||||
" ..XXXXX. ",
|
||||
" ..XXXXXXXX. ",
|
||||
".oXXXXXXXXXX. ",
|
||||
".XoXXXXXXXXXX. ",
|
||||
".XXoXXXXXXXXXX. ",
|
||||
".XXXoXXXXXXXXX..",
|
||||
".XXXXoXXXXXX..O ",
|
||||
" .XXXXoXXX..O+O ",
|
||||
" .XXXXo..O++o..",
|
||||
" .XXX.O+++o.. ",
|
||||
" .XX.o+o.. ",
|
||||
" .X.o.. ",
|
||||
" ... "};
|
||||
|
||||
@@ -1,25 +1,25 @@
|
||||
/* XPM */
|
||||
static char * htmfoldr_xpm[] = {
|
||||
"16 16 6 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c #000080",
|
||||
"o c #c0c0c0",
|
||||
"O c #808080",
|
||||
"+ c Gray100",
|
||||
" ",
|
||||
" .. ",
|
||||
" ..XX. ",
|
||||
" ..XXXXX. ",
|
||||
" ..XXXXXXXX. ",
|
||||
".oXXXXXXXXXX. ",
|
||||
".XoXXXXXXXXXX. ",
|
||||
".XXoXXXXXXXXXX. ",
|
||||
".XXXoXXXXXXXXX..",
|
||||
".XXXXoXXXXXX..O ",
|
||||
" .XXXXoXXX..O+O ",
|
||||
" .XXXXo..O++o..",
|
||||
" .XXX.O+++o.. ",
|
||||
" .XX.o+o.. ",
|
||||
" .X.o.. ",
|
||||
" ... "};
|
||||
/* XPM */
|
||||
static char * htmfoldr_xpm[] = {
|
||||
"16 16 6 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c #000080",
|
||||
"o c #c0c0c0",
|
||||
"O c #808080",
|
||||
"+ c Gray100",
|
||||
" ",
|
||||
" .. ",
|
||||
" ..XX. ",
|
||||
" ..XXXXX. ",
|
||||
" ..XXXXXXXX. ",
|
||||
".oXXXXXXXXXX. ",
|
||||
".XoXXXXXXXXXX. ",
|
||||
".XXoXXXXXXXXXX. ",
|
||||
".XXXoXXXXXXXXX..",
|
||||
".XXXXoXXXXXX..O ",
|
||||
" .XXXXoXXX..O+O ",
|
||||
" .XXXXo..O++o..",
|
||||
" .XXX.O+++o.. ",
|
||||
" .XX.o+o.. ",
|
||||
" .X.o.. ",
|
||||
" ... "};
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
/* XPM */
|
||||
static char * htmoptns_xpm[] = {
|
||||
"16 15 2 1",
|
||||
" c None",
|
||||
". c #000000",
|
||||
" ",
|
||||
" .. ",
|
||||
" ... ",
|
||||
" .... ",
|
||||
" . ... ",
|
||||
" .. ... ",
|
||||
" . .. ",
|
||||
" .. ... ",
|
||||
" . .. ",
|
||||
" ......... ",
|
||||
" .. ... ",
|
||||
" . ... ",
|
||||
" .. ... ",
|
||||
" .... ....... ",
|
||||
" "};
|
||||
/* XPM */
|
||||
static char * htmoptns_xpm[] = {
|
||||
"16 15 2 1",
|
||||
" c None",
|
||||
". c #000000",
|
||||
" ",
|
||||
" .. ",
|
||||
" ... ",
|
||||
" .... ",
|
||||
" . ... ",
|
||||
" .. ... ",
|
||||
" . .. ",
|
||||
" .. ... ",
|
||||
" . .. ",
|
||||
" ......... ",
|
||||
" .. ... ",
|
||||
" . ... ",
|
||||
" .. ... ",
|
||||
" .... ....... ",
|
||||
" "};
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
/* XPM */
|
||||
static char * htmpage_xpm[] = {
|
||||
"16 16 4 1",
|
||||
" c None",
|
||||
". c #808080",
|
||||
"X c Gray100",
|
||||
"o c Black",
|
||||
" ",
|
||||
" .......... ",
|
||||
" .XXXXXXXX.. ",
|
||||
" .XXXXXXXXooo ",
|
||||
" .X......XXXo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .X........Xo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .X........Xo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .X........Xo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .X........Xo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" oooooooooooo "};
|
||||
/* XPM */
|
||||
static char * htmpage_xpm[] = {
|
||||
"16 16 4 1",
|
||||
" c None",
|
||||
". c #808080",
|
||||
"X c Gray100",
|
||||
"o c Black",
|
||||
" ",
|
||||
" .......... ",
|
||||
" .XXXXXXXX.. ",
|
||||
" .XXXXXXXXooo ",
|
||||
" .X......XXXo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .X........Xo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .X........Xo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .X........Xo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .X........Xo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" .XXXXXXXXXXo ",
|
||||
" oooooooooooo "};
|
||||
|
||||
34
art/tick.xpm
34
art/tick.xpm
@@ -1,17 +1,17 @@
|
||||
/* XPM */
|
||||
static char *tick_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"10 10 2 1",
|
||||
". c Gray0",
|
||||
" c None",
|
||||
/* pixels */
|
||||
" ",
|
||||
" ..",
|
||||
" ...",
|
||||
" ... ",
|
||||
".. ... ",
|
||||
"... ... ",
|
||||
" ..... ",
|
||||
" ... ",
|
||||
" . ",
|
||||
" "};
|
||||
/* XPM */
|
||||
static char *tick_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"10 10 2 1",
|
||||
". c Gray0",
|
||||
" c None",
|
||||
/* pixels */
|
||||
" ",
|
||||
" ..",
|
||||
" ...",
|
||||
" ... ",
|
||||
".. ... ",
|
||||
"... ... ",
|
||||
" ..... ",
|
||||
" ... ",
|
||||
" . ",
|
||||
" "};
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
/* XPM */
|
||||
static char * toparent_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" .. ",
|
||||
" .XX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" ....XXXX.... ",
|
||||
" .XXXX. ",
|
||||
" .XXXX..... ",
|
||||
" .XXXXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" .......... ",
|
||||
" "};
|
||||
/* XPM */
|
||||
static char * toparent_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" .. ",
|
||||
" .XX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" ....XXXX.... ",
|
||||
" .XXXX. ",
|
||||
" .XXXX..... ",
|
||||
" .XXXXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" .......... ",
|
||||
" "};
|
||||
|
||||
42
art/up.xpm
42
art/up.xpm
@@ -1,21 +1,21 @@
|
||||
/* XPM */
|
||||
static char * up_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" .. ",
|
||||
" .XX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" ....XXXX.... ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" ...... ",
|
||||
" "};
|
||||
/* XPM */
|
||||
static char * up_xpm[] = {
|
||||
"16 15 3 1",
|
||||
" c None",
|
||||
". c Black",
|
||||
"X c Gray100",
|
||||
" ",
|
||||
" .. ",
|
||||
" .XX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXXXX. ",
|
||||
" .XXXXXXXX. ",
|
||||
" ....XXXX.... ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" .XXXX. ",
|
||||
" ...... ",
|
||||
" "};
|
||||
|
||||
@@ -1,25 +1,25 @@
|
||||
/* XPM */
|
||||
static char *wxwin16x16_xpm[] = {
|
||||
"16 16 6 1",
|
||||
" c None",
|
||||
". c #000000",
|
||||
"X c #000084",
|
||||
"o c #FFFFFF",
|
||||
"O c #FFFF00",
|
||||
"+ c #FF0000",
|
||||
" ",
|
||||
" ",
|
||||
" ....... ",
|
||||
" .XXXXX. ",
|
||||
" .oXXXX. ",
|
||||
" .oXXX.......",
|
||||
".....oXXX.OOOOO.",
|
||||
".+++.XXXX.oOOOO.",
|
||||
".o++......oOOOO.",
|
||||
".o++++. .oOOOO.",
|
||||
".o++++. .OOOOO.",
|
||||
".+++++. .......",
|
||||
"....... ",
|
||||
" ",
|
||||
" ",
|
||||
" "};
|
||||
/* XPM */
|
||||
static char *wxwin16x16_xpm[] = {
|
||||
"16 16 6 1",
|
||||
" c None",
|
||||
". c #000000",
|
||||
"X c #000084",
|
||||
"o c #FFFFFF",
|
||||
"O c #FFFF00",
|
||||
"+ c #FF0000",
|
||||
" ",
|
||||
" ",
|
||||
" ....... ",
|
||||
" .XXXXX. ",
|
||||
" .oXXXX. ",
|
||||
" .oXXX.......",
|
||||
".....oXXX.OOOOO.",
|
||||
".+++.XXXX.oOOOO.",
|
||||
".o++......oOOOO.",
|
||||
".o++++. .oOOOO.",
|
||||
".o++++. .OOOOO.",
|
||||
".+++++. .......",
|
||||
"....... ",
|
||||
" ",
|
||||
" ",
|
||||
" "};
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
autogen.mk
|
||||
|
||||
autogen.mk is a makefile provided to automatically update the GNU autotools
|
||||
build system. It will run Bakefile, aclocal, and autoconf as appropriate.
|
||||
|
||||
The .m4 files required for running aclocal are located in build/aclocal.
|
||||
When upgrading software that wxWidgets depends on (for example, Bakefile,
|
||||
cppunit, GTK, SDL, or others) it is advisable to upgrade the .m4 files
|
||||
located in the build/aclocal directory.
|
||||
|
||||
It is particularly important that if you use a newer version of Bakefile
|
||||
to generate the Makefile.in files that you use the newer bakefile*.m4.
|
||||
Because build/autogen.mk is a Makefile it will automatically rerun
|
||||
aclocal and autoconf as necessary whenever any m4 in build/aclocal is
|
||||
newer than the generated aclocal.m4.
|
||||
|
||||
You can achieve this simply by copying the new bakefile*.m4 files from
|
||||
PREFIX/share/aclocal/ into the build/aclocal/ directory and
|
||||
rerunning make -f build/autogen.mk. Note that you should _not_ preserve
|
||||
source file times (don't use cp -p) or else it's possible your .m4 files
|
||||
will be older than the generated aclocal.m4).
|
||||
Example:
|
||||
cp /usr/share/aclocal/bakefile*.m4 build/aclocal/
|
||||
make -f build/autogen.mk
|
||||
|
||||
Please don't forget to commit updated .m4 files as well as updated aclocal.m4,
|
||||
configure, and Makefile.in files to wxWidgets.
|
||||
@@ -1,66 +0,0 @@
|
||||
# Created: 2005/03/12
|
||||
# Author: David Elliott
|
||||
|
||||
# Usage Example:
|
||||
# make -f build/autogen.mk ACLOCAL=aclocal-1.9
|
||||
|
||||
# This is a simple Makefile to update the UNIX build system in such a
|
||||
# way that doing a cvs diff on its output files should reveal only the
|
||||
# true changes, not meaningless differences due to slightly different
|
||||
# autoconf or aclocal m4 files.
|
||||
|
||||
# For aclocal: All necessary m4 files are located in the build/aclocal
|
||||
# directory. Running aclocal -I build/aclocal when using aclocal 1.9
|
||||
# will result in an aclocal.m4 which uses m4_include for these files.
|
||||
|
||||
ACLOCAL=aclocal
|
||||
AUTOCONF=autoconf
|
||||
BAKEFILE_GEN=bakefile_gen
|
||||
AUTOHACKS_PREPEND_INCLUDE_DIR=build/autoconf_prepend-include
|
||||
|
||||
# configure depends on everything else so this will build everything.
|
||||
.PHONY: all
|
||||
all: configure
|
||||
|
||||
.PHONY: autoconf_m4f
|
||||
|
||||
# Invoke make on wxAutohacks dir, but don't fail if it's not present
|
||||
autoconf_m4f:
|
||||
-make -C $(AUTOHACKS_PREPEND_INCLUDE_DIR)
|
||||
|
||||
BAKEFILES=\
|
||||
build/bakefiles/wx.bkl \
|
||||
build/bakefiles/common.bkl \
|
||||
build/bakefiles/files.bkl \
|
||||
build/bakefiles/monolithic.bkl \
|
||||
build/bakefiles/multilib.bkl \
|
||||
build/bakefiles/opengl.bkl \
|
||||
build/bakefiles/plugins.bkl \
|
||||
build/bakefiles/build_cfg.bkl
|
||||
|
||||
# Run bakefile-gen (which generates everything) whenever a bakefile is newer
|
||||
# than Makefile.in or autoconf_inc.m4.
|
||||
# This dep is obviously wrong but probably close enough
|
||||
autoconf_inc.m4 Makefile.in: $(BAKEFILES)
|
||||
cd build/bakefiles && \
|
||||
$(BAKEFILE_GEN) -f autoconf
|
||||
|
||||
# Run configure whenever configure.in, aclocal.m4 or autoconf_inc.m4 is updated
|
||||
# Depend on our custom autoconf.m4f
|
||||
configure: configure.in aclocal.m4 autoconf_inc.m4 autoconf_m4f
|
||||
$(AUTOCONF) -B $(AUTOHACKS_PREPEND_INCLUDE_DIR)
|
||||
|
||||
ACLOCAL_SOURCES = \
|
||||
build/aclocal/bakefile.m4 \
|
||||
build/aclocal/bakefile-lang.m4 \
|
||||
build/aclocal/cppunit.m4 \
|
||||
build/aclocal/gst-element-check.m4 \
|
||||
build/aclocal/gtk-2.0.m4 \
|
||||
build/aclocal/gtk.m4 \
|
||||
build/aclocal/pkg.m4 \
|
||||
build/aclocal/sdl.m4
|
||||
|
||||
# Run aclocal whenever acinclude or one of our local m4s is updated.
|
||||
aclocal.m4: configure.in acinclude.m4 $(ACLOCAL_SOURCES)
|
||||
$(ACLOCAL) -I build/aclocal
|
||||
|
||||
@@ -2960,33 +2960,17 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
</if>
|
||||
</set>
|
||||
|
||||
<!-- for 'make install', only the headers needed for the installed port -->
|
||||
<set var="ALL_HEADERS" make_var="1" hints="files">
|
||||
|
||||
<set var="ALL_BASE_HEADERS" make_var="1" hints="files">
|
||||
$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
|
||||
$(NET_CMN_HDR) $(NET_PLATFORM_HDR)
|
||||
$(XML_HDR) $(ODBC_HDR)
|
||||
$(ALL_GUI_HEADERS)
|
||||
</set>
|
||||
|
||||
|
||||
<!-- used by 'make dist', should include wxBase headers for all ports -->
|
||||
<set var="ALL_BASE_HEADERS" make_var="1" hints="files">
|
||||
$(BASE_CMN_HDR)
|
||||
$(BASE_UNIX_HDR)
|
||||
$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)
|
||||
$(BASE_MACOSX_HDR)
|
||||
$(BASE_PALMOS_HDR)
|
||||
$(BASE_MSDOS_HDR)
|
||||
$(NET_CMN_HDR)
|
||||
$(NET_UNIX_HDR)
|
||||
$(NET_WIN32_HDR) $(NET_WINCE_HDR)
|
||||
$(NET_OS2_HDR)
|
||||
$(NET_UNIX_HDR)
|
||||
$(NET_MAC_CARBONLIB_HDR)
|
||||
$(XML_HDR) $(ODBC_HDR)
|
||||
<set var="ALL_HEADERS" make_var="1" hints="files">
|
||||
$(ALL_BASE_HEADERS) $(ALL_GUI_HEADERS)
|
||||
</set>
|
||||
|
||||
<!-- used by 'make dist', should include wxBase sources for all ports -->
|
||||
<set var="ALL_BASE_SOURCES" make_var="1" hints="files">
|
||||
$(BASE_CMN_SRC)
|
||||
$(BASE_UNIX_SRC) $(BASE_WIN32_SRC) $(BASE_WINCE_SRC)
|
||||
|
||||
@@ -25,7 +25,6 @@ X11DIR = $(WXDIR)/src/x11
|
||||
X11INC = $(WXDIR)/include/wx/x11
|
||||
MGLDIR = $(WXDIR)/src/mgl
|
||||
MOTIFDIR = $(WXDIR)/src/motif
|
||||
MSDOSDIR = $(WXDIR)/src/msdos
|
||||
MSWDIR = $(WXDIR)/src/msw
|
||||
PMDIR = $(WXDIR)/src/os2
|
||||
MACDIR = $(WXDIR)/src/mac
|
||||
@@ -206,11 +205,9 @@ BASE_DIST: ALL_DIST
|
||||
mkdir $(DISTDIR)/include/wx/protocol
|
||||
mkdir $(DISTDIR)/include/wx/unix
|
||||
mkdir $(DISTDIR)/include/wx/xml
|
||||
mkdir $(DISTDIR)/include/wx/msdos
|
||||
mkdir $(DISTDIR)/include/wx/msw
|
||||
mkdir $(DISTDIR)/include/wx/html
|
||||
mkdir $(DISTDIR)/src/unix
|
||||
mkdir $(DISTDIR)/src/msdos
|
||||
mkdir $(DISTDIR)/src/msw
|
||||
cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt
|
||||
cp $(DOCDIR)/base/readme.txt $(DISTDIR)/README.txt
|
||||
@@ -385,12 +382,8 @@ UNIV_DIST: ALL_GUI_DIST
|
||||
MGL_DIST: UNIV_DIST
|
||||
cp $(WXDIR)/wxMGL.spec $(DISTDIR)
|
||||
cp $(INCDIR)/wx/mgl/*.h $(DISTDIR)/include/wx/mgl
|
||||
mkdir $(DISTDIR)/include/wx/msdos
|
||||
cp $(INCDIR)/wx/msdos/*.h $(DISTDIR)/include/wx/msdos
|
||||
cp $(SRCDIR)/mgl/make* $(DISTDIR)/src/mgl
|
||||
cp $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl
|
||||
mkdir $(DISTDIR)/src/msdos
|
||||
cp $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos
|
||||
mkdir $(DISTDIR)/contrib
|
||||
cp -R $(WXDIR)/contrib $(DISTDIR)
|
||||
|
||||
|
||||
@@ -218,7 +218,7 @@
|
||||
|
||||
<!-- add "make dist" target to autoconf: -->
|
||||
<set var="VARS_DONT_ELIMINATE" append="1">
|
||||
ALL_BASE_HEADERS ALL_BASE_SOURCES WX_VERSION
|
||||
ALL_BASE_SOURCES WX_VERSION
|
||||
</set>
|
||||
<fragment format="autoconf" file="make_dist.mk"/>
|
||||
|
||||
|
||||
@@ -2,11 +2,6 @@
|
||||
|
||||
A paint event is sent when a window's contents needs to be repainted.
|
||||
|
||||
Please notice that in general it is impossible to change the drawing of a
|
||||
standard control (such as \helpref{wxButton}{wxbutton}) and so you shouldn't
|
||||
attempt to handle paint events for them as even if it might work on some
|
||||
platforms, this is inherently not portable and won't work everywhere.
|
||||
|
||||
\wxheading{Derived from}
|
||||
|
||||
\helpref{wxEvent}{wxevent}\\
|
||||
|
||||
@@ -62,7 +62,9 @@ public:
|
||||
|
||||
virtual bool SetShape(const wxRegion& region);
|
||||
|
||||
#if wxABI_VERSION >= 20602
|
||||
virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
|
||||
#endif
|
||||
|
||||
virtual bool Show(bool show = TRUE);
|
||||
|
||||
@@ -108,10 +110,6 @@ public:
|
||||
long m_gdkFunc,
|
||||
m_gdkDecor;
|
||||
|
||||
// private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and
|
||||
// wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle.
|
||||
int m_urgency_hint;
|
||||
|
||||
protected:
|
||||
// common part of all ctors
|
||||
void Init();
|
||||
|
||||
@@ -62,7 +62,9 @@ public:
|
||||
|
||||
virtual bool SetShape(const wxRegion& region);
|
||||
|
||||
#if wxABI_VERSION >= 20602
|
||||
virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
|
||||
#endif
|
||||
|
||||
virtual bool Show(bool show = TRUE);
|
||||
|
||||
@@ -108,10 +110,6 @@ public:
|
||||
long m_gdkFunc,
|
||||
m_gdkDecor;
|
||||
|
||||
// private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and
|
||||
// wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle.
|
||||
int m_urgency_hint;
|
||||
|
||||
protected:
|
||||
// common part of all ctors
|
||||
void Init();
|
||||
|
||||
@@ -561,15 +561,12 @@ DECLARE_LOG_FUNCTION2(SysError, long, lErrCode);
|
||||
DECLARE_LOG_FUNCTION2(Trace, wxTraceMask, mask);
|
||||
#else //!debug
|
||||
// these functions do nothing in release builds
|
||||
|
||||
// note that leaving out "fmt" in the vararg functions provokes a warning
|
||||
// from SGI CC: "the last argument of the varargs function is unnamed"
|
||||
inline void wxVLogDebug(const wxChar *, va_list) { }
|
||||
inline void wxLogDebug(const wxChar *fmt, ...) { wxUnusedVar(fmt); }
|
||||
inline void wxLogDebug(const wxChar *, ...) { }
|
||||
inline void wxVLogTrace(wxTraceMask, const wxChar *, va_list) { }
|
||||
inline void wxLogTrace(wxTraceMask, const wxChar *fmt, ...) { wxUnusedVar(fmt); }
|
||||
inline void wxLogTrace(wxTraceMask, const wxChar *, ...) { }
|
||||
inline void wxVLogTrace(const wxChar *, const wxChar *, va_list) { }
|
||||
inline void wxLogTrace(const wxChar *, const wxChar *fmt, ...) { wxUnusedVar(fmt); }
|
||||
inline void wxLogTrace(const wxChar *, const wxChar *, ...) { }
|
||||
#endif // debug/!debug
|
||||
|
||||
// wxLogFatalError helper: show the (fatal) error to the user in a safe way,
|
||||
|
||||
@@ -1114,7 +1114,7 @@
|
||||
// Default is 1 if supported by the compiler (VC++ and recent BC++ only).
|
||||
//
|
||||
// Recommended setting: 1, set to 0 if your programs never crash
|
||||
#define wxUSE_CRASHREPORT 0
|
||||
#define wxUSE_CRASHREPORT 1
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// obsolete settings
|
||||
|
||||
@@ -1,44 +1,44 @@
|
||||
/* XPM */
|
||||
static const char *sample_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 6 1",
|
||||
" c black",
|
||||
". c navy",
|
||||
"X c red",
|
||||
"o c yellow",
|
||||
"O c gray100",
|
||||
"+ c None",
|
||||
/* pixels */
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++ ++++++++++",
|
||||
"++++++++ ............ ++++++++++",
|
||||
"++++++++ ............ ++++++++++",
|
||||
"++++++++ .OO......... ++++++++++",
|
||||
"++++++++ .OO......... ++++++++++",
|
||||
"++++++++ .OO......... ++++++++++",
|
||||
"++++++++ .OO...... ",
|
||||
"++++++++ .OO...... oooooooooooo ",
|
||||
" .OO...... oooooooooooo ",
|
||||
" XXXXXXX .OO...... oOOooooooooo ",
|
||||
" XXXXXXX .OO...... oOOooooooooo ",
|
||||
" XOOXXXX ......... oOOooooooooo ",
|
||||
" XOOXXXX ......... oOOooooooooo ",
|
||||
" XOOXXXX oOOooooooooo ",
|
||||
" XOOXXXXXXXXX ++++ oOOooooooooo ",
|
||||
" XOOXXXXXXXXX ++++ oOOooooooooo ",
|
||||
" XOOXXXXXXXXX ++++ oOOooooooooo ",
|
||||
" XOOXXXXXXXXX ++++ oooooooooooo ",
|
||||
" XOOXXXXXXXXX ++++ oooooooooooo ",
|
||||
" XXXXXXXXXXXX ++++ ",
|
||||
" XXXXXXXXXXXX ++++++++++++++++++",
|
||||
" ++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++"
|
||||
};
|
||||
/* XPM */
|
||||
static const char *sample_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"32 32 6 1",
|
||||
" c black",
|
||||
". c navy",
|
||||
"X c red",
|
||||
"o c yellow",
|
||||
"O c gray100",
|
||||
"+ c None",
|
||||
/* pixels */
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++ ++++++++++",
|
||||
"++++++++ ............ ++++++++++",
|
||||
"++++++++ ............ ++++++++++",
|
||||
"++++++++ .OO......... ++++++++++",
|
||||
"++++++++ .OO......... ++++++++++",
|
||||
"++++++++ .OO......... ++++++++++",
|
||||
"++++++++ .OO...... ",
|
||||
"++++++++ .OO...... oooooooooooo ",
|
||||
" .OO...... oooooooooooo ",
|
||||
" XXXXXXX .OO...... oOOooooooooo ",
|
||||
" XXXXXXX .OO...... oOOooooooooo ",
|
||||
" XOOXXXX ......... oOOooooooooo ",
|
||||
" XOOXXXX ......... oOOooooooooo ",
|
||||
" XOOXXXX oOOooooooooo ",
|
||||
" XOOXXXXXXXXX ++++ oOOooooooooo ",
|
||||
" XOOXXXXXXXXX ++++ oOOooooooooo ",
|
||||
" XOOXXXXXXXXX ++++ oOOooooooooo ",
|
||||
" XOOXXXXXXXXX ++++ oooooooooooo ",
|
||||
" XOOXXXXXXXXX ++++ oooooooooooo ",
|
||||
" XXXXXXXXXXXX ++++ ",
|
||||
" XXXXXXXXXXXX ++++++++++++++++++",
|
||||
" ++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++",
|
||||
"++++++++++++++++++++++++++++++++"
|
||||
};
|
||||
|
||||
173
samples/tab/Makefile.in
Normal file
173
samples/tab/Makefile.in
Normal file
@@ -0,0 +1,173 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.1.6 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
|
||||
@MAKE_SET@
|
||||
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
INSTALL = @INSTALL@
|
||||
EXEEXT = @EXEEXT@
|
||||
RESCOMP = @RESCOMP@
|
||||
SETFILE = @SETFILE@
|
||||
NM = @NM@
|
||||
srcdir = @srcdir@
|
||||
top_srcdir = @top_srcdir@
|
||||
top_builddir = @top_builddir@
|
||||
LDFLAGS_GUI = @LDFLAGS_GUI@
|
||||
CXX = @CXX@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
|
||||
TOOLKIT = @TOOLKIT@
|
||||
TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
|
||||
TOOLKIT_VERSION = @TOOLKIT_VERSION@
|
||||
TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
|
||||
EXTRALIBS = @EXTRALIBS@
|
||||
EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
||||
HOST_SUFFIX = @HOST_SUFFIX@
|
||||
SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
|
||||
SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
|
||||
|
||||
### Variables: ###
|
||||
|
||||
DESTDIR =
|
||||
WX_RELEASE = 2.5
|
||||
WX_VERSION = $(WX_RELEASE).4
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
TAB_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
|
||||
$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
|
||||
TAB_OBJECTS = \
|
||||
$(__tab_os2_lib_res) \
|
||||
tab_tab.o \
|
||||
$(__tab___win32rc)
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
@COND_DEPS_TRACKING_0@CXXC = $(CXX)
|
||||
@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
|
||||
@COND_USE_GUI_0@PORTNAME = base
|
||||
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
|
||||
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
|
||||
@COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT@WXDEBUGFLAG = d
|
||||
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
|
||||
@COND_UNICODE_1@WXUNICODEFLAG = u
|
||||
@COND_WXUNIV_1@WXUNIVNAME = univ
|
||||
@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
|
||||
@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
|
||||
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
|
||||
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
|
||||
@COND_PLATFORM_MAC_1@__tab___mac_setfilecmd = $(SETFILE) -a C tab$(EXEEXT)
|
||||
@COND_PLATFORM_MAC_1@__tab___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
|
||||
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
|
||||
@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
|
||||
@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
|
||||
@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
|
||||
COND_PLATFORM_OS2_1___tab___os2_emxbindcmd = $(NM) tab$(EXEEXT) | if grep -q \
|
||||
pmwin.763 ; then emxbind -ep tab$(EXEEXT) ; fi
|
||||
@COND_PLATFORM_OS2_1@__tab___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___tab___os2_emxbindcmd)
|
||||
@COND_PLATFORM_OS2_1@__tab_os2_lib_res = \
|
||||
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
|
||||
@COND_PLATFORM_MACOSX_1@__tab_bundle___depname = tab_bundle
|
||||
@COND_TOOLKIT_COCOA@____tab_BUNDLE_TGT_REF_DEP = tab.app/Contents/PkgInfo
|
||||
@COND_TOOLKIT_MAC@____tab_BUNDLE_TGT_REF_DEP = tab.app/Contents/PkgInfo
|
||||
COND_MONOLITHIC_0___WXLIB_CORE_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
|
||||
COND_MONOLITHIC_0___WXLIB_BASE_p = \
|
||||
-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
|
||||
@COND_PLATFORM_WIN32_1@__tab___win32rc = tab_tab_rc.o
|
||||
COND_MONOLITHIC_1___WXLIB_MONO_p = \
|
||||
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
|
||||
@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
|
||||
@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ = \
|
||||
@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
|
||||
@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ = \
|
||||
@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
|
||||
@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
|
||||
@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
|
||||
@COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
|
||||
@COND_WXUSE_ODBC_BUILTIN@ -lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
|
||||
-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
|
||||
@COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
|
||||
@COND_WXUSE_EXPAT_BUILTIN@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
|
||||
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
|
||||
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
|
||||
$(srcdir)/../../samples -i $(top_srcdir)/include -o tab$(EXEEXT) Carbon.r \
|
||||
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.r sample.r
|
||||
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: tab$(EXEEXT) $(__tab_bundle___depname)
|
||||
|
||||
install: all
|
||||
|
||||
uninstall:
|
||||
|
||||
install-strip: install
|
||||
|
||||
clean:
|
||||
rm -rf ./.deps ./.pch
|
||||
rm -f ./*.o
|
||||
rm -f tab$(EXEEXT)
|
||||
rm -rf tab.app
|
||||
|
||||
distclean: clean
|
||||
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
|
||||
|
||||
tab$(EXEEXT): $(TAB_OBJECTS) $(__tab___win32rc)
|
||||
$(CXX) -o $@ $(TAB_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI)
|
||||
$(__tab___mac_rezcmd)
|
||||
$(__tab___mac_setfilecmd)
|
||||
$(__tab___os2_emxbindcmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
tab.app/Contents/PkgInfo: tab$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
|
||||
mkdir -p tab.app/Contents
|
||||
mkdir -p tab.app/Contents/MacOS
|
||||
mkdir -p tab.app/Contents/Resources
|
||||
|
||||
|
||||
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
|
||||
-e "s/EXECUTABLE/tab/" \
|
||||
-e "s/VERSION/$(WX_VERSION)/" \
|
||||
$(top_srcdir)/src/mac/carbon/Info.plist.in >tab.app/Contents/Info.plist
|
||||
|
||||
|
||||
echo -n "APPL????" >tab.app/Contents/PkgInfo
|
||||
|
||||
|
||||
ln -f tab$(EXEEXT) tab.app/Contents/MacOS/tab
|
||||
|
||||
|
||||
cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).4.rsrc tab.app/Contents/Resources/tab.rsrc
|
||||
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns tab.app/Contents/Resources/wxmac.icns
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@tab_bundle: $(____tab_BUNDLE_TGT_REF_DEP)
|
||||
|
||||
tab_tab.o: $(srcdir)/tab.cpp
|
||||
$(CXXC) -c -o $@ $(TAB_CXXFLAGS) $(srcdir)/tab.cpp
|
||||
|
||||
tab_tab_rc.o: $(srcdir)/tab.rc
|
||||
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
|
||||
|
||||
|
||||
# Include dependency info, if present:
|
||||
@IF_GNU_MAKE@-include .deps/*.d
|
||||
|
||||
.PHONY: all install uninstall clean distclean tab_bundle
|
||||
@@ -40,7 +40,6 @@ WX_IMPLEMENT_POSER(wxPoserNSMenu);
|
||||
wxCocoaNSMenu *menu = wxCocoaNSMenu::GetFromCocoa(self);
|
||||
if(menu)
|
||||
menu->Cocoa_dealloc();
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
@end // wxPoserNSMenu
|
||||
|
||||
@@ -64,7 +64,6 @@
|
||||
- (void)dealloc
|
||||
{
|
||||
[m_image release];
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
- (NSSize)sizeOfLabel:(BOOL)shouldTruncateLabel
|
||||
|
||||
@@ -235,14 +235,11 @@ static const long MILLISECONDS_PER_DAY = 86400000l;
|
||||
// (i.e. JDN(Jan 1, 1970) = 2440587.5)
|
||||
static const long EPOCH_JDN = 2440587l;
|
||||
|
||||
// used only in asserts
|
||||
#ifdef __WXDEBUG__
|
||||
// the date of JDN -0.5 (as we don't work with fractional parts, this is the
|
||||
// reference date for us) is Nov 24, 4714BC
|
||||
static const int JDN_0_YEAR = -4713;
|
||||
static const int JDN_0_MONTH = wxDateTime::Nov;
|
||||
static const int JDN_0_DAY = 24;
|
||||
#endif // __WXDEBUG__
|
||||
|
||||
// the constants used for JDN calculations
|
||||
static const long JDN_OFFSET = 32046l;
|
||||
|
||||
@@ -195,10 +195,10 @@ static const wxChar* gs_encodingNames[WXSIZEOF(gs_encodingDescs)][10] =
|
||||
|
||||
{ wxT( "UTF-7" ), NULL },
|
||||
{ wxT( "UTF-8" ), NULL },
|
||||
{ wxT( "UTF-16" ), wxT("UCS-2"), wxT("UCS2"), NULL },
|
||||
{ wxT( "UTF-16BE" ), wxT("UCS-2BE"), NULL },
|
||||
{ wxT( "UTF-16LE" ), wxT("UCS-2LE"), NULL },
|
||||
{ wxT( "UTF-32" ), wxT( "UCS-4" ), wxT("UCS4"), NULL },
|
||||
{ wxT( "UTF-16" ), NULL },
|
||||
{ wxT( "UTF-16BE" ), NULL },
|
||||
{ wxT( "UTF-16LE" ), NULL },
|
||||
{ wxT( "UTF-32" ), wxT( "UCS-4" ), NULL },
|
||||
{ wxT( "UTF-32BE" ), wxT( "UCS-4BE" ), NULL },
|
||||
{ wxT( "UTF-32LE" ), wxT( "UCS-4LE" ), NULL },
|
||||
|
||||
|
||||
@@ -57,6 +57,10 @@
|
||||
#define wxHAVE_WIN32_MB2WC
|
||||
#endif // __WIN32__ but !__WXMICROWIN__
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// headers
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#ifdef __SALFORDC__
|
||||
#include <clib.h>
|
||||
#endif
|
||||
@@ -82,6 +86,35 @@
|
||||
|
||||
#define TRACE_STRCONV _T("strconv")
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// macros
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#define BSWAP_UCS4(str, len) { unsigned _c; for (_c=0; _c<len; _c++) str[_c]=wxUINT32_SWAP_ALWAYS(str[_c]); }
|
||||
#define BSWAP_UTF16(str, len) { unsigned _c; for (_c=0; _c<len; _c++) str[_c]=wxUINT16_SWAP_ALWAYS(str[_c]); }
|
||||
|
||||
#if SIZEOF_WCHAR_T == 4
|
||||
#define WC_NAME "UCS4"
|
||||
#define WC_BSWAP BSWAP_UCS4
|
||||
#ifdef WORDS_BIGENDIAN
|
||||
#define WC_NAME_BEST "UCS-4BE"
|
||||
#else
|
||||
#define WC_NAME_BEST "UCS-4LE"
|
||||
#endif
|
||||
#elif SIZEOF_WCHAR_T == 2
|
||||
#define WC_NAME "UTF16"
|
||||
#define WC_BSWAP BSWAP_UTF16
|
||||
#define WC_UTF16
|
||||
#ifdef WORDS_BIGENDIAN
|
||||
#define WC_NAME_BEST "UTF-16BE"
|
||||
#else
|
||||
#define WC_NAME_BEST "UTF-16LE"
|
||||
#endif
|
||||
#else // sizeof(wchar_t) != 2 nor 4
|
||||
// does this ever happen?
|
||||
#error "Unknown sizeof(wchar_t): please report this to wx-dev@lists.wxwindows.org"
|
||||
#endif
|
||||
|
||||
// ============================================================================
|
||||
// implementation
|
||||
// ============================================================================
|
||||
@@ -1280,19 +1313,6 @@ size_t wxMBConvUTF32swap::WC2MB(char *buf, const wchar_t *psz, size_t n) const
|
||||
|
||||
#define ICONV_CHAR_CAST(x) ((ICONV_CONST char **)(x))
|
||||
|
||||
#define ICONV_T_INVALID ((iconv_t)-1)
|
||||
|
||||
#if SIZEOF_WCHAR_T == 4
|
||||
#define WC_BSWAP wxUINT32_SWAP_ALWAYS
|
||||
#define WC_ENC wxFONTENCODING_UTF32
|
||||
#elif SIZEOF_WCHAR_T == 2
|
||||
#define WC_BSWAP wxUINT16_SWAP_ALWAYS
|
||||
#define WC_ENC wxFONTENCODING_UTF16
|
||||
#else // sizeof(wchar_t) != 2 nor 4
|
||||
// does this ever happen?
|
||||
#error "Unknown sizeof(wchar_t): please report this to wx-dev@lists.wxwindows.org"
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxMBConv_iconv: encapsulates an iconv character set
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -1307,7 +1327,7 @@ public:
|
||||
virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const;
|
||||
|
||||
bool IsOk() const
|
||||
{ return (m2w != ICONV_T_INVALID) && (w2m != ICONV_T_INVALID); }
|
||||
{ return (m2w != (iconv_t)-1) && (w2m != (iconv_t)-1); }
|
||||
|
||||
protected:
|
||||
// the iconv handlers used to translate from multibyte to wide char and in
|
||||
@@ -1322,7 +1342,7 @@ protected:
|
||||
private:
|
||||
// the name (for iconv_open()) of a wide char charset -- if none is
|
||||
// available on this machine, it will remain NULL
|
||||
static wxString ms_wcCharsetName;
|
||||
static const char *ms_wcCharsetName;
|
||||
|
||||
// true if the wide char encoding we use (i.e. ms_wcCharsetName) has
|
||||
// different endian-ness than the native one
|
||||
@@ -1341,7 +1361,7 @@ WXDLLIMPEXP_BASE wxMBConv* new_wxMBConv_iconv( const wxChar* name )
|
||||
return result;
|
||||
}
|
||||
|
||||
wxString wxMBConv_iconv::ms_wcCharsetName;
|
||||
const char *wxMBConv_iconv::ms_wcCharsetName = NULL;
|
||||
bool wxMBConv_iconv::ms_wcNeedsSwap = false;
|
||||
|
||||
wxMBConv_iconv::wxMBConv_iconv(const wxChar *name)
|
||||
@@ -1351,111 +1371,91 @@ wxMBConv_iconv::wxMBConv_iconv(const wxChar *name)
|
||||
const wxCharBuffer cname(wxString(name).ToAscii());
|
||||
|
||||
// check for charset that represents wchar_t:
|
||||
if ( ms_wcCharsetName.empty() )
|
||||
if (ms_wcCharsetName == NULL)
|
||||
{
|
||||
#if wxUSE_FONTMAP
|
||||
const wxChar **names = wxFontMapperBase::GetAllEncodingNames(WC_ENC);
|
||||
#else // !wxUSE_FONTMAP
|
||||
static const wxChar *names[] =
|
||||
ms_wcNeedsSwap = false;
|
||||
|
||||
// try charset with explicit bytesex info (e.g. "UCS-4LE"):
|
||||
ms_wcCharsetName = WC_NAME_BEST;
|
||||
m2w = iconv_open(ms_wcCharsetName, cname);
|
||||
|
||||
if (m2w == (iconv_t)-1)
|
||||
{
|
||||
#if SIZEOF_WCHAR_T == 4
|
||||
_T("UCS-4"),
|
||||
#elif SIZEOF_WCHAR_T = 2
|
||||
_T("UCS-2"),
|
||||
#endif
|
||||
NULL
|
||||
};
|
||||
#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
|
||||
// try charset w/o bytesex info (e.g. "UCS4")
|
||||
// and check for bytesex ourselves:
|
||||
ms_wcCharsetName = WC_NAME;
|
||||
m2w = iconv_open(ms_wcCharsetName, cname);
|
||||
|
||||
for ( ; *names; ++names )
|
||||
{
|
||||
const wxString name(*names);
|
||||
|
||||
// first try charset with explicit bytesex info (e.g. "UCS-4LE"):
|
||||
wxString nameXE(name);
|
||||
#ifdef WORDS_BIGENDIAN
|
||||
nameXE += _T("BE");
|
||||
#else // little endian
|
||||
nameXE += _T("LE");
|
||||
#endif
|
||||
|
||||
m2w = iconv_open(nameXE.ToAscii(), cname);
|
||||
if ( m2w == ICONV_T_INVALID )
|
||||
// last bet, try if it knows WCHAR_T pseudo-charset
|
||||
if (m2w == (iconv_t)-1)
|
||||
{
|
||||
// try charset w/o bytesex info (e.g. "UCS4")
|
||||
m2w = iconv_open(name.ToAscii(), cname);
|
||||
ms_wcCharsetName = "WCHAR_T";
|
||||
m2w = iconv_open(ms_wcCharsetName, cname);
|
||||
}
|
||||
|
||||
// and check for bytesex ourselves:
|
||||
if ( m2w != ICONV_T_INVALID )
|
||||
if (m2w != (iconv_t)-1)
|
||||
{
|
||||
char buf[2], *bufPtr;
|
||||
wchar_t wbuf[2], *wbufPtr;
|
||||
size_t insz, outsz;
|
||||
size_t res;
|
||||
|
||||
buf[0] = 'A';
|
||||
buf[1] = 0;
|
||||
wbuf[0] = 0;
|
||||
insz = 2;
|
||||
outsz = SIZEOF_WCHAR_T * 2;
|
||||
wbufPtr = wbuf;
|
||||
bufPtr = buf;
|
||||
|
||||
res = iconv(m2w, ICONV_CHAR_CAST(&bufPtr), &insz,
|
||||
(char**)&wbufPtr, &outsz);
|
||||
|
||||
if (ICONV_FAILED(res, insz))
|
||||
{
|
||||
char buf[2], *bufPtr;
|
||||
wchar_t wbuf[2], *wbufPtr;
|
||||
size_t insz, outsz;
|
||||
size_t res;
|
||||
|
||||
buf[0] = 'A';
|
||||
buf[1] = 0;
|
||||
wbuf[0] = 0;
|
||||
insz = 2;
|
||||
outsz = SIZEOF_WCHAR_T * 2;
|
||||
wbufPtr = wbuf;
|
||||
bufPtr = buf;
|
||||
|
||||
res = iconv(m2w, ICONV_CHAR_CAST(&bufPtr), &insz,
|
||||
(char**)&wbufPtr, &outsz);
|
||||
|
||||
if (ICONV_FAILED(res, insz))
|
||||
{
|
||||
wxLogLastError(wxT("iconv"));
|
||||
wxLogError(_("Conversion to charset '%s' doesn't work."),
|
||||
name.c_str());
|
||||
}
|
||||
else // ok, can convert to this encoding, remember it
|
||||
{
|
||||
ms_wcCharsetName = name;
|
||||
ms_wcNeedsSwap = wbuf[0] != (wchar_t)buf[0];
|
||||
}
|
||||
ms_wcCharsetName = NULL;
|
||||
wxLogLastError(wxT("iconv"));
|
||||
wxLogError(_("Conversion to charset '%s' doesn't work."), name);
|
||||
}
|
||||
else
|
||||
{
|
||||
ms_wcNeedsSwap = wbuf[0] != (wchar_t)buf[0];
|
||||
}
|
||||
}
|
||||
else // use charset not requiring byte swapping
|
||||
else
|
||||
{
|
||||
ms_wcCharsetName = nameXE;
|
||||
ms_wcCharsetName = NULL;
|
||||
|
||||
// VS: we must not output an error here, since wxWidgets will safely
|
||||
// fall back to using wxEncodingConverter.
|
||||
wxLogTrace(TRACE_STRCONV, wxT("Impossible to convert to/from charset '%s' with iconv, falling back to wxEncodingConverter."), name);
|
||||
}
|
||||
}
|
||||
|
||||
wxLogTrace(TRACE_STRCONV,
|
||||
wxT("iconv wchar_t charset is \"%s\"%s"),
|
||||
ms_wcCharsetName.empty() ? _T("<none>")
|
||||
: ms_wcCharsetName.c_str(),
|
||||
ms_wcNeedsSwap ? _T(" (needs swap)")
|
||||
: _T(""));
|
||||
wxT("wchar_t charset is '%s', needs swap: %i"),
|
||||
ms_wcCharsetName ? ms_wcCharsetName : "<none>", ms_wcNeedsSwap);
|
||||
}
|
||||
else // we already have ms_wcCharsetName
|
||||
{
|
||||
m2w = iconv_open(ms_wcCharsetName.ToAscii(), cname);
|
||||
m2w = iconv_open(ms_wcCharsetName, cname);
|
||||
}
|
||||
|
||||
if ( ms_wcCharsetName.empty() )
|
||||
// NB: don't ever pass NULL to iconv_open(), it may crash!
|
||||
if ( ms_wcCharsetName )
|
||||
{
|
||||
w2m = ICONV_T_INVALID;
|
||||
w2m = iconv_open( cname, ms_wcCharsetName);
|
||||
}
|
||||
else
|
||||
{
|
||||
w2m = iconv_open(cname, ms_wcCharsetName.ToAscii());
|
||||
if ( w2m == ICONV_T_INVALID )
|
||||
{
|
||||
wxLogTrace(TRACE_STRCONV,
|
||||
wxT("\"%s\" -> \"%s\" works but not the converse!?"),
|
||||
ms_wcCharsetName.c_str(), cname.data());
|
||||
}
|
||||
w2m = (iconv_t)-1;
|
||||
}
|
||||
}
|
||||
|
||||
wxMBConv_iconv::~wxMBConv_iconv()
|
||||
{
|
||||
if ( m2w != ICONV_T_INVALID )
|
||||
if ( m2w != (iconv_t)-1 )
|
||||
iconv_close(m2w);
|
||||
if ( w2m != ICONV_T_INVALID )
|
||||
if ( w2m != (iconv_t)-1 )
|
||||
iconv_close(w2m);
|
||||
}
|
||||
|
||||
@@ -1489,8 +1489,7 @@ size_t wxMBConv_iconv::MB2WC(wchar_t *buf, const char *psz, size_t n) const
|
||||
if (ms_wcNeedsSwap)
|
||||
{
|
||||
// convert to native endianness
|
||||
for ( unsigned n = 0; n < res; n++ )
|
||||
buf[n] = WC_BSWAP(buf[n]);
|
||||
WC_BSWAP(buf /* _not_ bufPtr */, res)
|
||||
}
|
||||
|
||||
// NB: iconv was given only strlen(psz) characters on input, and so
|
||||
@@ -1543,13 +1542,13 @@ size_t wxMBConv_iconv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
|
||||
if (ms_wcNeedsSwap)
|
||||
{
|
||||
// need to copy to temp buffer to switch endianness
|
||||
// (doing WC_BSWAP twice on the original buffer won't help, as it
|
||||
// this absolutely doesn't rock!
|
||||
// (no, doing WC_BSWAP twice on the original buffer won't help, as it
|
||||
// could be in read-only memory, or be accessed in some other thread)
|
||||
tmpbuf = (wchar_t *)malloc(inbuf + SIZEOF_WCHAR_T);
|
||||
for ( size_t n = 0; n < inbuf; n++ )
|
||||
tmpbuf[n] = WC_BSWAP(psz[n]);
|
||||
tmpbuf[inbuf] = L'\0';
|
||||
psz = tmpbuf;
|
||||
tmpbuf=(wchar_t*)malloc((inbuf+1)*SIZEOF_WCHAR_T);
|
||||
memcpy(tmpbuf,psz,(inbuf+1)*SIZEOF_WCHAR_T);
|
||||
WC_BSWAP(tmpbuf, inbuf)
|
||||
psz=tmpbuf;
|
||||
}
|
||||
|
||||
if (buf)
|
||||
|
||||
@@ -105,16 +105,17 @@ static void wxgtk_window_set_urgency_hint (GtkWindow *win,
|
||||
XFree(wm_hints);
|
||||
}
|
||||
|
||||
static gint gtk_frame_urgency_timer_callback( wxTopLevelWindowGTK *win )
|
||||
static gint gtk_frame_urgency_timer_callback( GtkWidget *win )
|
||||
{
|
||||
#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2,7,0)
|
||||
if(!gtk_check_version(2,7,0))
|
||||
gtk_window_set_urgency_hint(GTK_WINDOW( win->m_widget ), FALSE);
|
||||
gtk_window_set_urgency_hint(GTK_WINDOW( win ), FALSE);
|
||||
else
|
||||
#endif
|
||||
wxgtk_window_set_urgency_hint(GTK_WINDOW( win->m_widget ), FALSE);
|
||||
wxgtk_window_set_urgency_hint(GTK_WINDOW( win ), FALSE);
|
||||
|
||||
win->m_urgency_hint = -2;
|
||||
//BCI: argument from GtkWidget* to wxTopLevelWindowGTK* && win->m_urgency_hint = -2;
|
||||
gtk_object_set_data(GTK_OBJECT(win), "m_urgency_hint", GINT_TO_POINTER(-2));
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
@@ -151,10 +152,12 @@ static gint gtk_frame_focus_in_callback( GtkWidget *widget,
|
||||
// wxPrintf( wxT("active: %s\n"), win->GetTitle().c_str() );
|
||||
|
||||
// MR: wxRequestUserAttention related block
|
||||
switch( win->m_urgency_hint )
|
||||
//BCI: switch(win->m_urgency_hint)
|
||||
switch( GPOINTER_TO_INT(gtk_object_get_data( GTK_OBJECT(widget), "m_urgency_hint") ) )
|
||||
{
|
||||
default:
|
||||
gtk_timeout_remove( win->m_urgency_hint );
|
||||
//BCI:
|
||||
gtk_timeout_remove( GPOINTER_TO_INT(gtk_object_get_data( GTK_OBJECT(widget), "m_urgency_hint") ) );
|
||||
// no break, fallthrough to remove hint too
|
||||
case -1:
|
||||
#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2,7,0)
|
||||
@@ -166,7 +169,8 @@ static gint gtk_frame_focus_in_callback( GtkWidget *widget,
|
||||
wxgtk_window_set_urgency_hint(GTK_WINDOW( widget ), FALSE);
|
||||
}
|
||||
|
||||
win->m_urgency_hint = -2;
|
||||
//BCI: win->m_urgency_hint = -2;
|
||||
gtk_object_set_data( GTK_OBJECT(widget), "m_urgency_hint", GINT_TO_POINTER(-2) );
|
||||
break;
|
||||
|
||||
case -2: break;
|
||||
@@ -483,7 +487,12 @@ void wxTopLevelWindowGTK::Init()
|
||||
m_gdkDecor = m_gdkFunc = 0;
|
||||
m_grabbed = false;
|
||||
|
||||
m_urgency_hint = -2;
|
||||
//BCI: header wx/gtk/toplevel.h:
|
||||
// private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and
|
||||
// wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle.
|
||||
// int m_urgency_hint;
|
||||
|
||||
//BCI: m_urgency_hint = -2;
|
||||
}
|
||||
|
||||
bool wxTopLevelWindowGTK::Create( wxWindow *parent,
|
||||
@@ -557,6 +566,9 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
|
||||
}
|
||||
}
|
||||
|
||||
// BCI:
|
||||
gtk_object_set_data( GTK_OBJECT(m_widget), "m_urgency_hint", GINT_TO_POINTER(-2) );
|
||||
|
||||
wxWindow *topParent = wxGetTopLevelParent(m_parent);
|
||||
if (topParent && (((GTK_IS_WINDOW(topParent->m_widget)) &&
|
||||
(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)) ||
|
||||
@@ -1337,10 +1349,17 @@ void wxTopLevelWindowGTK::RequestUserAttention(int flags)
|
||||
// wxYieldIfNeeded ensures the processing of it, but can have unwanted side effects - MR
|
||||
::wxYieldIfNeeded();
|
||||
|
||||
/*BCI:
|
||||
if(m_urgency_hint >= 0)
|
||||
gtk_timeout_remove(m_urgency_hint);
|
||||
*/
|
||||
int urgency_hint = GPOINTER_TO_INT( gtk_object_get_data( GTK_OBJECT(m_widget), "m_urgency_hint") );
|
||||
if(urgency_hint >= 0)
|
||||
gtk_timeout_remove(urgency_hint);
|
||||
//BCI: END
|
||||
|
||||
m_urgency_hint = -2;
|
||||
//BCI: m_urgency_hint = -2;
|
||||
gtk_object_set_data( GTK_OBJECT(m_widget), "m_urgency_hint", GINT_TO_POINTER(-2));
|
||||
|
||||
if( GTK_WIDGET_REALIZED(m_widget) && !IsActive() )
|
||||
{
|
||||
@@ -1348,9 +1367,14 @@ void wxTopLevelWindowGTK::RequestUserAttention(int flags)
|
||||
|
||||
if (flags & wxUSER_ATTENTION_INFO)
|
||||
{
|
||||
m_urgency_hint = gtk_timeout_add(5000, (GtkFunction)gtk_frame_urgency_timer_callback, this);
|
||||
//BCI: m_urgency_hint = gtk_timeout_add(5000, (GtkFunction)gtk_frame_urgency_timer_callback, this);
|
||||
gtk_object_set_data( GTK_OBJECT(m_widget), "m_urgency_hint",
|
||||
GINT_TO_POINTER( gtk_timeout_add(5000,
|
||||
(GtkFunction)gtk_frame_urgency_timer_callback,
|
||||
m_widget) ) );
|
||||
} else {
|
||||
m_urgency_hint = -1;
|
||||
//BCI: m_urgency_hint = -1;
|
||||
gtk_object_set_data( GTK_OBJECT(m_widget), "m_urgency_hint", GINT_TO_POINTER(-1) );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -105,16 +105,17 @@ static void wxgtk_window_set_urgency_hint (GtkWindow *win,
|
||||
XFree(wm_hints);
|
||||
}
|
||||
|
||||
static gint gtk_frame_urgency_timer_callback( wxTopLevelWindowGTK *win )
|
||||
static gint gtk_frame_urgency_timer_callback( GtkWidget *win )
|
||||
{
|
||||
#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2,7,0)
|
||||
if(!gtk_check_version(2,7,0))
|
||||
gtk_window_set_urgency_hint(GTK_WINDOW( win->m_widget ), FALSE);
|
||||
gtk_window_set_urgency_hint(GTK_WINDOW( win ), FALSE);
|
||||
else
|
||||
#endif
|
||||
wxgtk_window_set_urgency_hint(GTK_WINDOW( win->m_widget ), FALSE);
|
||||
wxgtk_window_set_urgency_hint(GTK_WINDOW( win ), FALSE);
|
||||
|
||||
win->m_urgency_hint = -2;
|
||||
//BCI: argument from GtkWidget* to wxTopLevelWindowGTK* && win->m_urgency_hint = -2;
|
||||
gtk_object_set_data(GTK_OBJECT(win), "m_urgency_hint", GINT_TO_POINTER(-2));
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
@@ -151,10 +152,12 @@ static gint gtk_frame_focus_in_callback( GtkWidget *widget,
|
||||
// wxPrintf( wxT("active: %s\n"), win->GetTitle().c_str() );
|
||||
|
||||
// MR: wxRequestUserAttention related block
|
||||
switch( win->m_urgency_hint )
|
||||
//BCI: switch(win->m_urgency_hint)
|
||||
switch( GPOINTER_TO_INT(gtk_object_get_data( GTK_OBJECT(widget), "m_urgency_hint") ) )
|
||||
{
|
||||
default:
|
||||
gtk_timeout_remove( win->m_urgency_hint );
|
||||
//BCI:
|
||||
gtk_timeout_remove( GPOINTER_TO_INT(gtk_object_get_data( GTK_OBJECT(widget), "m_urgency_hint") ) );
|
||||
// no break, fallthrough to remove hint too
|
||||
case -1:
|
||||
#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2,7,0)
|
||||
@@ -166,7 +169,8 @@ static gint gtk_frame_focus_in_callback( GtkWidget *widget,
|
||||
wxgtk_window_set_urgency_hint(GTK_WINDOW( widget ), FALSE);
|
||||
}
|
||||
|
||||
win->m_urgency_hint = -2;
|
||||
//BCI: win->m_urgency_hint = -2;
|
||||
gtk_object_set_data( GTK_OBJECT(widget), "m_urgency_hint", GINT_TO_POINTER(-2) );
|
||||
break;
|
||||
|
||||
case -2: break;
|
||||
@@ -483,7 +487,12 @@ void wxTopLevelWindowGTK::Init()
|
||||
m_gdkDecor = m_gdkFunc = 0;
|
||||
m_grabbed = false;
|
||||
|
||||
m_urgency_hint = -2;
|
||||
//BCI: header wx/gtk/toplevel.h:
|
||||
// private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and
|
||||
// wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle.
|
||||
// int m_urgency_hint;
|
||||
|
||||
//BCI: m_urgency_hint = -2;
|
||||
}
|
||||
|
||||
bool wxTopLevelWindowGTK::Create( wxWindow *parent,
|
||||
@@ -557,6 +566,9 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
|
||||
}
|
||||
}
|
||||
|
||||
// BCI:
|
||||
gtk_object_set_data( GTK_OBJECT(m_widget), "m_urgency_hint", GINT_TO_POINTER(-2) );
|
||||
|
||||
wxWindow *topParent = wxGetTopLevelParent(m_parent);
|
||||
if (topParent && (((GTK_IS_WINDOW(topParent->m_widget)) &&
|
||||
(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)) ||
|
||||
@@ -1337,10 +1349,17 @@ void wxTopLevelWindowGTK::RequestUserAttention(int flags)
|
||||
// wxYieldIfNeeded ensures the processing of it, but can have unwanted side effects - MR
|
||||
::wxYieldIfNeeded();
|
||||
|
||||
/*BCI:
|
||||
if(m_urgency_hint >= 0)
|
||||
gtk_timeout_remove(m_urgency_hint);
|
||||
*/
|
||||
int urgency_hint = GPOINTER_TO_INT( gtk_object_get_data( GTK_OBJECT(m_widget), "m_urgency_hint") );
|
||||
if(urgency_hint >= 0)
|
||||
gtk_timeout_remove(urgency_hint);
|
||||
//BCI: END
|
||||
|
||||
m_urgency_hint = -2;
|
||||
//BCI: m_urgency_hint = -2;
|
||||
gtk_object_set_data( GTK_OBJECT(m_widget), "m_urgency_hint", GINT_TO_POINTER(-2));
|
||||
|
||||
if( GTK_WIDGET_REALIZED(m_widget) && !IsActive() )
|
||||
{
|
||||
@@ -1348,9 +1367,14 @@ void wxTopLevelWindowGTK::RequestUserAttention(int flags)
|
||||
|
||||
if (flags & wxUSER_ATTENTION_INFO)
|
||||
{
|
||||
m_urgency_hint = gtk_timeout_add(5000, (GtkFunction)gtk_frame_urgency_timer_callback, this);
|
||||
//BCI: m_urgency_hint = gtk_timeout_add(5000, (GtkFunction)gtk_frame_urgency_timer_callback, this);
|
||||
gtk_object_set_data( GTK_OBJECT(m_widget), "m_urgency_hint",
|
||||
GINT_TO_POINTER( gtk_timeout_add(5000,
|
||||
(GtkFunction)gtk_frame_urgency_timer_callback,
|
||||
m_widget) ) );
|
||||
} else {
|
||||
m_urgency_hint = -1;
|
||||
//BCI: m_urgency_hint = -1;
|
||||
gtk_object_set_data( GTK_OBJECT(m_widget), "m_urgency_hint", GINT_TO_POINTER(-1) );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1776,7 +1776,6 @@ void wxTextCtrl::OnChar(wxKeyEvent& event)
|
||||
// Insert tab since calling the default Windows handler
|
||||
// doesn't seem to do it
|
||||
WriteText(wxT("\t"));
|
||||
return;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
# Name: wx-config-inplace
|
||||
# Purpose: wx configuration in tree search and query tool
|
||||
# Author: Ron <ron@debian.org>
|
||||
# Modified by: VZ on 2005-09-20 to make it work with Bourne shell
|
||||
# Modified by:
|
||||
# Created: 14/9/2004
|
||||
# RCS-ID: $Id$
|
||||
# Copyright: (c) 2004 Ron <ron@debian.org>
|
||||
@@ -24,16 +24,8 @@ check_dirname()
|
||||
( cd $1 && pwd )
|
||||
}
|
||||
|
||||
# set the variables which allow the real wx-config to check if we're using it
|
||||
# in place or after installation
|
||||
this_prefix=`check_dirname "@abs_top_srcdir@"`
|
||||
if [ "x$this_prefix" = "x" ]; then
|
||||
exit 1
|
||||
fi
|
||||
this_exec_prefix=`check_dirname "@abs_top_builddir@"`
|
||||
if [ "x$this_exec_prefix" = "x" ]; then
|
||||
exit 1
|
||||
fi
|
||||
this_prefix=$(check_dirname "@abs_top_srcdir@") || exit
|
||||
this_exec_prefix=$(check_dirname "@abs_top_builddir@") || exit
|
||||
|
||||
. "$this_exec_prefix/lib/wx/config/@TOOLCHAIN_FULLNAME@"
|
||||
|
||||
|
||||
@@ -3,16 +3,6 @@
|
||||
PY_VERSION=$1
|
||||
shift
|
||||
|
||||
unicode=no
|
||||
debug=no
|
||||
|
||||
for flag in $*; do
|
||||
case ${flag} in
|
||||
debug) debug=yes ;;
|
||||
unicode) unicode=yes ;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [ "$WXWIN" = "" ]; then
|
||||
export WXWIN=`pwd`/../..
|
||||
fi
|
||||
@@ -42,7 +32,7 @@ if [ "$OSTYPE" = "cygwin" ]; then
|
||||
# remove old build files
|
||||
rm -rf vc_msw*
|
||||
UNI=
|
||||
if [ $unicode = yes ]; then
|
||||
if [ "$UNICODE" != "" ]; then
|
||||
UNI=-uni
|
||||
fi
|
||||
./.make hybrid$UNI
|
||||
@@ -77,7 +67,7 @@ if [ "$OSTYPE" = "cygwin" ]; then
|
||||
if [ "$DEBUG" != "" ]; then
|
||||
DEBUG_FLAG=--debug
|
||||
fi
|
||||
if [ $unicode = yes ]; then
|
||||
if [ "$UNICODE" != "" ]; then
|
||||
UNICODE_FLAG="UNICODE=1"
|
||||
fi
|
||||
b $PY_VERSION h $DEBUG_FLAG $UNICODE_FLAG
|
||||
@@ -93,17 +83,7 @@ elif [ "$OSTYPE" = "darwin" ]; then
|
||||
# re-generate SWIG files
|
||||
./b $PY_VERSION t
|
||||
|
||||
PY_DOT_VER=2.3
|
||||
if [ "$PY_VERSION" = "24" ]; then
|
||||
PY_DOT_VER=2.4
|
||||
fi
|
||||
|
||||
UNICODE_OPT=
|
||||
if [ $unicode = yes ]; then
|
||||
UNICODE_OPT=unicode
|
||||
fi
|
||||
|
||||
sudo distrib/mac/wxPythonOSX/build $PY_DOT_VER panther inplace $UNICODE_OPT
|
||||
sudo distrib/mac/wxPythonOSX/build 2.3 panther inplace
|
||||
exit
|
||||
else
|
||||
echo "OSTYPE $OSTYPE not yet supported by this build script."
|
||||
|
||||
@@ -182,9 +182,6 @@ mkdir -p $DMGROOT
|
||||
mkdir -p $DMGAPPS/Docs
|
||||
mkdir -p $DMGAPPS/Samples
|
||||
|
||||
if [ ! -d $DESTDIR ]; then
|
||||
mkdir $DESTDIR
|
||||
fi
|
||||
|
||||
pushd $BUILDROOT
|
||||
|
||||
@@ -473,7 +470,7 @@ EOF
|
||||
$PROGDIR/../makedmg $DMGROOT $DMGDIR $dmgname
|
||||
|
||||
echo Moving $DMGDIR/$dmgname.dmg to $DESTDIR
|
||||
mv $DMGDIR/$dmgname.dmg $DESTDIR/$dmgname.dmg
|
||||
mv $DMGDIR/$dmgname.dmg $DESTDIR
|
||||
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
@@ -629,7 +626,7 @@ EOF
|
||||
$PROGDIR/../makedmg $DMGAPPS $DMGDIR $dmgname
|
||||
|
||||
echo Moving $DMGDIR/$dmgname.dmg to $DESTDIR
|
||||
mv $DMGDIR/$dmgname.dmg $DESTDIR/$dmgname.dmg
|
||||
mv $DMGDIR/$dmgname.dmg $DESTDIR
|
||||
fi
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user