solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Remove support for wxMotif

Browse source 
This port hasn't been updated for ages and is not used by anybody any
longer, so remove its code to facilitate maintenance.

Also remove references to this port from the documentation and most of
the other places (VMS-specific descrip.vms files still check for it
because it's not clear how to update them all), including configure.

Regenerate the latter and rebake all makefiles.

Finally document that this port is not available any longer.
This commit is contained in:
Vadim Zeitlin 2022-10-16 02:34:40 +02:00
parent 041060d0de
commit 0ef1cdcc21
437 changed files with 411 additions and 44740 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/ci.yml vendored
View file

@ -108,11 +108,6 @@ jobs:
configure_flags: --with-directfb --enable-pch --disable-stc
skip_samples: true
allow_warnings: true
- name: Ubuntu 18.04 wxMotif
runner: ubuntu-latest
container: ubuntu:18.04
configure_flags: --with-motif --enable-pch --disable-stc
skip_samples: true
- name: Ubuntu 18.04 wxQt
runner: ubuntu-latest
container: ubuntu:18.04

4
.github/workflows/ci_mac.yml vendored
View file

@ -19,14 +19,12 @@ on:
- 'include/wx/dfb/**'
- 'include/wx/gtk/**'
- 'include/wx/gtk1/**'
- 'include/wx/motif/**'
- 'include/wx/msw/**'
- 'include/wx/x11/**'
- 'locale/**'
- 'src/dfb/**'
- 'src/gtk/**'
- 'src/gtk1/**'
- 'src/motif/**'
- 'src/msw/**'
- 'src/x11/**'
- '*.md'
@ -49,14 +47,12 @@ on:
- 'include/wx/dfb/**'
- 'include/wx/gtk/**'
- 'include/wx/gtk1/**'
- 'include/wx/motif/**'
- 'include/wx/msw/**'
- 'include/wx/x11/**'
- 'locale/**'
- 'src/dfb/**'
- 'src/gtk/**'
- 'src/gtk1/**'
- 'src/motif/**'
- 'src/msw/**'
- 'src/x11/**'
- '*.md'

4
.github/workflows/ci_mac_xcode.yml vendored
View file

@ -19,14 +19,12 @@ on:
- 'include/wx/dfb/**'
- 'include/wx/gtk/**'
- 'include/wx/gtk1/**'
- 'include/wx/motif/**'
- 'include/wx/msw/**'
- 'include/wx/x11/**'
- 'locale/**'
- 'src/dfb/**'
- 'src/gtk/**'
- 'src/gtk1/**'
- 'src/motif/**'
- 'src/msw/**'
- 'src/x11/**'
- '*.md'
@ -49,14 +47,12 @@ on:
- 'include/wx/dfb/**'
- 'include/wx/gtk/**'
- 'include/wx/gtk1/**'
- 'include/wx/motif/**'
- 'include/wx/msw/**'
- 'include/wx/x11/**'
- 'locale/**'
- 'src/dfb/**'
- 'src/gtk/**'
- 'src/gtk1/**'
- 'src/motif/**'
- 'src/msw/**'
- 'src/x11/**'
- '*.md'

6
.gitignore vendored
View file

@ -178,9 +178,6 @@
# /include/wx/html/
/include/wx/html/Makefile.in
# /include/wx/motif/
/include/wx/motif/Makefile.in
# /include/wx/msw/
/include/wx/msw/Makefile.in
/include/wx/msw/Makefile
@ -326,9 +323,6 @@
/src/jpeg/Debug
/src/jpeg/Release
# /src/motif/
/src/motif/Makefile.in
# /src/msw/
/src/msw/Makefile.in

1968
Makefile.in
View file

File diff suppressed because it is too large Load diff

2
appveyor.yml
View file

@ -17,8 +17,6 @@ skip_commits:
- src/gtk/
- include/wx/gtk1/
- src/gtk1/
- include/wx/motif/
- src/motif/
- include/wx/osx/
- src/osx/
- include/wx/unix/

58
art/motif/error.xpm
View file

@ -1,58 +0,0 @@
/* XPM */
static const char *const error_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 4 1",
" c None",
"X c #242424",
"o c #DCDF00",
". c #C00000",
/* pixels */
" ",
" ",
" ",
" ",
" ",
" ..... ",
" ............. ",
" ................. ",
" ................... ",
" ....................... ",
" ......................... ",
" ........................... ",
" ...........................X ",
" .............................X ",
" ............................... ",
" ...............................X ",
" .................................X ",
" .................................X ",
" .................................XX ",
" ...ooooooooooooooooooooooooooo...XX ",
" ....ooooooooooooooooooooooooooo....X ",
" ....ooooooooooooooooooooooooooo....X ",
" ....ooooooooooooooooooooooooooo....XX ",
" ....ooooooooooooooooooooooooooo....XX ",
" ....ooooooooooooooooooooooooooo....XX ",
" ...ooooooooooooooooooooooooooo...XXX ",
" ...ooooooooooooooooooooooooooo...XXX ",
" .................................XX ",
" .................................XX ",
" ...............................XXX ",
" ...............................XXX ",
" .............................XXX ",
" ...........................XXXX ",
" ...........................XXX ",
" .........................XXX ",
" .......................XXXX ",
" X...................XXXXX ",
" X.................XXXXX ",
" X.............XXXXX ",
" XXXX.....XXXXXXXX ",
" XXXXXXXXXXXXX ",
" XXXXX ",
" ",
" ",
" ",
" ",
" ",
" "
};

63
art/motif/info.xpm
View file

@ -1,63 +0,0 @@
/* XPM */
static const char *const info_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 9 1",
"$ c Black",
"O c #FFFFFF",
"@ c #808080",
"+ c #000080",
"o c #E8EB01",
" c None",
"X c #FFFF40",
"# c #C0C0C0",
". c #ABAD01",
/* pixels */
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ..... ",
" ..XXXXX.. ",
" ..XXXXXXXXo.. ",
" .XXXOXXXXXXXoo. ",
" .XOOXXX+XXXXXo. ",
" .XOOOXX+++XXXXoo. ",
" .XOOXXX+++XXXXXo. ",
" .XOOOXXX+++XXXXXXo. ",
" .XOOXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXXX. ",
" .XXXXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXoo. ",
" .XXXXXX+++XXXXXo. ",
" .XXXXXXX+XXXXXXo. ",
" .XXXXXXXXXXXXo. ",
" .XXXXX+++XXXoo. ",
" .XXXX+++XXoo. ",
" .XXXXXXXXo. ",
" ..XXXXXXo.. ",
" .XXXXXo.. ",
" @#######@ ",
" @@@@@@@@@ ",
" @#######@ ",
" @@@@@@@@@ ",
" @#######@ ",
" @@@@@@@ ",
" ### ",
" $$$ ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
};

75
art/motif/question.xpm
View file

@ -1,75 +0,0 @@
/* XPM */
static const char *const question_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 21 1",
". c Black",
"> c #696969",
"O c #1F1F00",
"+ c #181818",
"o c #F6F900",
"; c #3F3F00",
"$ c #111111",
" c None",
"& c #202020",
"X c #AAAA00",
"@ c #949400",
": c #303030",
"1 c #383838",
"% c #2A2A00",
", c #404040",
"= c #B4B400",
"- c #484848",
"# c #151500",
"< c #9F9F00",
"2 c #6A6A00",
"* c #353500",
/* pixels */
" ",
" ",
" ",
" ",
" ......... ",
" ...XXXXXXX.. ",
" ..XXXXoooooXXXO+ ",
" ..XXooooooooooooX@.. ",
" ..XoooooooooooooooXX#. ",
" $%XoooooooooooooooooXX#. ",
" &.XoooooooXXXXXXooooooXX.. ",
" .XooooooXX.$...$XXoooooX*. ",
" $.XoooooX%.$ .*oooooo=.. ",
" .XooooooX.. -.XoooooX.. ",
" .XoooooX..+ .XoooooX;. ",
" ...XXXX..: .XoooooX;. ",
" ........ >.XoooooX;. ",
" +.XoooooX.. ",
" ,.Xoooooo<.. ",
" 1#XooooooXO.. ",
" &#XooooooX2.. ",
" $%XooooooXX.. ",
" $%XooooooXX.. ",
" $%XooooooXX.. ",
" &.XooooooXX.. ",
" .XooooooXX.. ",
" &.XoooooXX.. ",
" ..XooooXX.. ",
" ..XooooX... ",
" ..XXooXX..& ",
" ...XXXXX.. ",
" ........ ",
" ",
" ",
" ....... ",
" ..XXXXX.. ",
" ..XXoooXX.. ",
" ..XoooooX.. ",
" ..XoooooX.. ",
" ..XXoooXX.. ",
" ..XXXXX.. ",
" ....... ",
" ",
" ",
" ",
" ",
" ",
" "
};

63
art/motif/warning.xpm
View file

@ -1,63 +0,0 @@
/* XPM */
static const char *const warning_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 9 1",
"@ c Black",
"o c #A6A800",
"+ c #8A8C00",
"$ c #B8BA00",
" c None",
"O c #6E7000",
"X c #DCDF00",
". c #C00000",
"# c #373800",
/* pixels */
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" . ",
" ... ",
" ... ",
" ..... ",
" ...X.. ",
" ..XXX.. ",
" ...XXX... ",
" ..XXXXX.. ",
" ..XXXXXX... ",
" ...XXoO+XX.. ",
" ..XXXO@#XXX.. ",
" ..XXXXO@#XXX... ",
" ...XXXXO@#XXXX.. ",
" ..XXXXXO@#XXXX... ",
" ...XXXXXo@OXXXXX.. ",
" ...XXXXXXo@OXXXXXX.. ",
" ..XXXXXXX$@OXXXXXX... ",
" ...XXXXXXXX@XXXXXXXX.. ",
" ...XXXXXXXXXXXXXXXXXX... ",
" ..XXXXXXXXXXOXXXXXXXXX.. ",
" ...XXXXXXXXXO@#XXXXXXXXX.. ",
" ..XXXXXXXXXXX#XXXXXXXXXX... ",
" ...XXXXXXXXXXXXXXXXXXXXXXX.. ",
" ...XXXXXXXXXXXXXXXXXXXXXXXX... ",
" .............................. ",
" .............................. ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
};

18
autoconf_inc.m4
View file

@ -734,24 +734,6 @@ dnl ### begin block 20_COND_TOOLKIT_MAC[../../demos/bombs/bombs.bkl,../../demos/
COND_TOOLKIT_MAC=""
fi
AC_SUBST(COND_TOOLKIT_MAC)
dnl ### begin block 20_COND_TOOLKIT_MOTIF[wx.bkl] ###
COND_TOOLKIT_MOTIF="#"
if test "x$TOOLKIT" = "xMOTIF" ; then
COND_TOOLKIT_MOTIF=""
fi
AC_SUBST(COND_TOOLKIT_MOTIF)
dnl ### begin block 20_COND_TOOLKIT_MOTIF_USE_GUI_1[wx.bkl] ###
COND_TOOLKIT_MOTIF_USE_GUI_1="#"
if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_MOTIF_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_MOTIF_USE_GUI_1)
dnl ### begin block 20_COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_MSW[../../demos/bombs/bombs.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/archive/archive.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/clipboard/clipboard.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/dataview/dataview.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dll/dll.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/fswatcher/fswatcher.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/minimal/minimal.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/opengl/pyramid/pyramid.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/preferences/preferences.bkl,../../samples/printing/printing.bkl,../../samples/propgrid/propgrid.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/ribbon/ribbon.bkl,../../samples/richtext/richtext.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/secretstore/secretstore.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/stc/stctest.bkl,../../samples/svg/svgtest.bkl,../../samples/taborder/taborder.bkl,../../samples/taskbar/taskbar.bkl,../../samples/taskbarbutton/taskbarbutton.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/treelist/treelist.bkl,../../samples/typetest/typetest.bkl,../../samples/uiaction/uiaction.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/webrequest/webrequest.bkl,../../samples/webview/webview.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/wrapsizer/wrapsizer.bkl,../../samples/xrc/xrcdemo.bkl,../../samples/xti/xti.bkl,../../tests/benchmarks/bench.bkl,../../tests/test.bkl,../../utils/emulator/src/emulator.bkl,../../utils/execmon/execmon.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/ifacecheck/src/ifacecheck.bkl,../../utils/screenshotgen/src/screenshotgen.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_TOOLKIT_MSW="#"
if test "x$TOOLKIT" = "xMSW" ; then

178
build/bakefiles/files.bkl
View file

@ -27,7 +27,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(port)LOWLEVEL low-level GUI classes
$(port) high-level files for a port
XWIN_LOWLEVEL low-level classes for X Window System
ports (wxGTK, wxMotif, wxX11)
ports (wxGTK, wxX11)
MSW_DESKTOP files used only on desktop Windows
versions
@ -1779,172 +1779,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
</set>
<!-- ====================================================================== -->
<!-- wxMotif -->
<!-- ====================================================================== -->
<set var="MOTIF_LOWLEVEL_SRC" hints="files">
$(XWIN_LOWLEVEL_SRC)
src/generic/textmeasure.cpp
src/x11/bitmap.cpp
src/x11/brush.cpp
src/x11/palette.cpp
src/x11/pen.cpp
src/x11/region.cpp
src/x11/utilsx.cpp
src/unix/displayx11.cpp
</set>
<set var="MOTIF_LOWLEVEL_HDR" hints="files">
$(XWIN_LOWLEVEL_HDR)
wx/x11/bitmap.h
wx/x11/brush.h
wx/x11/palette.h
wx/x11/pen.h
wx/x11/region.h
</set>
<set var="MOTIF_SRC" hints="files">
src/motif/accel.cpp
src/motif/app.cpp
src/motif/bmpbuttn.cpp
src/motif/bmpmotif.cpp
src/motif/button.cpp
src/motif/checkbox.cpp
src/motif/checklst.cpp
src/motif/choice.cpp
src/motif/clipbrd.cpp
src/motif/colour.cpp
src/motif/combobox.cpp
src/motif/combobox_native.cpp
src/motif/control.cpp
src/motif/cursor.cpp
src/motif/data.cpp
src/motif/dataobj.cpp
src/motif/dc.cpp
src/motif/dcclient.cpp
src/motif/dcmemory.cpp
src/motif/dcscreen.cpp
src/motif/dialog.cpp
src/motif/evtloop.cpp
src/motif/filedlg.cpp
src/motif/font.cpp
src/motif/frame.cpp
src/motif/gauge.cpp
src/motif/sockmot.cpp
src/motif/icon.cpp
src/motif/listbox.cpp
src/motif/main.cpp
src/motif/menu.cpp
src/motif/menuitem.cpp
src/motif/minifram.cpp
src/motif/msgdlg.cpp
src/motif/popupwin.cpp
src/motif/radiobox.cpp
src/motif/radiobut.cpp
src/motif/scrolbar.cpp
src/motif/settings.cpp
src/motif/slider.cpp
src/motif/spinbutt.cpp
src/motif/statbmp.cpp
src/motif/statbox.cpp
src/motif/stattext.cpp
src/motif/textctrl.cpp
src/motif/textentry.cpp
src/motif/timer.cpp
src/motif/toolbar.cpp
src/motif/toplevel.cpp
src/motif/utils.cpp
src/motif/window.cpp
src/motif/xmcombo/xmcombo.c
<!-- Generic files used by wxMotif: -->
src/generic/clrpickerg.cpp
src/generic/collpaneg.cpp
src/generic/colrdlgg.cpp
src/generic/dirdlgg.cpp
src/generic/fdrepdlg.cpp
src/generic/filepickerg.cpp
src/generic/fontdlgg.cpp
src/generic/fontpickerg.cpp
src/generic/listctrl.cpp
src/generic/mdig.cpp
src/generic/notebook.cpp
src/generic/prntdlgg.cpp
src/generic/statline.cpp
src/generic/statusbr.cpp
src/generic/tabg.cpp
src/generic/activityindicator.cpp
</set>
<set var="MOTIF_HDR" hints="files">
wx/generic/clrpickerg.h
wx/generic/collpaneg.h
wx/generic/colrdlgg.h
wx/generic/ctrlsub.h
wx/generic/dirdlgg.h
wx/generic/fdrepdlg.h
wx/generic/filepickerg.h
wx/generic/fontdlgg.h
wx/generic/fontpickerg.h
wx/generic/listctrl.h
wx/generic/mdig.h
wx/generic/notebook.h
wx/generic/prntdlgg.h
wx/generic/statline.h
wx/generic/statusbr.h
wx/generic/tabg.h
wx/motif/accel.h
wx/motif/app.h
wx/motif/bmpbuttn.h
wx/motif/bmpmotif.h
wx/motif/button.h
wx/motif/checkbox.h
wx/motif/checklst.h
wx/motif/chkconf.h
wx/motif/choice.h
wx/motif/clipbrd.h
wx/motif/colour.h
wx/motif/combobox.h
wx/motif/control.h
wx/motif/ctrlsub.h
wx/motif/cursor.h
wx/motif/dataform.h
wx/motif/dataobj.h
wx/motif/dataobj2.h
wx/motif/dc.h
wx/motif/dcclient.h
wx/motif/dcmemory.h
wx/motif/dcprint.h
wx/motif/dcscreen.h
wx/motif/dialog.h
wx/motif/dnd.h
wx/motif/filedlg.h
wx/motif/font.h
wx/motif/frame.h
wx/motif/gauge.h
wx/motif/icon.h
wx/motif/listbox.h
wx/motif/menu.h
wx/motif/menuitem.h
wx/motif/minifram.h
wx/motif/msgdlg.h
wx/motif/popupwin.h
wx/motif/print.h
wx/motif/private.h
wx/motif/radiobox.h
wx/motif/radiobut.h
wx/motif/scrolbar.h
wx/motif/slider.h
wx/motif/spinbutt.h
wx/motif/statbmp.h
wx/motif/statbox.h
wx/motif/stattext.h
wx/motif/textctrl.h
wx/motif/textentry.h
wx/motif/tglbtn.h
wx/motif/toolbar.h
wx/motif/toplevel.h
wx/motif/window.h
</set>
<!-- ====================================================================== -->
<!-- wxX11 -->
<!-- ====================================================================== -->
@ -3229,7 +3063,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
</if>
<if cond="TOOLKIT=='QT'">src/qt/glcanvas.cpp</if>
<if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
<if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp src/unix/glx11.cpp</if>
<if cond="TOOLKIT=='X11'">src/x11/glcanvas.cpp src/unix/glx11.cpp</if>
</set>
@ -3261,7 +3094,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
</if>
<if cond="TOOLKIT=='QT'">wx/qt/glcanvas.h</if>
<if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
<if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h wx/unix/glx11.h</if>
<if cond="TOOLKIT=='X11'">wx/x11/glcanvas.h wx/unix/glx11.h</if>
</set>
@ -3478,7 +3310,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='COCOA'">$(BASE_OSX_NOTWXMAC_SRC)</if>
<if cond="TOOLKIT=='GTK'">$(BASE_OSX_NOTWXMAC_SRC)</if>
<if cond="TOOLKIT=='X11'">$(BASE_OSX_NOTWXMAC_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(BASE_OSX_NOTWXMAC_SRC)</if>
<!-- FIXME: TOOLKIT!='MAC' is what we really want -->
<!-- FIXME: a hack because there are two wxBase versions on
@ -3506,7 +3337,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='COCOA'">$(BASE_OSX_NOTWXMAC_HDR)</if>
<if cond="TOOLKIT=='GTK'">$(BASE_OSX_NOTWXMAC_HDR)</if>
<if cond="TOOLKIT=='X11'">$(BASE_OSX_NOTWXMAC_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(BASE_OSX_NOTWXMAC_HDR)</if>
<!-- FIXME: TOOLKIT!='MAC' is what we really want -->
<!-- FIXME: a hack because there are two wxBase versions on
@ -3547,7 +3377,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK2_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='OSX_COCOA'">$(OSX_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='OSX_IPHONE'">$(OSX_LOWLEVEL_SRC)</if>
@ -3559,7 +3388,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='OSX_COCOA'">$(OSX_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='OSX_IPHONE'">$(OSX_LOWLEVEL_HDR)</if>
@ -3577,7 +3405,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK2_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_SRC) $(MSW_DESKTOP_SRC)</if>
<if cond="TOOLKIT=='OSX_COCOA'">$(OSX_COCOA_SRC)</if>
<if cond="TOOLKIT=='OSX_IPHONE'">$(OSX_IPHONE_SRC)</if>
@ -3588,7 +3415,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='3'">$(GTK_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK2_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_DESKTOP_HDR) $(MSW_RSC)</if>
<if cond="TOOLKIT=='OSX_COCOA'">$(OSX_SHARED_HDR) $(OSX_COCOA_HDR)</if>
<if cond="TOOLKIT=='OSX_IPHONE'">$(OSX_SHARED_HDR) $(OSX_IPHONE_HDR)</if>
@ -3624,7 +3450,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='OSX_COCOA'">$(MEDIA_OSX_COCOA_SRC)</if>
<if cond="TOOLKIT=='OSX_IPHONE'">$(MEDIA_OSX_IPHONE_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_SRC)</if>
<if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_SRC) $(MEDIA_GTK_SRC)</if>
<if cond="TOOLKIT=='X11'">$(MEDIA_UNIX_SRC)</if>
<if cond="TOOLKIT=='QT'">$(MEDIA_QT_SRC)</if>
@ -3634,7 +3459,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='OSX_COCOA'">$(MEDIA_OSX_COCOA_HDR)</if>
<if cond="TOOLKIT=='OSX_IPHONE'">$(MEDIA_OSX_IPHONE_HDR)</if>
<if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_HDR)</if>
<if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_HDR)</if>
<if cond="TOOLKIT=='X11'">$(MEDIA_UNIX_HDR)</if>
<if cond="TOOLKIT=='QT'">$(MEDIA_QT_HDR)</if>

22
build/bakefiles/make_dist.mk
View file

@ -29,7 +29,6 @@ GTKDIR = $(WXDIR)/src/gtk
GTK1DIR = $(WXDIR)/src/gtk1
X11DIR = $(WXDIR)/src/x11
X11INC = $(WXDIR)/include/wx/x11
MOTIFDIR = $(WXDIR)/src/motif
MSWDIR = $(WXDIR)/src/msw
MACDIR = $(WXDIR)/src/osx
COCOADIR = $(WXDIR)/src/cocoa
@ -189,10 +188,8 @@ ALL_GUI_DIST: ALL_DIST
mkdir $(DISTDIR)/art
mkdir $(DISTDIR)/art/gtk
mkdir $(DISTDIR)/art/motif
$(CP_P) $(WXDIR)/art/*.xpm $(DISTDIR)/art
$(CP_P) $(WXDIR)/art/gtk/*.xpm $(DISTDIR)/art/gtk
$(CP_P) $(WXDIR)/art/motif/*.xpm $(DISTDIR)/art/motif
mkdir $(DISTDIR)/src/$(TOOLKITDIR)
$(CP_P) $(COMMDIR)/*.cpp $(DISTDIR)/src/common
@ -368,25 +365,6 @@ X11_DIST: UNIV_DIST
mkdir $(DISTDIR)/include/wx/osx/core
$(CP_P) $(WXDIR)/include/wx/osx/core/*.h $(DISTDIR)/include/wx/osx/core
MOTIF_DIST: ALL_GUI_DIST
$(CP_P) $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif
$(CP_P) $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif
$(CP_P) $(MOTIFDIR)/*.xbm $(DISTDIR)/src/motif
mkdir $(DISTDIR)/src/motif/xmcombo
$(CP_P) $(MOTIFDIR)/xmcombo/*.c $(DISTDIR)/src/motif/xmcombo
$(CP_P) $(MOTIFDIR)/xmcombo/*.h $(DISTDIR)/src/motif/xmcombo
$(CP_P) $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo
mkdir $(DISTDIR)/src/x11
mkdir $(DISTDIR)/include/wx/x11
$(CP_P) $(X11DIR)/pen.cpp $(X11DIR)/brush.cpp $(X11DIR)/utilsx.cpp \
$(X11DIR)/bitmap.cpp $(X11DIR)/glcanvas.cpp $(X11DIR)/region.cpp \
$(DISTDIR)/src/x11
$(CP_P) $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \
$(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \
$(DISTDIR)/include/wx/x11
mkdir $(DISTDIR)/include/wx/x11/private
$(CP_P) $(INCDIR)/wx/x11/private/*.h $(DISTDIR)/include/wx/x11/private
OSX_CARBON_DIST: ALL_GUI_DIST
$(CP_P) $(INCDIR)/*.* $(DISTDIR)/include
mkdir $(DISTDIR)/include/wx/osx/carbon

2
build/bakefiles/wxpresets/presets/wx_unix.bkl
View file

@ -79,7 +79,7 @@ Format-specific notes:
$(DOLLAR)(shell $(WX_CONFIG) --query-toolkit)
</set>
<option name="WX_PORT">
<values>gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb</values>
<values>gtk1,gtk2,msw,x11,osx_cocoa,osx_carbon,dfb</values>
<default-value force="1">$(WX_PORT_DEFAULT)</default-value>
<description>
Port of the wx library to build against

164
build/cmake/files.cmake
View file

@ -1665,170 +1665,6 @@ set(GTK1_HDR
wx/generic/activityindicator.h
)
set(MOTIF_LOWLEVEL_SRC
${XWIN_LOWLEVEL_SRC}
src/generic/textmeasure.cpp
src/x11/bitmap.cpp
src/x11/brush.cpp
src/x11/palette.cpp
src/x11/pen.cpp
src/x11/region.cpp
src/x11/utilsx.cpp
src/unix/displayx11.cpp
)
set(MOTIF_LOWLEVEL_HDR
${XWIN_LOWLEVEL_HDR}
wx/x11/bitmap.h
wx/x11/brush.h
wx/x11/palette.h
wx/x11/pen.h
wx/x11/region.h
)
set(MOTIF_SRC
src/motif/accel.cpp
src/motif/app.cpp
src/motif/bmpbuttn.cpp
src/motif/bmpmotif.cpp
src/motif/button.cpp
src/motif/checkbox.cpp
src/motif/checklst.cpp
src/motif/choice.cpp
src/motif/clipbrd.cpp
src/motif/colour.cpp
src/motif/combobox.cpp
src/motif/combobox_native.cpp
src/motif/control.cpp
src/motif/cursor.cpp
src/motif/data.cpp
src/motif/dataobj.cpp
src/motif/dc.cpp
src/motif/dcclient.cpp
src/motif/dcmemory.cpp
src/motif/dcscreen.cpp
src/motif/dialog.cpp
src/motif/evtloop.cpp
src/motif/filedlg.cpp
src/motif/font.cpp
src/motif/frame.cpp
src/motif/gauge.cpp
src/motif/sockmot.cpp
src/motif/icon.cpp
src/motif/listbox.cpp
src/motif/main.cpp
src/motif/menu.cpp
src/motif/menuitem.cpp
src/motif/minifram.cpp
src/motif/msgdlg.cpp
src/motif/popupwin.cpp
src/motif/radiobox.cpp
src/motif/radiobut.cpp
src/motif/scrolbar.cpp
src/motif/settings.cpp
src/motif/slider.cpp
src/motif/spinbutt.cpp
src/motif/statbmp.cpp
src/motif/statbox.cpp
src/motif/stattext.cpp
src/motif/textctrl.cpp
src/motif/textentry.cpp
src/motif/timer.cpp
src/motif/toolbar.cpp
src/motif/toplevel.cpp
src/motif/utils.cpp
src/motif/window.cpp
src/motif/xmcombo/xmcombo.c
# Generic files used by wxMotif:
src/generic/clrpickerg.cpp
src/generic/collpaneg.cpp
src/generic/colrdlgg.cpp
src/generic/dirdlgg.cpp
src/generic/fdrepdlg.cpp
src/generic/filepickerg.cpp
src/generic/fontdlgg.cpp
src/generic/fontpickerg.cpp
src/generic/listctrl.cpp
src/generic/mdig.cpp
src/generic/notebook.cpp
src/generic/prntdlgg.cpp
src/generic/statline.cpp
src/generic/statusbr.cpp
src/generic/tabg.cpp
src/generic/activityindicator.cpp
)
set(MOTIF_HDR
wx/generic/clrpickerg.h
wx/generic/collpaneg.h
wx/generic/colrdlgg.h
wx/generic/ctrlsub.h
wx/generic/dirdlgg.h
wx/generic/fdrepdlg.h
wx/generic/filepickerg.h
wx/generic/fontdlgg.h
wx/generic/fontpickerg.h
wx/generic/listctrl.h
wx/generic/mdig.h
wx/generic/notebook.h
wx/generic/prntdlgg.h
wx/generic/statline.h
wx/generic/statusbr.h
wx/generic/tabg.h
wx/motif/accel.h
wx/motif/app.h
wx/motif/bmpbuttn.h
wx/motif/bmpmotif.h
wx/motif/button.h
wx/motif/checkbox.h
wx/motif/checklst.h
wx/motif/chkconf.h
wx/motif/choice.h
wx/motif/clipbrd.h
wx/motif/colour.h
wx/motif/combobox.h
wx/motif/control.h
wx/motif/ctrlsub.h
wx/motif/cursor.h
wx/motif/dataform.h
wx/motif/dataobj.h
wx/motif/dataobj2.h
wx/motif/dc.h
wx/motif/dcclient.h
wx/motif/dcmemory.h
wx/motif/dcprint.h
wx/motif/dcscreen.h
wx/motif/dialog.h
wx/motif/dnd.h
wx/motif/filedlg.h
wx/motif/font.h
wx/motif/frame.h
wx/motif/gauge.h
wx/motif/icon.h
wx/motif/listbox.h
wx/motif/menu.h
wx/motif/menuitem.h
wx/motif/minifram.h
wx/motif/msgdlg.h
wx/motif/popupwin.h
wx/motif/print.h
wx/motif/private.h
wx/motif/radiobox.h
wx/motif/radiobut.h
wx/motif/scrolbar.h
wx/motif/slider.h
wx/motif/spinbutt.h
wx/motif/statbmp.h
wx/motif/statbox.h
wx/motif/stattext.h
wx/motif/textctrl.h
wx/motif/textentry.h
wx/motif/tglbtn.h
wx/motif/toolbar.h
wx/motif/toplevel.h
wx/motif/window.h
)
set(X11_LOWLEVEL_SRC
${XWIN_LOWLEVEL_SRC}
src/generic/icon.cpp

6
build/cmake/setup.h.in
View file

@ -56,12 +56,6 @@
/* Define this if you want to use GPE features */
#cmakedefine __WXGPE__ 1
/* Define this if your version of Motif is greater than 2.0 */
#cmakedefine __WXMOTIF20__ 1
/* Define this if you are using Lesstif */
#cmakedefine __WXLESSTIF__ 1
/*
* Define to 1 for Unix[-like] system
*/

6
build/cmake/toolkit.cmake
View file

@ -32,7 +32,7 @@ elseif(APPLE)
set(wxPLATFORM OSX)
elseif(UNIX)
set(wxDEFAULT_TOOLKIT gtk3)
set(wxTOOLKIT_OPTIONS gtk2 gtk3 gtk4 motif qt)
set(wxTOOLKIT_OPTIONS gtk2 gtk3 gtk4 qt)
set(wxPLATFORM UNIX)
else()
message(FATAL_ERROR "Unsupported platform")
@ -115,11 +115,11 @@ if(WXGTK)
endif()
endif()
# We need X11 for non-GTK Unix ports (X11, Motif) and for GTK with X11
# We need X11 for non-GTK Unix ports (X11) and for GTK with X11
# support, but not for Wayland-only GTK (necessarily 3 or later), which is why
# we have to do this after find_package(GTKx) above, as this is what sets
# wxHAVE_GDK_X11.
if(UNIX AND NOT APPLE AND NOT WIN32 AND (WXX11 OR WXMOTIF OR WXGTK2 OR (WXGTK AND wxHAVE_GDK_X11)))
if(UNIX AND NOT APPLE AND NOT WIN32 AND (WXX11 OR WXGTK2 OR (WXGTK AND wxHAVE_GDK_X11)))
find_package(X11 REQUIRED)
list(APPEND wxTOOLKIT_INCLUDE_DIRS ${X11_INCLUDE_DIR})
list(APPEND wxTOOLKIT_LIBRARIES ${X11_LIBRARIES})

161
build/files
View file

@ -1668,167 +1668,6 @@ GTK1_HDR =
wx/gtk1/treectrl.h
# wxMotif
MOTIF_LOWLEVEL_SRC =
$(XWIN_LOWLEVEL_SRC)
src/unix/displayx11.cpp
src/generic/textmeasure.cpp
src/x11/bitmap.cpp
src/x11/brush.cpp
src/x11/palette.cpp
src/x11/pen.cpp
src/x11/region.cpp
src/x11/utilsx.cpp
MOTIF_LOWLEVEL_HDR =
$(XWIN_LOWLEVEL_HDR)
wx/x11/bitmap.h
wx/x11/brush.h
wx/x11/palette.h
wx/x11/pen.h
wx/x11/region.h
MOTIF_SRC =
src/motif/accel.cpp
src/motif/app.cpp
src/motif/bmpbuttn.cpp
src/motif/bmpmotif.cpp
src/motif/button.cpp
src/motif/checkbox.cpp
src/motif/checklst.cpp
src/motif/choice.cpp
src/motif/clipbrd.cpp
src/motif/colour.cpp
src/motif/combobox.cpp
src/motif/combobox_native.cpp
src/motif/control.cpp
src/motif/cursor.cpp
src/motif/data.cpp
src/motif/dataobj.cpp
src/motif/dc.cpp
src/motif/dcclient.cpp
src/motif/dcmemory.cpp
src/motif/dcscreen.cpp
src/motif/dialog.cpp
src/motif/evtloop.cpp
src/motif/filedlg.cpp
src/motif/font.cpp
src/motif/frame.cpp
src/motif/gauge.cpp
src/motif/sockmot.cpp
src/motif/icon.cpp
src/motif/listbox.cpp
src/motif/main.cpp
src/motif/menu.cpp
src/motif/menuitem.cpp
src/motif/minifram.cpp
src/motif/msgdlg.cpp
src/motif/popupwin.cpp
src/motif/radiobox.cpp
src/motif/radiobut.cpp
src/motif/scrolbar.cpp
src/motif/settings.cpp
src/motif/slider.cpp
src/motif/spinbutt.cpp
src/motif/statbmp.cpp
src/motif/statbox.cpp
src/motif/stattext.cpp
src/motif/textctrl.cpp
src/motif/textentry.cpp
src/motif/timer.cpp
src/motif/toolbar.cpp
src/motif/toplevel.cpp
src/motif/utils.cpp
src/motif/window.cpp
src/motif/xmcombo/xmcombo.c
# Generic files used by wxMotif:
src/generic/activityindicator.cpp
src/generic/clrpickerg.cpp
src/generic/collpaneg.cpp
src/generic/colrdlgg.cpp
src/generic/dirdlgg.cpp
src/generic/fdrepdlg.cpp
src/generic/filepickerg.cpp
src/generic/fontdlgg.cpp
src/generic/fontpickerg.cpp
src/generic/listctrl.cpp
src/generic/mdig.cpp
src/generic/notebook.cpp
src/generic/prntdlgg.cpp
src/generic/statline.cpp
src/generic/statusbr.cpp
src/generic/tabg.cpp
MOTIF_HDR =
wx/generic/clrpickerg.h
wx/generic/collpaneg.h
wx/generic/colrdlgg.h
wx/generic/ctrlsub.h
wx/generic/dirdlgg.h
wx/generic/fdrepdlg.h
wx/generic/filepickerg.h
wx/generic/fontdlgg.h
wx/generic/fontpickerg.h
wx/generic/listctrl.h
wx/generic/mdig.h
wx/generic/notebook.h
wx/generic/prntdlgg.h
wx/generic/statline.h
wx/generic/statusbr.h
wx/generic/tabg.h
wx/motif/accel.h
wx/motif/app.h
wx/motif/bmpbuttn.h
wx/motif/bmpmotif.h
wx/motif/button.h
wx/motif/checkbox.h
wx/motif/checklst.h
wx/motif/chkconf.h
wx/motif/choice.h
wx/motif/clipbrd.h
wx/motif/colour.h
wx/motif/combobox.h
wx/motif/control.h
wx/motif/ctrlsub.h
wx/motif/cursor.h
wx/motif/dataform.h
wx/motif/dataobj.h
wx/motif/dataobj2.h
wx/motif/dc.h
wx/motif/dcclient.h
wx/motif/dcmemory.h
wx/motif/dcprint.h
wx/motif/dcscreen.h
wx/motif/dialog.h
wx/motif/dnd.h
wx/motif/filedlg.h
wx/motif/font.h
wx/motif/frame.h
wx/motif/gauge.h
wx/motif/icon.h
wx/motif/listbox.h
wx/motif/menu.h
wx/motif/menuitem.h
wx/motif/minifram.h
wx/motif/msgdlg.h
wx/motif/popupwin.h
wx/motif/print.h
wx/motif/private.h
wx/motif/radiobox.h
wx/motif/radiobut.h
wx/motif/scrolbar.h
wx/motif/slider.h
wx/motif/spinbutt.h
wx/motif/statbmp.h
wx/motif/statbox.h
wx/motif/stattext.h
wx/motif/textctrl.h
wx/motif/textentry.h
wx/motif/tglbtn.h
wx/motif/toolbar.h
wx/motif/toplevel.h
wx/motif/window.h
# wxX11
X11_LOWLEVEL_SRC =

1
build/tools/before_install.sh
View file

@ -51,7 +51,6 @@ case $(uname -s) in
case "$wxCONFIGURE_FLAGS" in
*--with-directfb*) libtoolkit_dev='libdirectfb-dev' ;;
*--with-motif*) libtoolkit_dev='libmotif-dev libxmu-dev' ;;
*--with-qt*) libtoolkit_dev='qtdeclarative5-dev libqt5opengl5-dev';;
*--with-x11*) extra_deps='libpango1.0-dev' ;;
*--disable-gui*) ;;

1
build/update-setup-h
View file

@ -108,7 +108,6 @@ if [ ! -f wxwin.m4 ]; then
fi
update_common_setup_h include/wx/android/setup.h
update_common_setup_h include/wx/motif/setup.h
update_common_setup_h include/wx/msw/setup.h
update_common_setup_h include/wx/gtk/setup.h
update_common_setup_h include/wx/osx/setup.h

411
configure vendored
View file

@ -718,9 +718,6 @@ COND_TOOLKIT_OSX_CARBON
COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_MSW_USE_GUI_1
COND_TOOLKIT_MSW
COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_MOTIF_USE_GUI_1
COND_TOOLKIT_MOTIF
COND_TOOLKIT_MAC
COND_TOOLKIT_GTK_USE_GUI_1
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0
@ -1084,7 +1081,6 @@ with_dpi
enable_universal
with_themes
with_gtk
with_motif
with_osx_cocoa
with_osx_iphone
with_osx
@ -2369,7 +2365,6 @@ Optional Packages:
--with-dpi=none|system|per-monitor set dpi-awareness (Win32 only), default is per-monitor
--with-themes=all|list use only the specified comma-separated list of wxUniversal themes
--with-gtk[=VERSION] use GTK+, VERSION can be 3 (default), 2, 1 or "any"
--with-motif use Motif/Lesstif
--with-osx_cocoa use macOS (Cocoa)
--with-osx_iphone use iOS
--with-osx use macOS (default port, Cocoa)
@ -3846,12 +3841,11 @@ USE_ALPHA=
NEEDS_D_REENTRANT_FOR_R_FUNCS=0
ALL_TOOLKITS="GTK OSX_COCOA OSX_IPHONE MOTIF MSW X11 DFB QT"
ALL_TOOLKITS="GTK OSX_COCOA OSX_IPHONE MSW X11 DFB QT"
DEFAULT_wxUSE_GTK=0
DEFAULT_wxUSE_OSX_COCOA=0
DEFAULT_wxUSE_OSX_IPHONE=0
DEFAULT_wxUSE_MOTIF=0
DEFAULT_wxUSE_MSW=0
DEFAULT_wxUSE_X11=0
DEFAULT_wxUSE_DFB=0
@ -3860,7 +3854,6 @@ DEFAULT_wxUSE_QT=0
DEFAULT_DEFAULT_wxUSE_GTK=0
DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0
DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=0
DEFAULT_DEFAULT_wxUSE_MOTIF=0
DEFAULT_DEFAULT_wxUSE_MSW=0
DEFAULT_DEFAULT_wxUSE_X11=0
DEFAULT_DEFAULT_wxUSE_DFB=0
@ -4411,19 +4404,6 @@ fi
# Check whether --with-motif was given.
if test "${with_motif+set}" = set; then :
withval=$with_motif;
if test "$withval" != yes; then
as_fn_error $? "Option --with-motif doesn't accept any arguments" "$LINENO" 5
fi
wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1
fi
# Check whether --with-osx_cocoa was given.
if test "${with_osx_cocoa+set}" = set; then :
withval=$with_osx_cocoa;
@ -4630,10 +4610,9 @@ $as_echo_n "checking for toolkit... " >&6; }
# In Wine, we need to default to MSW, not GTK or MOTIF
# In Wine, we need to default to MSW, not GTK
if test "$wxUSE_WINE" = "yes"; then
DEFAULT_DEFAULT_wxUSE_GTK=0
DEFAULT_DEFAULT_wxUSE_MOTIF=0
DEFAULT_DEFAULT_wxUSE_MSW=1
wxUSE_SHARED=no
CC=${CC:-winegcc}
@ -4670,7 +4649,7 @@ if test "$wxUSE_GUI" = "yes"; then
NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} \
+ ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_DFB:-0} \
+ ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} \
+ ${wxUSE_MSW:-0} \
+ ${wxUSE_X11:-0} + ${wxUSE_QT:-0}`
@ -24730,7 +24709,6 @@ fi
if test -n "$GCC"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __sync_xxx_and_fetch builtins" >&5
$as_echo_n "checking for __sync_xxx_and_fetch builtins... " >&6; }
@ -24782,10 +24760,6 @@ SEARCH_INCLUDE="\
/usr/local/include/X11R7 \
/usr/local/include/X11R6 \
\
/usr/Motif-2.1/include \
/usr/Motif-1.2/include \
/usr/include/Motif1.2 \
\
/usr/dt/include \
/usr/openwin/include \
\
@ -28892,7 +28866,7 @@ $as_echo "yes" >&6; }
fi
fi
if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
if test "$wxUSE_X11" = 1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
$as_echo_n "checking for X... " >&6; }
@ -29585,9 +29559,6 @@ fi
TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'`
COMPILED_X_PROGRAM=0
fi
if test "$wxUSE_X11" = 1; then
if test "$wxUSE_NANOX" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MicroWindows/NanoX distribution" >&5
$as_echo_n "checking for MicroWindows/NanoX distribution... " >&6; }
@ -29794,343 +29765,7 @@ done
TOOLKIT=X11
GUIDIST=X11_DIST
fi
if test "$wxUSE_MOTIF" = 1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Motif/Lesstif headers" >&5
$as_echo_n "checking for Motif/Lesstif headers... " >&6; }
ac_find_includes=
for ac_dir in $SEARCH_INCLUDE /usr/include
do
if test -f "$ac_dir/Xm/Xm.h"; then
ac_find_includes=$ac_dir
break
fi
done
if test "$ac_find_includes" != "" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $ac_find_includes" >&5
$as_echo "found in $ac_find_includes" >&6; }
if test "x$ac_find_includes" = "x/usr/include"; then
ac_path_to_include=""
else
echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null
result=$?
if test $result = 0; then
ac_path_to_include=""
else
ac_path_to_include=" -I$ac_find_includes"
fi
fi
TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include"
else
save_CFLAGS=$CFLAGS
CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <Xm/Xm.h>
int
main ()
{
int version;
version = xmUseVersion;
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found in default search path" >&5
$as_echo "found in default search path" >&6; }
COMPILED_X_PROGRAM=1
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
as_fn_error $? "please set CPPFLAGS to contain the location of Xm/Xm.h" "$LINENO" 5
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
CFLAGS=$save_CFLAGS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Motif/Lesstif library" >&5
$as_echo_n "checking for Motif/Lesstif library... " >&6; }
ac_find_libraries=
for ac_dir in $SEARCH_LIB
do
for ac_extension in a so sl dylib dll.a; do
if test -f "$ac_dir/libXm.$ac_extension"; then
ac_find_libraries=$ac_dir
break 2
fi
done
done
if test "x$ac_find_libraries" != "x" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $ac_find_libraries" >&5
$as_echo "found in $ac_find_libraries" >&6; }
if test "$ac_find_libraries" = "default location"; then
ac_path_to_link=""
else
echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
result=$?
if test $result = 0; then
ac_path_to_link=""
else
ac_path_to_link=" -L$ac_find_libraries"
fi
fi
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
else
save_CFLAGS=$CFLAGS
CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
save_LIBS="$LIBS"
LIBS="$GUI_TK_LIBRARY -lXm -lXmu -lXext -lX11"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <Xm/Xm.h>
int
main ()
{
int version;
version = xmUseVersion;
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found in default search path" >&5
$as_echo "found in default search path" >&6; }
COMPILED_X_PROGRAM=1
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
as_fn_error $? "please set LDFLAGS to contain the location of libXm" "$LINENO" 5
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS=$save_CFLAGS
LIBS="$save_LIBS"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need -lXp and/or -lSM -lICE" >&5
$as_echo_n "checking if we need -lXp and/or -lSM -lICE... " >&6; }
libp_link=""
libsm_ice_link=""
libs_found=0
for libp in "" " -lXp"; do
if test "$libs_found" = 0; then
for libsm_ice in "" " -lSM -lICE"; do
if test "$libs_found" = 0; then
save_LIBS="$LIBS"
LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt ${libsm_ice} -lX11"
save_CFLAGS=$CFLAGS
CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <Xm/Xm.h>
#include <Xm/List.h>
int
main ()
{
XmString string = NULL;
Widget w = NULL;
int position = 0;
XmListAddItem(w, string, position);
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
libp_link="$libp"
libsm_ice_link="$libsm_ice"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: need ${libp_link} ${libsm_ice_link}" >&5
$as_echo "need ${libp_link} ${libsm_ice_link}" >&6; }
libs_found=1
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS="$save_LIBS"
CFLAGS=$save_CFLAGS
fi
done
fi
done
if test "$libs_found" = 0; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: can't find the right libraries" >&5
$as_echo "can't find the right libraries" >&6; }
as_fn_error $? "can't link a simple motif program" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SgCreateList in -lSgm" >&5
$as_echo_n "checking for SgCreateList in -lSgm... " >&6; }
if ${ac_cv_lib_Sgm_SgCreateList+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lSgm $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char SgCreateList ();
int
main ()
{
return SgCreateList ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_Sgm_SgCreateList=yes
else
ac_cv_lib_Sgm_SgCreateList=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Sgm_SgCreateList" >&5
$as_echo "$ac_cv_lib_Sgm_SgCreateList" >&6; }
if test "x$ac_cv_lib_Sgm_SgCreateList" = xyes; then :
libsgm_link=" -lSgm"
fi
save_CFLAGS=$CFLAGS
CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Motif 2" >&5
$as_echo_n "checking for Motif 2... " >&6; }
if ${wx_cv_lib_motif2+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <Xm/Xm.h>
int
main ()
{
#if XmVersion < 2000
Not Motif 2
#endif
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
wx_cv_lib_motif2="yes"
else
wx_cv_lib_motif2="no"
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_motif2" >&5
$as_echo "$wx_cv_lib_motif2" >&6; }
if test "$wx_cv_lib_motif2" = "yes"; then
$as_echo "#define __WXMOTIF20__ 1" >>confdefs.h
else
$as_echo "#define __WXMOTIF20__ 0" >>confdefs.h
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Motif is Lesstif" >&5
$as_echo_n "checking whether Motif is Lesstif... " >&6; }
if ${wx_cv_lib_lesstif+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <Xm/Xm.h>
int
main ()
{
#if !defined(LesstifVersion) || LesstifVersion <= 0
Not Lesstif
#endif
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
wx_cv_lib_lesstif="yes"
else
wx_cv_lib_lesstif="no"
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_lib_lesstif" >&5
$as_echo "$wx_cv_lib_lesstif" >&6; }
if test "$wx_cv_lib_lesstif" = "yes"; then
$as_echo "#define __WXLESSTIF__ 1" >>confdefs.h
else
$as_echo "#define __WXLESSTIF__ 0" >>confdefs.h
fi
CFLAGS=$save_CFLAGS
GUI_TK_LIBRARY="$GUI_TK_LIBRARY ${libsgm_link} -lXm ${libp_link} -lXmu -lXext -lXt ${libsm_ice_link} -lX11"
TOOLKIT=MOTIF
GUIDIST=MOTIF_DIST
fi
if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
if test "$wxUSE_LIBXPM" = "sys"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Xpm library" >&5
$as_echo_n "checking for Xpm library... " >&6; }
@ -30476,7 +30111,7 @@ fi
USE_XINERAMA=0
if test "$wxUSE_DISPLAY" = "yes"; then
if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$WXGTK1" = 1; then
if test "$wxUSE_X11" = 1 -o "$WXGTK1" = 1; then
ac_find_libraries=
@ -31594,7 +31229,7 @@ if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
OPENGL_LIBS="-framework OpenGL -framework AGL"
elif test "$wxUSE_MSW" = 1; then
OPENGL_LIBS="-lopengl32 -lglu32"
elif test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_QT" = 1; then
elif test "$wxUSE_X11" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_QT" = 1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL headers" >&5
$as_echo_n "checking for OpenGL headers... " >&6; }
@ -40133,7 +39768,7 @@ $as_echo "$as_me: WARNING: Clipboard not yet supported under $TOOLKIT... disable
fi
if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_DFB" = 1; then
if test "$wxUSE_X11" = 1 -o "$wxUSE_DFB" = 1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&5
$as_echo "$as_me: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&2;}
wxUSE_DRAG_AND_DROP=no
@ -40165,7 +39800,7 @@ if test "$wxUSE_MOUSEWHEEL" = "yes" ; then
fi
if test "$wxUSE_UIACTIONSIMULATOR" = "yes" ; then
if test "$wxUSE_GTK" = 1 -o "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1; then
if test "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
if test "$wxUSE_XTEST" = "yes" ; then
pkg_failed=no
@ -40693,17 +40328,12 @@ if test "$wxUSE_TOOLBAR" = "yes"; then
fi
if test "$wxUSE_TOOLTIPS" = "yes"; then
if test "$wxUSE_MOTIF" = 1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxTooltip not supported yet under Motif... disabled" >&5
$as_echo "$as_me: WARNING: wxTooltip not supported yet under Motif... disabled" >&2;}
else
if test "$wxUSE_UNIVERSAL" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxTooltip not supported yet in wxUniversal... disabled" >&5
if test "$wxUSE_UNIVERSAL" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: wxTooltip not supported yet in wxUniversal... disabled" >&5
$as_echo "$as_me: WARNING: wxTooltip not supported yet in wxUniversal... disabled" >&2;}
else
$as_echo "#define wxUSE_TOOLTIPS 1" >>confdefs.h
else
$as_echo "#define wxUSE_TOOLTIPS 1" >>confdefs.h
fi
fi
fi
@ -44490,21 +44120,6 @@ EOF
COND_TOOLKIT_MAC=""
fi
COND_TOOLKIT_MOTIF="#"
if test "x$TOOLKIT" = "xMOTIF" ; then
COND_TOOLKIT_MOTIF=""
fi
COND_TOOLKIT_MOTIF_USE_GUI_1="#"
if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_MOTIF_USE_GUI_1=""
fi
COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0=""
fi
COND_TOOLKIT_MSW="#"
if test "x$TOOLKIT" = "xMSW" ; then
COND_TOOLKIT_MSW=""
@ -46757,7 +46372,7 @@ echo " jpeg ${wxUSE_LIBJPEG-
echo " png ${wxUSE_LIBPNG-none}"
echo " regex ${wxUSE_REGEX}"
echo " tiff ${wxUSE_LIBTIFF-none}"
if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
if test "$wxUSE_X11" = 1; then
echo " xpm ${wxUSE_LIBXPM-none}"
fi
echo " lzma ${wxUSE_LIBLZMA}"

220
configure.in
View file

@ -111,14 +111,13 @@ NEEDS_D_REENTRANT_FOR_R_FUNCS=0
dnl the list of all available toolkits
dnl
dnl update NUM_TOOLKITS calculation below when adding a new toolkit here!
ALL_TOOLKITS="GTK OSX_COCOA OSX_IPHONE MOTIF MSW X11 DFB QT"
ALL_TOOLKITS="GTK OSX_COCOA OSX_IPHONE MSW X11 DFB QT"
dnl NB: these wxUSE_XXX constants have value of 0 or 1 unlike all the other ones
dnl which are either yes or no
DEFAULT_wxUSE_GTK=0
DEFAULT_wxUSE_OSX_COCOA=0
DEFAULT_wxUSE_OSX_IPHONE=0
DEFAULT_wxUSE_MOTIF=0
DEFAULT_wxUSE_MSW=0
DEFAULT_wxUSE_X11=0
DEFAULT_wxUSE_DFB=0
@ -130,7 +129,6 @@ dnl toolkit to use by default for the target platform
DEFAULT_DEFAULT_wxUSE_GTK=0
DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0
DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=0
DEFAULT_DEFAULT_wxUSE_MOTIF=0
DEFAULT_DEFAULT_wxUSE_MSW=0
DEFAULT_DEFAULT_wxUSE_X11=0
DEFAULT_DEFAULT_wxUSE_DFB=0
@ -276,7 +274,7 @@ case "${host}" in
*-*-cygwin* | *-*-mingw32* | *-*-mingw64* )
dnl MBN: some of the defines have been moved after toolkit detection
dnl because for wxMotif/wxGTK/wxX11 to build on Cygwin
dnl because for wxGTK/wxX11 to build on Cygwin
dnl USE_UNIX must be set and not USE_WIN32
PROGRAM_EXT=".exe"
DEFAULT_DEFAULT_wxUSE_MSW=1
@ -431,7 +429,6 @@ fi
dnl we use AC_ARG_WITH and not WX_ARG_WITH for the toolkit options as they
dnl shouldn't default to wxUSE_ALL_FEATURES
AC_ARG_WITH(gtk, [[ --with-gtk[=VERSION] use GTK+, VERSION can be 3 (default), 2, 1 or "any"]], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1])
WX_ARG_ONLY_WITH(motif, [ --with-motif use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
WX_ARG_ONLY_WITH(osx_cocoa, [ --with-osx_cocoa use macOS (Cocoa)], [wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1])
WX_ARG_ONLY_WITH(osx_iphone, [ --with-osx_iphone use iOS], [wxUSE_OSX_IPHONE="$withval" CACHE_OSX_IPHONE=1 TOOLKIT_GIVEN=1])
WX_ARG_ONLY_WITH(osx, [ --with-osx use macOS (default port, Cocoa)], [wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1])
@ -453,10 +450,9 @@ AC_MSG_CHECKING(for toolkit)
# In Wine, we need to default to MSW, not GTK or MOTIF
# In Wine, we need to default to MSW, not GTK
if test "$wxUSE_WINE" = "yes"; then
DEFAULT_DEFAULT_wxUSE_GTK=0
DEFAULT_DEFAULT_wxUSE_MOTIF=0
DEFAULT_DEFAULT_wxUSE_MSW=1
wxUSE_SHARED=no
CC=${CC:-winegcc}
@ -497,7 +493,7 @@ if test "$wxUSE_GUI" = "yes"; then
dnl this? what about using ALL_TOOLKITS? TODO)
NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} \
+ ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_DFB:-0} \
+ ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} \
+ ${wxUSE_MSW:-0} \
+ ${wxUSE_X11:-0} + ${wxUSE_QT:-0}`
@ -1484,7 +1480,7 @@ case "${host}" in
esac
dnl Determine whether we want to use Cygwin as Windows or POSIX platform: the
dnl latter makes more sense for wxGTK/Motif/X11 ports
dnl latter makes more sense for wxGTK/X11 ports
wants_win32=0
doesnt_want_win32=0
case "${host}" in
@ -1894,9 +1890,6 @@ dnl headers are included instead of the "fixed" (ANSI-fied) gcc ones.
dnl
dnl Also try to put all directories which may contain X11R6 before those which
dnl may contain X11R5/4 - we want to use R6 on machines which have both!
dnl
dnl In the same vein. Motif 2.1 should be tried before Motif 1.2 for the
dnl systems which have both (AIX 4.x does)
SEARCH_INCLUDE="\
/usr/local/include \
/usr/local/X11/include \
@ -1906,10 +1899,6 @@ SEARCH_INCLUDE="\
/usr/local/include/X11R7 \
/usr/local/include/X11R6 \
\
/usr/Motif-2.1/include \
/usr/Motif-1.2/include \
/usr/include/Motif1.2 \
\
/usr/dt/include \
/usr/openwin/include \
\
@ -3100,8 +3089,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
)
fi
dnl common part of X11 and Motif port checks
if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
if test "$wxUSE_X11" = 1; then
dnl use standard macros to check for X headers/libs, this brings
dnl support for the standard configure options --x-includes,
dnl --x-libraries and --no-x
@ -3118,9 +3106,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'`
COMPILED_X_PROGRAM=0
fi
if test "$wxUSE_X11" = 1; then
if test "$wxUSE_NANOX" = "yes"; then
AC_MSG_CHECKING(for MicroWindows/NanoX distribution)
if test "x$MICROWIN" = x ; then
@ -3171,178 +3156,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
TOOLKIT=X11
GUIDIST=X11_DIST
fi
if test "$wxUSE_MOTIF" = 1; then
AC_MSG_CHECKING(for Motif/Lesstif headers)
WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, Xm/Xm.h)
if test "$ac_find_includes" != "" ; then
AC_MSG_RESULT(found in $ac_find_includes)
WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE)
TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include"
else
save_CFLAGS=$CFLAGS
CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
AC_TRY_COMPILE(
[
#include <Xm/Xm.h>
],
[
int version;
version = xmUseVersion;
],
[
AC_MSG_RESULT(found in default search path)
COMPILED_X_PROGRAM=1
],
[
AC_MSG_RESULT(no)
AC_MSG_ERROR(please set CPPFLAGS to contain the location of Xm/Xm.h)
]
)
CFLAGS=$save_CFLAGS
fi
AC_MSG_CHECKING(for Motif/Lesstif library)
WX_PATH_FIND_LIBRARIES(Xm)
if test "x$ac_find_libraries" != "x" ; then
AC_MSG_RESULT(found in $ac_find_libraries)
WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY)
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
else
dnl it might happen that we found headers in one of the standard
dnl paths but the libs are elsewhere but still in default (linker)
dnl path -- try to compile a test program to check for this
save_CFLAGS=$CFLAGS
CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
save_LIBS="$LIBS"
LIBS="$GUI_TK_LIBRARY -lXm -lXmu -lXext -lX11"
AC_TRY_LINK(
[
#include <Xm/Xm.h>
],
[
int version;
version = xmUseVersion;
],
[
AC_MSG_RESULT(found in default search path)
COMPILED_X_PROGRAM=1
],
[
AC_MSG_RESULT(no)
AC_MSG_ERROR(please set LDFLAGS to contain the location of libXm)
]
)
CFLAGS=$save_CFLAGS
LIBS="$save_LIBS"
fi
AC_MSG_CHECKING([if we need -lXp and/or -lSM -lICE])
libp_link=""
libsm_ice_link=""
libs_found=0
for libp in "" " -lXp"; do
if test "$libs_found" = 0; then
for libsm_ice in "" " -lSM -lICE"; do
if test "$libs_found" = 0; then
save_LIBS="$LIBS"
LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt ${libsm_ice} -lX11"
save_CFLAGS=$CFLAGS
CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
AC_TRY_LINK(
[
#include <Xm/Xm.h>
#include <Xm/List.h>
],
[
XmString string = NULL;
Widget w = NULL;
int position = 0;
XmListAddItem(w, string, position);
],
[
libp_link="$libp"
libsm_ice_link="$libsm_ice"
AC_MSG_RESULT(
[need ${libp_link} ${libsm_ice_link}])
libs_found=1
], []
)
LIBS="$save_LIBS"
CFLAGS=$save_CFLAGS
fi
done
fi
done
if test "$libs_found" = 0; then
AC_MSG_RESULT([can't find the right libraries])
AC_MSG_ERROR([can't link a simple motif program])
fi
dnl this seems to be needed under IRIX and shouldn't do any harm
dnl elsewhere
AC_CHECK_LIB(Sgm, [SgCreateList], [libsgm_link=" -lSgm"])
save_CFLAGS=$CFLAGS
CFLAGS="$TOOLKIT_INCLUDE $CFLAGS"
AC_CACHE_CHECK([for Motif 2],
wx_cv_lib_motif2,
AC_TRY_COMPILE([
#include <Xm/Xm.h>
],
[
#if XmVersion < 2000
Not Motif 2
#endif
],
wx_cv_lib_motif2="yes",
wx_cv_lib_motif2="no"))
if test "$wx_cv_lib_motif2" = "yes"; then
AC_DEFINE(__WXMOTIF20__,1)
else
AC_DEFINE(__WXMOTIF20__,0)
fi
AC_CACHE_CHECK([whether Motif is Lesstif],
wx_cv_lib_lesstif,
AC_TRY_COMPILE([
#include <Xm/Xm.h>
],
[
#if !defined(LesstifVersion) || LesstifVersion <= 0
Not Lesstif
#endif
],
wx_cv_lib_lesstif="yes",
wx_cv_lib_lesstif="no")
)
if test "$wx_cv_lib_lesstif" = "yes"; then
AC_DEFINE(__WXLESSTIF__,1)
else
AC_DEFINE(__WXLESSTIF__,0)
fi
CFLAGS=$save_CFLAGS
GUI_TK_LIBRARY="$GUI_TK_LIBRARY ${libsgm_link} -lXm ${libp_link} -lXmu -lXext -lXt ${libsm_ice_link} -lX11"
TOOLKIT=MOTIF
GUIDIST=MOTIF_DIST
fi
dnl more tests common to X11 and Motif:
if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
dnl test for external libxpm if we're configured to use it
if test "$wxUSE_LIBXPM" = "sys"; then
AC_MSG_CHECKING(for Xpm library)
@ -3518,8 +3332,8 @@ dnl ---------------------------------------------------------------------------
USE_XINERAMA=0
if test "$wxUSE_DISPLAY" = "yes"; then
dnl Xinerama is used for wxGTK1/wxX11/wxMotif only
if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$WXGTK1" = 1; then
dnl Xinerama is used for wxGTK1/wxX11 only
if test "$wxUSE_X11" = 1 -o "$WXGTK1" = 1; then
WX_FIND_LIB(Xinerama, XineramaQueryScreens)
if test "$ac_find_libraries" != "" ; then
if test "$ac_find_libraries" != "std" ; then
@ -3593,7 +3407,7 @@ if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
OPENGL_LIBS="-framework OpenGL -framework AGL"
elif test "$wxUSE_MSW" = 1; then
OPENGL_LIBS="-lopengl32 -lglu32"
elif test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_QT" = 1; then
elif test "$wxUSE_X11" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_QT" = 1; then
dnl adjust CPPFLAGS to include GL/gl.h location if necessary
dnl (/opt/graphics/OpenGL is for HP-UX systems, bug 925307)
@ -6564,7 +6378,7 @@ if test "$wxUSE_CLIPBOARD" = "yes"; then
fi
if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_DFB" = 1; then
if test "$wxUSE_X11" = 1 -o "$wxUSE_DFB" = 1; then
AC_MSG_WARN([Drag and drop not yet supported under $TOOLKIT... disabled])
wxUSE_DRAG_AND_DROP=no
fi
@ -6592,7 +6406,7 @@ if test "$wxUSE_MOUSEWHEEL" = "yes" ; then
fi
if test "$wxUSE_UIACTIONSIMULATOR" = "yes" ; then
if test "$wxUSE_GTK" = 1 -o "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1; then
if test "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
if test "$wxUSE_XTEST" = "yes" ; then
PKG_CHECK_MODULES(XTST, xtst,
[
@ -6984,14 +6798,10 @@ if test "$wxUSE_TOOLBAR" = "yes"; then
fi
if test "$wxUSE_TOOLTIPS" = "yes"; then
if test "$wxUSE_MOTIF" = 1; then
AC_MSG_WARN([wxTooltip not supported yet under Motif... disabled])
if test "$wxUSE_UNIVERSAL" = "yes"; then
AC_MSG_WARN([wxTooltip not supported yet in wxUniversal... disabled])
else
if test "$wxUSE_UNIVERSAL" = "yes"; then
AC_MSG_WARN([wxTooltip not supported yet in wxUniversal... disabled])
else
AC_DEFINE(wxUSE_TOOLTIPS)
fi
AC_DEFINE(wxUSE_TOOLTIPS)
fi
fi
@ -8586,7 +8396,7 @@ echo " jpeg ${wxUSE_LIBJPEG-
echo " png ${wxUSE_LIBPNG-none}"
echo " regex ${wxUSE_REGEX}"
echo " tiff ${wxUSE_LIBTIFF-none}"
if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
if test "$wxUSE_X11" = 1; then
echo " xpm ${wxUSE_LIBXPM-none}"
fi
echo " lzma ${wxUSE_LIBLZMA}"

14
demos/bombs/readme.txt
View file

@ -13,12 +13,12 @@ installed wxWin on your system.
Now you have to modify makefile.bcc
(if a Windows user) or makefile.unx (if you use a real OS) setting the
proper values for the directories. Finally, you have to run:
make -f makefile.bcc
for Windows (nmake if you use a MicroSoft compiler), or:
make -f makefile.unx xview
for Unix+xview and
make -f makefile.unx motif
for Unix+motif
make -f makefile.gcc
for Windows or
nmake -f makefile.vc
if you use a MicroSoft compiler, or:
make -f makefile.unx
for Unix.
If you are lucky, you will find the bombs executable, ready to be run.
@ -75,4 +75,4 @@ wxWindows :-)) to wxBombs.
3) Added SetClientData to resize the window on Restart; eliminated
scrollbars; made the frame unresizable.
4) Added makefile.dos for VC++ 1.x, makefile.wat for Watcom C++.
4) Added makefile.dos for VC++ 1.x, makefile.wat for Watcom C++.

13
demos/life/life.cpp
View file

@ -35,7 +35,7 @@
// resources
// --------------------------------------------------------------------------
#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__) || defined(__WXQT__)
#if defined(__WXGTK__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__) || defined(__WXQT__)
// application icon
#include "mondrian.xpm"
@ -163,11 +163,6 @@ bool LifeApp::OnInit()
// show it
frame->Show(true);
// just for Motif
#ifdef __WXMOTIF__
frame->UpdateInfoText();
#endif
// enter the main message loop and run the app
return true;
}
@ -623,7 +618,7 @@ LifeNavigator::LifeNavigator(wxWindow *parent)
bmpe = wxBITMAP(east),
bmps = wxBITMAP(south);
#if !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXMAC__)
#if !defined(__WXGTK__) && !defined(__WXMAC__)
bmpn.SetMask(new wxMask(bmpn, *wxLIGHT_GREY));
bmpw.SetMask(new wxMask(bmpw, *wxLIGHT_GREY));
bmpc.SetMask(new wxMask(bmpc, *wxLIGHT_GREY));
@ -1093,8 +1088,8 @@ void LifeCanvas::OnScroll(wxScrollWinEvent& event)
m_thumbY = m_viewportH;
}
#if defined(__WXGTK__) || defined(__WXMOTIF__)
// wxGTK and wxMotif update the thumb automatically (wxMSW doesn't);
#if defined(__WXGTK__)
// wxGTK updates the thumb automatically (wxMSW doesn't);
// so reset it back as we always want it to be in the same position.
if (type != wxEVT_SCROLLWIN_THUMBTRACK)
{

6
demos/poem/wxpoem.txt
View file

@ -23,7 +23,7 @@ wxPoem was converted to use the wxWindows toolkit, from the original
WinPoem which received a favourable review from Windows Shareware 500.
Since it now uses wxWindows, wxPoem may be compiled on a variety
of platforms such as X (XView or Motif), Windows and NT.
of platforms.
Files
-----
@ -49,9 +49,7 @@ Installation
UNIX
====
wxPoem comes in Open Look and Motif versions for the Sun, and a
Linux Open Look version. For other platforms, you will need to
recompile the source.
You will need to compile wxPoem from the source.
Use

2
docs/base/readme.txt
View file

@ -3,7 +3,7 @@
NB: this file applies to wxBase library only. If you are using a GUI version
of wxWidgets, please refer to the documentation in the appropriate
subdirectory (msw, gtk, motif &c).
subdirectory (msw, gtk &c).
Welcome to wxBase!

2
docs/changes.txt
View file

@ -33,6 +33,8 @@ Changes in behaviour which may result in build errors
default, you need to set WXWIN_COMPATIBILITY_3_0 to 1 to enable them. Symbols
deprecated in 2.8 are not available any longer.
- wxMotif port has been removed, please use wxWidgets 3.2 if you still need it.
3.3.0: (released 2022-??-??)
----------------------------

1
docs/contributing/about-platform-toolkit-and-library-names.md
View file

@ -43,7 +43,6 @@ Where:
- `msw`
- `gtk`, `gtk2`, `gtk3`, `gtk4`
- `osx_cocoa`, `osx_iphone`
- `motif`
- `x11`
- `dfb`
- `qt`

2
docs/contributing/how-to-add-files-to-build-system.md
View file

@ -97,7 +97,7 @@ organized into variables for toolkits, platforms and libraries. The variables
come in pairs: there's always `FOO_SRC` for source files and `FOO_HDR` for header
files. Platform or toolkit specific files are grouped together in variable
with platform or toolkit name in them, e.g. `BASE_WIN32_SRC`, `BASE_UNIX_SRC`,
`GTK_SRC`, `MOTIF_SRC`.
`GTK_SRC`.
Note: A side effect of this toolkit-centric organization is that one file may
be present several times in `files.bkl` in different contexts.

1
docs/doxygen/Doxyfile
View file

@ -299,7 +299,6 @@ INPUT = mainpages \
overviews \
../gtk \
../ios \
../motif \
../msw \
../osx \
../qt \

2
docs/doxygen/groups/class_managedwnd.h
View file

@ -11,7 +11,7 @@
@ingroup group_class
There are several types of window that are directly controlled by the window
manager (such as MS Windows, or the Motif Window Manager). Frames and dialogs
manager (such as MS Windows, or the X11 Window Manager). Frames and dialogs
are similar in wxWidgets, but only dialogs may be modal.
Related Overviews: @ref overview_cmndlg

4
docs/doxygen/groups/funcmacro_dialog.h
View file

@ -13,8 +13,8 @@
Below are a number of convenience functions for getting input from the user
or displaying messages. Note that in these functions the last three parameters
are optional. However, it is recommended to pass a parent frame parameter, or
(in MS Windows or Motif) the wrong window frame may be brought to the front when
the dialog box is popped up.
the wrong window frame may be brought to the front when the dialog box is
popped up.
*/

2
docs/doxygen/mainpages/cat_classes.h
View file

@ -62,7 +62,7 @@ Other layout classes:
@section page_class_cat_managedwnd Managed Windows
There are several types of window that are directly controlled by the window
manager (such as MS Windows, or the Motif Window Manager). Frames and dialogs
manager (such as MS Windows, or the X11 Window Manager). Frames and dialogs
are similar in wxWidgets, but only dialogs may be modal.
Related Overviews: @ref overview_cmndlg

4
docs/doxygen/mainpages/const_cpp.h
View file

@ -32,8 +32,8 @@ using @ifdef_ and not @if_.
@itemdef{\__WXGTK218__, GTK+ 2.18 or higher}
@itemdef{\__WXGTK220__, GTK+ 2.20 or higher}
@itemdef{\__WXMAC__, old define, same as <tt>\__WXOSX__</tt>}
@itemdef{\__WXMOTIF__, Motif}
@itemdef{\__WXMOTIF20__, Motif 2.0 or higher}
@itemdef{\__WXMOTIF__, Motif (not used any longer).}
@itemdef{\__WXMOTIF20__, Motif 2.0 or higher (not used any longer).}
@itemdef{\__WXMSW__, GUI using <a href="http://en.wikipedia.org/wiki/Windows_User">Windows Controls</a>.
Notice that for compatibility reasons, this symbol is defined for console
applications under Windows as well, but it should only be used in the GUI code

8
docs/doxygen/mainpages/const_wxusedef.h
View file

@ -310,14 +310,6 @@ library:
@endDefList
@section page_wxusedef_motif wxMotif Symbols
@beginDefList
@itemdef{wxUSE_GADGETS, Use xmCascadeButtonGadgetClass, xmLabelGadgetClass, xmPushButtonGadgetClass and xmToggleButtonGadgetClass classes.}
@itemdef{wxUSE_INVISIBLE_RESIZE, See src/motif/dialog.cpp file.}
@endDefList
@section page_wxusedef_msw wxMSW Symbols
@beginDefList

2
docs/doxygen/mainpages/devtips.h
View file

@ -85,7 +85,7 @@ wxWidgets can also be built in @b multilib and @b monolithic variants. See the
When using project files and makefiles directly to build wxWidgets, options are
configurable in the file @c "wx/XXX/setup.h" where XXX is the required
platform (such as @c msw, @c motif, @c gtk, @c mac).
platform (such as @c msw, @c gtk, @c mac).
Some settings are a matter of taste, some help with platform-specific problems,
and others can be set to minimize the size of the library. Please see the

10
docs/doxygen/mainpages/platdetails.h
View file

@ -79,16 +79,6 @@ In order to configure wxWidgets to compile wxX11 you will need to type:
@section page_port_wxmotif wxMotif
wxMotif is a port of wxWidgets for X11 systems using Motif libraries.
It is no longer actively maintained and by now rather obsolete.
@subpage plat_motif_install "Build Instructions"
@section page_port_wxmsw wxMSW
wxMSW is a port of wxWidgets for the Windows platforms (Windows XP and later

8
docs/doxygen/overviews/bitmap.h
View file

@ -43,7 +43,7 @@ wxIcon icon(wxICON(sample));
// The above line is equivalent to this:
#if defined(__WXGTK__) || defined(__WXMOTIF__)
#if defined(__WXGTK__)
wxIcon icon(sample_xpm);
#endif
@ -116,7 +116,7 @@ Under wxGTK, wxBitmap may load the following formats:
@li XPM data and file (wxBITMAP_TYPE_XPM)
@li All formats that are supported by the wxImage class.
Under wxMotif and wxX11, wxBitmap may load the following formats:
Under wxX11, wxBitmap may load the following formats:
@li XBM data and file (wxBITMAP_TYPE_XBM)
@li XPM data and file (wxBITMAP_TYPE_XPM)
@ -135,7 +135,7 @@ Under wxGTK, wxIcon may load the following formats:
@li XPM data and file (wxBITMAP_TYPE_XPM)
@li All formats that are supported by the wxImage class.
Under wxMotif and wxX11, wxIcon may load the following formats:
Under wxX11, wxIcon may load the following formats:
@li XBM data and file (wxBITMAP_TYPE_XBM)
@li XPM data and file (wxBITMAP_TYPE_XPM)
@ -155,7 +155,7 @@ cursors):
@li None (stock cursors only).
Under wxMotif and wxX11, wxCursor may load the following formats:
Under wxX11, wxCursor may load the following formats:
@li XBM data and file (wxBITMAP_TYPE_XBM).

2
docs/doxygen/overviews/font.h
View file

@ -71,7 +71,7 @@ it to wxFont::SetNativeFontInfo later to recreate exactly the same font.
Note that the contents of this string depends on the platform and shouldn't be
used for any other purpose (in particular, it is not meant to be shown to the
user). Also please note that although the native font information is currently
implemented for Windows and Unix (GTK+ and Motif) ports only, all the methods
implemented for Windows and Unix (GTK and X11) ports only, all the methods
are available for all the ports and should be used to make your program work
correctly when they are implemented later.

3
docs/index.htm
View file

@ -44,7 +44,6 @@
<a href="msw/readme.txt">wxMSW</a> (<a href="msw/winxp.txt">wxMSW for WinXP</a>),
<a href="gtk/readme.txt">wxGTK</a>,
<a href="osx/readme.txt">wxOSX</a>,
<a href="motif/readme.txt">wxMotif</a>,
<a href="qt/readme.txt">wxQt</a>
<a href="x11/readme.txt">wxX11</a>,
<a href="univ/readme.txt">Univ</a>,
@ -53,7 +52,6 @@
<li>Installation:
<a href="msw/install.md">wxMSW</a>,
<a href="gtk/install.md">wxGTK</a>,
<a href="motif/install.md">wxMotif</a>,
<a href="x11/install.md">wxX11</a>,
<a href="osx/install.md">wxOSX</a>,
<a href="qt/install.md">wxQt</a>,
@ -77,7 +75,6 @@
<li><a href="faqcmn.htm">Questions common to all platforms</a></font></li>
<li><a href="faqmsw.htm">wxWidgets for Windows</a></font></li>
<li><a href="faqgtk.htm">wxWidgets for GTK+</a></font></li>
<li><a href="faqmot.htm">wxWidgets for Motif</a></font></li>
<li><a href="faqx11.htm">wxWidgets for X11</a></font></li>
<li><a href="faqmac.htm">wxWidgets for Mac</a></font></li>
</ul>

17
docs/motif/aix.txt
View file

@ -1,17 +0,0 @@
Notes for wxWidgets compilation on AIX
--------------------------------------
wxWidgets 2.0 has been compiled under AIX with the C set ++ 3.1.
The environment variables CC and CXX should be set accordingly before running
configure for the first time:
For Bourne shell (sh, ksh, zsh, bash) users:
CC=xlc ; export CC
CXX=xlC ; export CXX
For C shell (csh, tcsh) users:
setenv CC xlc
setenv CXX xlC

468
docs/motif/install.md
View file

@ -1,468 +0,0 @@
wxWidgets for Motif installation {#plat_motif_install}
--------------------------------
[TOC]
IMPORTANT NOTE:
If you experience problems installing, please re-read these
instructions and other related files (todo.txt, bugs.txt and
osname.txt for your platform if it exists) carefully before
mailing wx-users or the author. Preferably, try to fix the
problem first and then send a patch to the author.
When sending bug reports tell us what version of wxWidgets you are
using (including the beta) and what compiler on what system. One
example: wxMotif 2.8.1, gcc 2.95.4, Redhat 6.1
First steps
-----------
- Prerequisites: Motif 1.2 or above, or Lesstif. Motif 2.0 and
above may also be suitable.
- Download wxX11-x.y.z.tgz, where x.y.z is the version number.
(wxMotif is included in the wxX11 distribution).
Download documentation in a preferred format, such as
wxWidgets-HTML.zip or wxWidgets-PDF.zip.
- Make a directory such as ~/wx and unarchive the files into this
directory.
- It is recommended that you install bison and flex; using yacc
and lex may require tweaking of the makefiles. You also need
libXpm (see comments in the Notes section below) if you want to have
XPM support in wxWidgets (recommended).
- You can now use configure to build wxWidgets and the samples.
Using configure is the only way to build the library. If it doesn't
work for you for whatever reason, please report it (together with detailed
information about your platform and the (relevant part of) contents of
config.log file).
Compiling using configure {#motif_configure}
=========================
The simplest case {#motif_simple}
-------------------
If you compile wxWidgets on Linux for the first time and don't like to read
install instructions just do (in the base dir):
> ./configure --with-motif
> make
> su <type root password>
> make install
> ldconfig
> exit
Afterwards you can continue with
> make
> su <type root password>
> make install
> ldconfig
> exit
If you want to remove wxWidgets on Unix you can do this:
> su <type root password>
> make uninstall
> ldconfig
> exit
The expert case {#motif_expert}
-----------------
If you want to do some more serious cross-platform programming with wxWidgets,
such as for GTK and Motif, you can now build two complete libraries and use
them concurrently. For this end, you have to create a directory for each build
of wxWidgets - you may also want to create different versions of wxWidgets
and test them concurrently. Most typically, this would be a version configured
with --enable-debug and one without.
For building three versions (one GTK, one Motif and a debug version of the GTK
source) you'd do this:
mkdir buildmotif
cd buildmotif
../configure --with-motif
make
cd ..
mkdir buildgtk
cd buildgtk
../configure --with-gtk
make
cd ..
mkdir buildgtkd
cd buildgtkd
../configure --with-gtk --enable-debug
make
cd ..
Note that since wxWidgets-2.6.0 you can install all those libraries
concurrently, you just need to pass the appropriate flags when using them.
The simplest errors {#motif_error_simple}
---------------------
You get errors during compilation: The reason is that you probably have a
broken compiler. GCC 2.8 and earlier versions and egcs are likely to cause
problems due to incomplete support for C++ and optimisation bugs. Best to use
GCC 2.95 or later.
You get immediate segfault when starting any sample or application: This is
either due to having compiled the library with different flags or options than
your program - typically you might have the `__WXDEBUG__` option set for the
library but not for your program - or due to using a compiler with optimisation
bugs.
The simplest program {#motif_simple_app}
----------------------
Now create your super-application myfoo.app and compile anywhere with
g++ myfoo.cpp `wx-config --libs --cxxflags` -o myfoo
General {#motif_general}
---------
The Unix variants of wxWidgets use GNU configure. If you have problems with
your make use GNU make instead.
If you have general problems with installation, see the wxWidgets website at
https://www.wxwidgets.org/
for newest information. If you still don't have any success, please send a bug
report to one of our mailing lists (see my homepage) INCLUDING A DESCRIPTION OF
YOUR SYSTEM AND YOUR PROBLEM, SUCH AS YOUR VERSION OF MOTIF, WXMOTIF, WHAT
DISTRIBUTION YOU USE AND WHAT ERROR WAS REPORTED. I know this has no effect,
but I tried...
GUI libraries {#motif_libs_gui}
---------------
wxWidgets/Motif requires the Motif library to be installed on your system. As
an alternative, you may also use the free library "lesstif" which implements
most of the Motif API without the licence restrictions of Motif.
You can get the newest version of the Lesstif from the lesstif homepage at:
http://lesstif.sourceforge.net/
Additional libraries {#motif_libs_misc}
----------------------
wxWidgets/Motif requires a thread library and X libraries known to work with
threads. This is the case on all commercial Unix-Variants and all
Linux-Versions that are based on glibc 2 except RedHat 5.0 which is broken in
many aspects. As of writing this, virtually all Linux distributions have
correct glibc 2 support.
You can disable thread support by running
./configure --disable-threads
make
su <type root password>
make install
ldconfig
exit
Building wxMotif on Cygwin {#motif_cygwin}
----------------------------
The normal build instructions should work fine on Cygwin. The one difference
with Cygwin is that when using the "--enable-shared" configure option (which
is the default) the API is exported explicitly using __declspec(dllexport)
rather than all global symbols being available.
This shouldn't make a difference using the library and should be a little
more efficient. However if an export attribute has been missed somewhere you
will see linking errors. If this happens then you can work around the
problem by setting LDFLAGS=-Wl,--export-all-symbols. Please also let us know
about it on the wx-dev mailing list.
Create your configuration {#motif_config}
---------------------------
Usage:
./configure [options]
If you want to use system's C and C++ compiler,
set environment variables CXX and CC as
% setenv CC cc
% setenv CXX CC
% ./configure options
to see all the options please use:
./configure --help
The basic philosophy is that if you want to use different
configurations, like a debug and a release version,
or use the same source tree on different systems,
you have only to change the environment variable OSTYPE.
(Sadly this variable is not set by default on some systems
in some shells - on SGI's for example). So you will have to
set it there. This variable HAS to be set before starting
configure, so that it knows which system it tries to
configure for.
Configure will complain if the system variable OSTYPE has
not been defined. And Make in some circumstances as well...
General options {#motif_options}
-------------------
Given below are the commands to change the default behaviour,
i.e. if it says "--disable-threads" it means that threads
are enabled by default.
Many of the configure options have been thoroughly tested
in wxWidgets snapshot 6, but not yet all (ODBC not).
You have to add --with-motif on platforms, where Motif is
not the default (on Linux, configure will default to GTK).
--with-motif Use either Motif or Lesstif
Configure will look for both.
The following options handle the kind of library you want to build.
--disable-threads Compile without thread support. Threads
support is also required for the
socket code to work.
--disable-shared Do not create shared libraries.
--enable-monolithic Build wxWidgets as single library instead
of as several smaller libraries (which is
the default since wxWidgets 2.5.0).
--disable-optimise Do not optimise the code. Can
sometimes be useful for debugging
and is required on some architectures
such as Sun with gcc 2.8.X which
would otherwise produce segvs.
--enable-profile Add profiling info to the object
files. Currently broken, I think.
--enable-no_rtti Enable compilation without creation of
C++ RTTI information in object files.
This will speed-up compilation and reduce
binary size.
--enable-no_exceptions Enable compilation without creation of
C++ exception information in object files.
This will speed-up compilation and reduce
binary size. Also fewer crashes during the
actual compilation...
--enable-permissive Enable compilation without checking for strict
ANSI conformance. Useful to prevent the build
dying with errors as soon as you compile with
Solaris' ANSI-defying headers.
--enable-mem_tracing Add built-in memory tracing.
--enable-dmalloc Use the dmalloc memory debugger.
Read more at www.letters.com/dmalloc/
--enable-debug Equivalent to --enable-debug_info plus
--enable-debug-flag.
--enable-debug_info Add debug info to object files and
executables for use with debuggers
such as gdb (or its many frontends).
--enable-debug_flag Define __DEBUG__ and __WXDEBUG__ when
compiling. This enable wxWidgets' very
useful internal debugging tricks (such
as automatically reporting illegal calls)
to work. Note that program and library
must be compiled with the same debug
options.
Feature Options {#motif_feature_options}
-----------------
Many of the configure options have been thoroughly tested
in wxWidgets snapshot 6, but not yet all (ODBC not).
When producing an executable that is linked statically with wxGTK
you'll be surprised at its immense size. This can sometimes be
drastically reduced by removing features from wxWidgets that
are not used in your program. The most relevant such features
are
--without-libpng Disables PNG image format code.
--without-libjpeg Disables JPEG image format code.
--without-libtiff Disables TIFF image format code.
--without-expat Disable XML classes based on Expat parser.
--disable-threads Disables threads. Will also
disable sockets.
--disable-sockets Disables sockets.
--disable-dnd Disables Drag'n'Drop.
--disable-clipboard Disables Clipboard.
--disable-streams Disables the wxStream classes.
--disable-file Disables the wxFile class.
--disable-textfile Disables the wxTextFile class.
--disable-intl Disables the internationalisation.
--disable-validators Disables validators.
--disable-accel Disables accel.
Apart from disabling certain features you can very often "strip"
the program of its debugging information resulting in a significant
reduction in size.
Please see the output of "./configure --help" for comprehensive list
of all configurable options.
Compiling {#motif_compile}
-----------
The following must be done in the base directory (e.g. ~/wxMotif
or ~/wxWin or whatever)
Now the makefiles are created (by configure) and you can compile
the library by typing:
make
make yourself some coffee, as it will take some time. On an old
Pentium 200 around 40 minutes. During compilation, you may get a few
warning messages depending in your compiler.
If you want to be more selective, you can change into a specific
directory and type "make" there.
Then you may install the library and its header files under
/usr/local/include/wx and /usr/local/lib respectively. You
have to log in as root (i.e. run "su" and enter the root
password) and type
make install
You can remove any traces of wxWidgets by typing
make uninstall
If you want to save disk space by removing unnecessary
object-files:
make clean
in the various directories will do the work for you.
Creating a new Project {#motif_new_project}
------------------------
1. The first way uses the installed libraries and header files
automatically using wx-config
g++ myfoo.cpp `wx-config --libs` `wx-config --cxxflags` -o myfoo
Using this way, a make file for the minimal sample would look
like this
CXX = g++
minimal: minimal.o
$(CXX) -o minimal minimal.o `wx-config --libs`
minimal.o: minimal.cpp
$(CXX) `wx-config --cxxflags` -c minimal.cpp -o minimal.o
clean:
rm -f *.o minimal
If your application uses only some of wxWidgets libraries, you can
specify required libraries when running wx-config. For example,
`wx-config --libs=html,core` will only output link command to link
with libraries required by core GUI classes and wxHTML classes. See
the manual for more information on the libraries.
2. The other way creates a project within the source code
directories of wxWidgets. For this endeavour, you'll need
GNU autoconf version 2.14 and add an entry to your Makefile.in
to the bottom of the configure.in script and run autoconf
and configure before you can type make.
Further notes by Julian Smart {#motif_notes}
---------------------------------
- You may find the following script useful for compiling wxMotif,
especially if installing from zips (which don't preserve file
permissions). Make this script executable with the command
chmod a+x makewxmotif.
# makewxmotif
# Sets permissions (in case we extracted wxMotif from zip files)
# and makes wxMotif.
# Call from top-level wxWidgets directory.
# Note that this uses standard (but commonly-used) configure options;
# if you're feeling brave, you may wish to compile with threads:
# if they're not supported by the target platform, they will be disabled
# anyhow
# -- Julian Smart
chmod a+x configure config.sub config.guess
./configure --with-shared --with-motif --with-debug_flag --with-debug_info --enable-debug --without-threads --without-sockets --without-odbc
make
This script will build wxMotif using shared libraries. If you want to build
a static wxWidgets library, use --disable-shared.
Troubleshooting {#motif_troubleshoot}
---------------
- Solaris compilation with gcc: if the compiler has problems with the variable
argument functions, try putting the gcc fixinclude file paths early in the
include path.
- If you operator-related compile errors or strange memory problems
(for example in deletion of string arrays), set wxUSE_GLOBAL_MEMORY_OPERATORS
and wxUSE_MEMORY_TRACING to 0 in setup.h, and recompile.
- If you get an internal compiler error in gcc, turn off optimisations.
- Problems with XtDestroyWidget crashing in ~wxWindow have been
reported on SGI IRIX 6.4. This has not yet been resolved, so
any advice here would be very welcome. See bugs.txt for a
possible temporary workaround (comment out the final
XtDestroyWidget from ~wxWindow in window.cpp).
- Some compilers, such as Sun C++, may give a lot of warnings about
virtual functions being hidden. Please ignore these, it's correct C++ syntax.
If you find any incorrect instances, though, such as a
missing 'const' in an overridden function, please let us know.
Other Notes {#motif_misc}
-----------
- Using configure will create a release build of the library by
default: it's recommended to use --enable-debug configure switch
while developing your application. To compile in non-debug mode, use
--disable-debug configure switch.

35
docs/motif/issues.txt
View file

@ -1,35 +0,0 @@
Outstanding issues
------------------
Last updated 19/3/2000.
See also: todo.txt.
- wxTextCtrl doesn't work as a stream buffer in Linux/gcc.
- No wxToolTip (but see wxToolBar for a way of implementing it).
- Need a way of specifying default settings for colour/font/etc.
- More optimisation could be done to reduce X server traffic, etc.
- Should scrollbars take on the background colour? Not right for
e.g. wxScrolledWindows, so maybe have wxSystemSettings value for
scrollbar colour, and/or ability to set scrollbar colour independently.
- wxFrame can accept events, but apps cannot draw into it for
Workaround: use an embedded wxWindow.
- The background of a window sometimes isn't restored when changing
notebook pages (see sashtest, mdi examples). The notebook background
colour shows through. A resize, or scroll, restores the correct
background colour.
- In Life! sample, text above slider isn't legible.
- samples/html/helpview and samples/help demonstrate that sometimes,
XPM images can't be loaded, perhaps only in 256-colour mode. This
will now cause an assert rather than an X error. But we need to
either cure the XPM loading problem, or provide alternative toolbar
buttons (for HelpView) and icons (for places where icons are used e.g.
in the log dialog).

49
docs/motif/readme.txt
View file

@ -1,49 +0,0 @@
Welcome to wxWidgets/Motif
You have downloaded the Motif port of the wxWidgets GUI library.
More information about the wxWidgets project as a whole
can be found at:
https://www.wxwidgets.org/
Information on how to install can be found in the file
install.txt, but if you cannot wait, this should work on
many systems:
./configure --with-motif
make
su <type root password>
make install
ldconfig
exit
Alternatively, a script (makewxmotif) for running configure can
be found in this directory.
When you run into problems, please read the install.txt and
follow those instructions. If you still don't have any success,
please send a bug report to one of our mailing lists (see
the wxWidgets homepage) INCLUDING A DESCRIPTION OF YOUR SYSTEM AND
YOUR PROBLEM, SUCH AS YOUR VERSION OF MOTIF, WXMOTIF, WHAT
DISTRIBUTION YOU USE AND WHAT ERROR WAS REPORTED.
Alternatively, you may also use the bug reporting system
linked from the wxWidgets web page.
The library produced by the install process will be called
libwx_motif.a (static) and libwx_motif-2.6.so.0.0.0 (shared) so that
once a binary incompatible version of wxWidgets/Motif comes out
we'll augment the library version number to avoid linking problems.
Please send problems concerning installation, feature requests,
bug reports or comments to the wxWidgets users list. Information
on how to subscribe is available from www.wxwidgets.org.
wxWidgets/Motif doesn't come with any guarantee whatsoever. It might
crash your hard disk or destroy your monitor. It doesn't claim to be
suitable for any special or general purpose.
Regards,
The wxWidgets team

2
docs/qt/install.md
View file

@ -175,7 +175,7 @@ to see all the options please use:
It is recommended to build wxWidgets in another directory (maybe a
subdirectory of your wxWidgets installation) as this allows you to
have multiple configurations (for example, debug and release or GTK
and Motif) simultaneously.
and X11) simultaneously.
Feature Options {#qt_feature_options}
-----------------

5
docs/readme.txt
View file

@ -54,7 +54,6 @@ This version of wxWidgets supports the following primary platforms:
There is some support for the following platforms:
* Most Unix variants with X11
* Most Unix variants with Motif/Lesstif
* Most Unix variants with GTK+ 1.2
* Most Unix variants with Qt 5 or newer (experimental)
@ -80,8 +79,8 @@ unrestricted distribution of application binaries. To answer a FAQ, you don't
have to distribute any source if you wish to write commercial applications using
wxWidgets.
However, if you distribute wxGTK, wxQt or wxMotif (with Lesstif) version of your
application, don't forget that it is linked against GTK+, Qt or Lesstif, which
However, if you distribute wxGTK or wxQt version of your
application, don't forget that it is linked against GTK or Qt, which
are covered by LGPL *without* exception notice and so is bound by its
requirements.

8
docs/wine/install.txt
View file

@ -48,7 +48,7 @@ If you want to remove wxWidgets on Unix you can do this:
-----------------
If you want to do some more serious cross-platform programming with wxWidgets,
such as for GTK and Motif, you can now build two complete libraries and use
such as for GTK and X11, you can now build two complete libraries and use
them concurrently. For this end, you have to create a directory for each build
of wxWidgets - you may also want to create different versions of wxWidgets
and test them concurrently. Most typically, this would be a version configured
@ -57,9 +57,9 @@ be installed, so you'd have to use local version of the library for that purpose
For building three versions (one GTK, one WINE and a debug version of the WINE
source) you'd do this:
md buildmotif
cd buildmotif
../configure --with-motif
md buildx11
cd buildx11
../configure --with-x11
make
cd ..

1
docs/x11/readme.txt
View file

@ -61,7 +61,6 @@ Some remaining issues:
- wxToggleButton implementation missing
- wxSpinCtrl implementation missing
- tooltips implementation missing
- code common to the Motif and X11 ports needs to be merged
- need thread safety in event loop
Regards,

7
include/wx/accel.h
View file

@ -86,11 +86,6 @@ public:
bool operator!=(const wxAcceleratorEntry& entry) const
{ return !(*this == entry); }
#if defined(__WXMOTIF__)
// Implementation use only
bool MatchesEvent(const wxKeyEvent& event) const;
#endif
bool IsOk() const
{
return m_keyCode != 0;
@ -142,8 +137,6 @@ private:
#include "wx/generic/accel.h"
#elif defined(__WXMSW__)
#include "wx/msw/accel.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/accel.h"
#elif defined(__WXGTK20__)
#include "wx/gtk/accel.h"
#elif defined(__WXGTK__)

2
include/wx/anybutton.h
View file

@ -180,8 +180,6 @@ protected:
#include "wx/univ/anybutton.h"
#elif defined(__WXMSW__)
#include "wx/msw/anybutton.h"
//#elif defined(__WXMOTIF__)
// #include "wx/motif/anybutton.h"
#elif defined(__WXGTK20__)
#include "wx/gtk/anybutton.h"
//#elif defined(__WXGTK__)

2
include/wx/app.h
View file

@ -741,8 +741,6 @@ protected:
#if defined(__WXMSW__)
#include "wx/msw/app.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/app.h"
#elif defined(__WXDFB__)
#include "wx/dfb/app.h"
#elif defined(__WXGTK20__)

4
include/wx/bitmap.h
View file

@ -73,7 +73,6 @@ protected:
#if defined(__WXDFB__) || \
defined(__WXMAC__) || \
defined(__WXGTK__) || \
defined(__WXMOTIF__) || \
defined(__WXX11__) || \
defined(__WXQT__)
#define wxUSE_BITMAP_BASE 1
@ -306,9 +305,6 @@ protected:
#if defined(__WXMSW__)
#define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_BMP_RESOURCE
#include "wx/msw/bitmap.h"
#elif defined(__WXMOTIF__)
#define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_XPM
#include "wx/x11/bitmap.h"
#elif defined(__WXGTK20__)
#ifdef __WINDOWS__
#define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_BMP_RESOURCE

2
include/wx/bmpbuttn.h
View file

@ -130,8 +130,6 @@ protected:
#include "wx/univ/bmpbuttn.h"
#elif defined(__WXMSW__)
#include "wx/msw/bmpbuttn.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/bmpbuttn.h"
#elif defined(__WXGTK20__)
#include "wx/gtk/bmpbuttn.h"
#elif defined(__WXGTK__)

2
include/wx/brush.h
View file

@ -71,7 +71,7 @@ public:
#if defined(__WXMSW__)
#include "wx/msw/brush.h"
#elif defined(__WXMOTIF__) || defined(__WXX11__)
#elif defined(__WXX11__)
#include "wx/x11/brush.h"
#elif defined(__WXGTK20__)
#include "wx/gtk/brush.h"

2
include/wx/button.h
View file

@ -51,8 +51,6 @@ protected:
#include "wx/univ/button.h"
#elif defined(__WXMSW__)
#include "wx/msw/button.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/button.h"
#elif defined(__WXGTK20__)
#include "wx/gtk/button.h"
#elif defined(__WXGTK__)

2
include/wx/checkbox.h
View file

@ -174,8 +174,6 @@ private:
#include "wx/univ/checkbox.h"
#elif defined(__WXMSW__)
#include "wx/msw/checkbox.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/checkbox.h"
#elif defined(__WXGTK20__)
#include "wx/gtk/checkbox.h"
#elif defined(__WXGTK__)

2
include/wx/checklst.h
View file

@ -39,8 +39,6 @@ public:
#include "wx/univ/checklst.h"
#elif defined(__WXMSW__)
#include "wx/msw/checklst.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/checklst.h"
#elif defined(__WXGTK20__)
#include "wx/gtk/checklst.h"
#elif defined(__WXGTK__)

2
include/wx/chkconf.h
View file

@ -1304,8 +1304,6 @@
# include "wx/osx/chkconf.h"
#elif defined(__WXDFB__)
# include "wx/dfb/chkconf.h"
#elif defined(__WXMOTIF__)
# include "wx/motif/chkconf.h"
#elif defined(__WXX11__)
# include "wx/x11/chkconf.h"
#elif defined(__WXANDROID__)

2
include/wx/choice.h
View file

@ -76,8 +76,6 @@ private:
#include "wx/univ/choice.h"
#elif defined(__WXMSW__)
#include "wx/msw/choice.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/choice.h"
#elif defined(__WXGTK20__)
#include "wx/gtk/choice.h"
#elif defined(__WXGTK__)

4
include/wx/clipbrd.h
View file

@ -92,7 +92,7 @@ public:
// don't use this directly, it is public for compatibility with some ports
// (wxX11, wxMotif, ...) only
// (wxX11) only
bool m_usePrimary;
};
@ -151,8 +151,6 @@ typedef void (wxEvtHandler::*wxClipboardEventFunction)(wxClipboardEvent&);
#if defined(__WXMSW__)
#include "wx/msw/clipbrd.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/clipbrd.h"
#elif defined(__WXGTK20__)
#include "wx/gtk/clipbrd.h"
#elif defined(__WXGTK__)

2
include/wx/colour.h
View file

@ -227,8 +227,6 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxColourBase* col);
#if defined(__WXMSW__)
#include "wx/msw/colour.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/colour.h"
#elif defined(__WXGTK20__)
#include "wx/gtk/colour.h"
#elif defined(__WXGTK__)

2
include/wx/combobox.h
View file

@ -73,8 +73,6 @@ public:
#include "wx/univ/combobox.h"
#elif defined(__WXMSW__)
#include "wx/msw/combobox.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/combobox.h"
#elif defined(__WXGTK20__)
#include "wx/gtk/combobox.h"
#elif defined(__WXGTK__)

2
include/wx/control.h
View file

@ -205,8 +205,6 @@ protected:
#include "wx/univ/control.h"
#elif defined(__WXMSW__)
#include "wx/msw/control.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/control.h"
#elif defined(__WXGTK20__)
#include "wx/gtk/control.h"
#elif defined(__WXGTK__)

2
include/wx/ctrlsub.h
View file

@ -478,8 +478,6 @@ private:
// define the platform-specific wxControlWithItems class
#if defined(__WXMSW__)
#include "wx/msw/ctrlsub.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/ctrlsub.h"
#elif defined(__WXQT__)
#include "wx/qt/ctrlsub.h"
#else

3
include/wx/cursor.h
View file

@ -42,9 +42,6 @@ public:
#if defined(__WXMSW__)
#define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE
#include "wx/msw/cursor.h"
#elif defined(__WXMOTIF__)
#define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_XBM
#include "wx/motif/cursor.h"
#elif defined(__WXGTK20__)
#ifdef __WINDOWS__
#define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE

6
include/wx/dataobj.h
View file

@ -75,8 +75,6 @@ public:
#if defined(__WXMSW__)
#include "wx/msw/ole/dataform.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/dataform.h"
#elif defined(__WXGTK20__)
#include "wx/gtk/dataform.h"
#elif defined(__WXGTK__)
@ -161,8 +159,6 @@ public:
#if defined(__WXMSW__)
#include "wx/msw/ole/dataobj.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/dataobj.h"
#elif defined(__WXX11__)
#include "wx/x11/dataobj.h"
#elif defined(__WXGTK20__)
@ -579,8 +575,6 @@ private:
#include "wx/gtk1/dataobj2.h"
#elif defined(__WXX11__)
#include "wx/x11/dataobj2.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/dataobj2.h"
#elif defined(__WXMAC__)
#include "wx/osx/dataobj2.h"
#elif defined(__WXQT__)

4
include/wx/dcbuffer.h
View file

@ -15,8 +15,8 @@
#include "wx/dcclient.h"
#include "wx/window.h"
// Only deprecated wxGTK1 and wxMotif platforms don't use double buffering.
#if defined(__WXMOTIF__) || (defined(__WXGTK__) && !defined(__WXGTK20__))
// Only deprecated wxGTK1 platform doesn't use double buffering.
#if defined(__WXGTK__) && !defined(__WXGTK20__)
#define wxALWAYS_NATIVE_DOUBLE_BUFFER 0
#else
#define wxALWAYS_NATIVE_DOUBLE_BUFFER 1

21
include/wx/defs.h
View file

@ -48,8 +48,7 @@
/* Make sure the environment is set correctly */
# if defined(__WXMSW__) && defined(__X__)
# error "Target can't be both X and MSW"
# elif !defined(__WXMOTIF__) && \
!defined(__WXMSW__) && \
# elif !defined(__WXMSW__) && \
!defined(__WXGTK__) && \
!defined(__WXOSX_COCOA__) && \
!defined(__WXOSX_IPHONE__) && \
@ -1461,16 +1460,8 @@ wxALLOW_COMBINING_ENUMS(wxSizerFlagBits, wxStretch)
/* Windows, it won't normally get the dialog navigation key events) */
#define wxWANTS_CHARS 0x00040000
/* Make window retained (Motif only, see src/generic/scrolwing.cpp)
* This is non-zero only under wxMotif, to avoid a clash with wxPOPUP_WINDOW
* on other platforms
*/
#ifdef __WXMOTIF__
#define wxRETAINED 0x00020000
#else
/* Deprecated, defined only for compatibility. */
#define wxRETAINED 0x00000000
#endif
#define wxBACKINGSTORE wxRETAINED
/* set this flag to create a special popup window: it will be always shown on */
@ -2931,8 +2922,8 @@ typedef WXLRESULT (wxSTDCALL *WXWNDPROC)(WXHWND, WXUINT, WXWPARAM, WXLPARAM);
#endif /* __WIN32__ */
#if defined(__WXMOTIF__) || defined(__WXX11__)
/* Stand-ins for X/Xt/Motif types */
#if defined(__WXX11__)
/* Stand-ins for X/Xt types */
typedef void* WXWindow;
typedef void* WXWidget;
typedef void* WXAppContext;
@ -2955,9 +2946,9 @@ typedef void* WXFontType; /* either a XmFontList or XmRenderTable */
typedef void* WXString;
typedef unsigned long Atom; /* this might fail on a few architectures */
typedef long WXPixel; /* safety catch in src/motif/colour.cpp */
typedef long WXPixel;
#endif /* Motif */
#endif /* X11 */
#ifdef __WXGTK__

2
include/wx/dialog.h
View file

@ -369,8 +369,6 @@ public:
#else
#if defined(__WXMSW__)
#include "wx/msw/dialog.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/dialog.h"
#elif defined(__WXGTK20__)
#include "wx/gtk/dialog.h"
#elif defined(__WXGTK__)

3
include/wx/dirdlg.h
View file

@ -123,8 +123,7 @@ protected:
#define wxDirDialog wxGenericDirDialog
#elif defined(__WXMAC__)
#include "wx/osx/dirdlg.h" // Native Mac
#elif defined(__WXMOTIF__) || \
defined(__WXX11__)
#elif defined(__WXX11__)
#include "wx/generic/dirdlgg.h" // Other ports use generic implementation
#define wxDirDialog wxGenericDirDialog
#elif defined(__WXQT__)

2
include/wx/dnd.h
View file

@ -212,8 +212,6 @@ protected:
#if defined(__WXMSW__)
#include "wx/msw/ole/dropsrc.h"
#include "wx/msw/ole/droptgt.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/dnd.h"
#elif defined(__WXX11__)
#include "wx/x11/dnd.h"
#elif defined(__WXGTK20__)

4
include/wx/dragimag.h
View file

@ -25,10 +25,6 @@ class WXDLLIMPEXP_FWD_CORE wxDC;
# include "wx/msw/dragimag.h"
# endif
#elif defined(__WXMOTIF__)
# include "wx/generic/dragimgg.h"
# define wxDragImage wxGenericDragImage
#elif defined(__WXGTK__)
# include "wx/generic/dragimgg.h"
# define wxDragImage wxGenericDragImage

12
include/wx/features.h
View file

@ -14,14 +14,8 @@
#ifndef _WX_FEATURES_H_
#define _WX_FEATURES_H_
/* radio menu items are currently not implemented in wxMotif, use this
symbol (kept for compatibility from the time when they were not implemented
under other platforms as well) to test for this */
#if !defined(__WXMOTIF__)
#define wxHAS_RADIO_MENU_ITEMS
#else
#undef wxHAS_RADIO_MENU_ITEMS
#endif
/* always defined now, kept only for compatibility. */
#define wxHAS_RADIO_MENU_ITEMS
/* the raw keyboard codes are generated under wxGTK and wxMSW only */
#if defined(__WXGTK__) || defined(__WXMSW__) || defined(__WXMAC__) \
@ -33,7 +27,7 @@
/* taskbar is implemented in the major ports */
#if defined(__WXMSW__) \
|| defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__) \
|| defined(__WXGTK__) || defined(__WXX11__) \
|| defined(__WXOSX_MAC__) || defined(__WXQT__)
#define wxHAS_TASK_BAR_ICON
#else

2
include/wx/filedlg.h
View file

@ -277,8 +277,6 @@ wxSaveFileSelector(const wxString& what,
#include "wx/generic/filedlgg.h"
#elif defined(__WXMSW__)
#include "wx/msw/filedlg.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/filedlg.h"
#elif defined(__WXGTK20__)
#include "wx/gtk/filedlg.h" // GTK+ > 2.4 has native version
#elif defined(__WXGTK__)

2
include/wx/font.h
View file

@ -619,8 +619,6 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font);
// include the real class declaration
#if defined(__WXMSW__)
#include "wx/msw/font.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/font.h"
#elif defined(__WXGTK20__)
#include "wx/gtk/font.h"
#elif defined(__WXGTK__)

1
include/wx/fontdlg.h
View file

@ -64,7 +64,6 @@ protected:
#endif
#if defined(__WXUNIVERSAL__) || \
defined(__WXMOTIF__) || \
defined(__WXGPE__)
#include "wx/generic/fontdlgg.h"

2
include/wx/fontutil.h
View file

@ -10,7 +10,7 @@
// General note: this header is private to wxWidgets and is not supposed to be
// included by user code. The functions declared here are implemented in
// msw/fontutil.cpp for Windows, unix/fontutil.cpp for GTK/Motif &c.
// msw/fontutil.cpp for Windows, unix/fontutil.cpp for GTK &c.
#ifndef _WX_FONTUTIL_H_
#define _WX_FONTUTIL_H_

2
include/wx/frame.h
View file

@ -265,8 +265,6 @@ protected:
#include "wx/gtk/frame.h"
#elif defined(__WXGTK__)
#include "wx/gtk1/frame.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/frame.h"
#elif defined(__WXMAC__)
#include "wx/osx/frame.h"
#elif defined(__WXQT__)

2
include/wx/gauge.h
View file

@ -128,8 +128,6 @@ protected:
#include "wx/univ/gauge.h"
#elif defined(__WXMSW__)
#include "wx/msw/gauge.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/gauge.h"
#elif defined(__WXGTK20__)
#include "wx/gtk/gauge.h"
#elif defined(__WXGTK__)

4
include/wx/gdicmn.h
View file

@ -218,9 +218,6 @@ enum wxEllipsizeMode
#elif defined(__WXMAC__)
// Initialize from an included XPM
#define wxICON(X) wxIcon( X##_xpm )
#elif defined(__WXMOTIF__)
// Initialize from an included XPM
#define wxICON(X) wxIcon( X##_xpm )
#elif defined(__WXX11__)
// Initialize from an included XPM
#define wxICON(X) wxIcon( X##_xpm )
@ -239,7 +236,6 @@ enum wxEllipsizeMode
#if defined(__WINDOWS__) && wxUSE_WXDIB
#define wxBITMAP(name) wxBitmap(wxT(#name), wxBITMAP_TYPE_BMP_RESOURCE)
#elif defined(__WXGTK__) || \
defined(__WXMOTIF__) || \
defined(__WXX11__) || \
defined(__WXMAC__) || \
defined(__WXDFB__)

2
include/wx/generic/combo.h
View file

@ -84,8 +84,6 @@ protected:
// Dummies for platform-specific wxTextEntry implementations
#if defined(__WXUNIVERSAL__)
// Looks like there's nothing we need to override here
#elif defined(__WXMOTIF__)
virtual WXWidget GetTextWidget() const { return NULL; }
#elif defined(__WXGTK__)
#if defined(__WXGTK20__)
virtual GtkEditable *GetEditable() const override { return NULL; }

2
include/wx/generic/notebook.h
View file

@ -126,7 +126,7 @@ public:
// Implementation
// wxNotebook on Motif uses a generic wxTabView to implement itself.
// Obsolete, don't use.
wxTabView *GetTabView() const { return m_tabView; }
void SetTabView(wxTabView *v) { m_tabView = v; }

2
include/wx/generic/tabg.h
View file

@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/generic/tabg.h
// Purpose: Generic tabbed dialogs; used by wxMotif's wxNotebook
// Purpose: Generic tabbed dialogs; used by generic wxNotebook
// Author: Julian Smart
// Modified by:
// Created: 01/02/97

4
include/wx/glcanvas.h
View file

@ -260,7 +260,7 @@ public:
protected:
// override this to implement SetColour() in GL_INDEX_MODE
// (currently only implemented in wxX11 and wxMotif ports)
// (currently only implemented in wxX11)
virtual int GetColourIndex(const wxColour& WXUNUSED(col)) { return -1; }
// check if the given extension name is present in the space-separated list
@ -304,7 +304,7 @@ public:
#if defined(__WXMSW__)
#include "wx/msw/glcanvas.h"
#elif defined(__WXMOTIF__) || defined(__WXX11__)
#elif defined(__WXX11__)
#include "wx/x11/glcanvas.h"
#elif defined(__WXGTK20__)
#include "wx/gtk/glcanvas.h"

3
include/wx/icon.h
View file

@ -27,9 +27,6 @@
#include "wx/msw/icon.h"
#define wxICON_DIFFERENT_FROM_BITMAP
#elif defined(__WXMOTIF__)
#define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
#include "wx/motif/icon.h"
#elif defined(__WXGTK20__)
#ifdef __WINDOWS__
#define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICO_RESOURCE

2
include/wx/joystick.h
View file

@ -17,8 +17,6 @@
#if defined(__WINDOWS__)
#include "wx/msw/joystick.h"
#elif defined(__WXMOTIF__)
#include "wx/unix/joystick.h"
#elif defined(__WXGTK__)
#include "wx/unix/joystick.h"
#elif defined(__WXX11__)

2
include/wx/listbox.h
View file

@ -148,8 +148,6 @@ private:
#include "wx/univ/listbox.h"
#elif defined(__WXMSW__)
#include "wx/msw/listbox.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/listbox.h"
#elif defined(__WXGTK20__)
#include "wx/gtk/listbox.h"
#elif defined(__WXGTK__)

3
include/wx/mdi.h
View file

@ -367,8 +367,7 @@ public:
// wxUniv always uses the generic MDI implementation and so do the ports
// without native version (although wxCocoa seems to have one -- but it's
// probably not functional?)
#if defined(__WXMOTIF__) || \
defined(__WXUNIVERSAL__)
#if defined(__WXUNIVERSAL__)
#define wxUSE_GENERIC_MDI_AS_NATIVE 1
#else
#define wxUSE_GENERIC_MDI_AS_NATIVE 0

2
include/wx/menu.h
View file

@ -593,8 +593,6 @@ protected:
#include "wx/univ/menu.h"
#elif defined(__WXMSW__)
#include "wx/msw/menu.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/menu.h"
#elif defined(__WXGTK20__)
#include "wx/gtk/menu.h"
#elif defined(__WXGTK__)

2
include/wx/menuitem.h
View file

@ -201,8 +201,6 @@ private:
#include "wx/univ/menuitem.h"
#elif defined(__WXMSW__)
#include "wx/msw/menuitem.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/menuitem.h"
#elif defined(__WXGTK20__)
#include "wx/gtk/menuitem.h"
#elif defined(__WXGTK__)

2
include/wx/minifram.h
View file

@ -17,8 +17,6 @@
#if defined(__WXMSW__)
#include "wx/msw/minifram.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/minifram.h"
#elif defined(__WXGTK20__)
#include "wx/gtk/minifram.h"
#elif defined(__WXGTK__)

39
include/wx/motif/accel.h
View file

@ -1,39 +0,0 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/motif/accel.h
// Purpose: wxAcceleratorTable class
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_ACCEL_H_
#define _WX_ACCEL_H_
#include "wx/object.h"
#include "wx/string.h"
#include "wx/event.h"
class WXDLLIMPEXP_CORE wxAcceleratorTable: public wxObject
{
wxDECLARE_DYNAMIC_CLASS(wxAcceleratorTable);
public:
wxAcceleratorTable();
wxAcceleratorTable(const wxString& resource); // Load from .rc resource
wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
virtual ~wxAcceleratorTable();
bool Ok() const { return IsOk(); }
bool IsOk() const;
// Implementation only
int GetCount() const;
wxAcceleratorEntry* GetEntries() const;
};
extern WXDLLIMPEXP_DATA_CORE(wxAcceleratorTable) wxNullAcceleratorTable;
#endif
// _WX_ACCEL_H_

94
include/wx/motif/app.h
View file

@ -1,94 +0,0 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/motif/app.h
// Purpose: wxApp class
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_APP_H_
#define _WX_APP_H_
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
#include "wx/event.h"
#include "wx/hashmap.h"
// ----------------------------------------------------------------------------
// forward declarations
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_FWD_CORE wxFrame;
class WXDLLIMPEXP_FWD_CORE wxWindow;
class WXDLLIMPEXP_FWD_CORE wxApp;
class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
class WXDLLIMPEXP_FWD_BASE wxLog;
class WXDLLIMPEXP_FWD_CORE wxEventLoop;
class WXDLLIMPEXP_FWD_CORE wxXVisualInfo;
class WXDLLIMPEXP_FWD_CORE wxPerDisplayData;
// ----------------------------------------------------------------------------
// the wxApp class for Motif - see wxAppBase for more details
// ----------------------------------------------------------------------------
WX_DECLARE_VOIDPTR_HASH_MAP( wxPerDisplayData*, wxPerDisplayDataMap );
class WXDLLIMPEXP_CORE wxApp : public wxAppBase
{
wxDECLARE_DYNAMIC_CLASS(wxApp);
public:
wxApp();
virtual ~wxApp();
// override base class (pure) virtuals
// -----------------------------------
virtual int MainLoop();
virtual void Exit();
virtual void WakeUpIdle(); // implemented in motif/evtloop.cpp
// implementation from now on
// --------------------------
protected:
bool m_showOnInit;
public:
// Implementation
virtual bool Initialize(int& argc, wxChar **argv);
virtual void CleanUp();
// Motif-specific
WXAppContext GetAppContext() const { return m_appContext; }
WXWidget GetTopLevelWidget();
WXWidget GetTopLevelRealizedWidget();
WXColormap GetMainColormap(WXDisplay* display);
WXDisplay* GetInitialDisplay() const { return m_initialDisplay; }
void SetTopLevelWidget(WXDisplay* display, WXWidget widget);
void SetTopLevelRealizedWidget(WXDisplay* display,
WXWidget widget);
// This handler is called when a property change event occurs
virtual void HandlePropertyChange(WXEvent *event);
wxXVisualInfo* GetVisualInfo(WXDisplay* display);
virtual void* GetXVisualInfo() { return NULL; }
private:
// Motif-specific
WXAppContext m_appContext;
WXColormap m_mainColormap;
WXDisplay* m_initialDisplay;
wxPerDisplayDataMap* m_perDisplayData;
};
#endif
// _WX_APP_H_

63
include/wx/motif/bmpbuttn.h
View file

@ -1,63 +0,0 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/motif/bmpbuttn.h
// Purpose: wxBitmapButton class
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_BMPBUTTN_H_
#define _WX_BMPBUTTN_H_
#include "wx/motif/bmpmotif.h"
#define wxDEFAULT_BUTTON_MARGIN 4
class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase
{
public:
wxBitmapButton();
virtual ~wxBitmapButton();
wxBitmapButton(wxWindow *parent, wxWindowID id,
const wxBitmapBundle& bitmap,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxASCII_STR(wxButtonNameStr))
{
Create(parent, id, bitmap, pos, size, style, validator, name);
}
bool Create(wxWindow *parent, wxWindowID id,
const wxBitmapBundle& bitmap,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxASCII_STR(wxButtonNameStr));
bool CreateCloseButton(wxWindow* parent,
wxWindowID winid,
const wxString& name = wxString());
// Implementation
virtual void ChangeBackgroundColour();
protected:
virtual wxSize DoGetBestSize() const;
virtual void DoSetBitmap(const wxBitmapBundle& bitmap, State which);
virtual void OnSetBitmap();
// original bitmaps may be different from the ones we were initialized with
// if they were changed to reflect button background colour
wxBitmapBundle m_bitmapsOriginal[State_Max];
wxBitmapCache m_bitmapCache;
WXPixmap m_insensPixmap;
wxDECLARE_DYNAMIC_CLASS(wxBitmapButton);
};
#endif // _WX_BMPBUTTN_H_

56
include/wx/motif/bmpmotif.h
View file

@ -1,56 +0,0 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/motif/bmpmotif.h
// Purpose: Motif-specific bitmap routines
// Author: Julian Smart, originally in bitmap.h
// Modified by:
// Created: 25/03/2003
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_BMPMOTIF_H_
#define _WX_BMPMOTIF_H_
#include "wx/defs.h"
#include "wx/bitmap.h"
class WXDLLIMPEXP_CORE wxBitmapCache
{
public:
wxBitmapCache()
{
m_labelPixmap = (WXPixmap)NULL;
m_armPixmap = (WXPixmap)NULL;
m_insensPixmap = (WXPixmap)NULL;
m_image = (WXImage)NULL;
m_display = NULL;
SetColoursChanged();
}
~wxBitmapCache();
void SetColoursChanged();
void SetBitmap( const wxBitmap& bitmap );
WXPixmap GetLabelPixmap( WXWidget w );
WXPixmap GetInsensPixmap( WXWidget w = (WXWidget)NULL );
WXPixmap GetArmPixmap( WXWidget w );
private:
void InvalidateCache();
void CreateImageIfNeeded( WXWidget w );
WXPixmap GetPixmapFromCache(WXWidget w);
struct
{
bool label : 1;
bool arm : 1;
bool insens : 1;
} m_recalcPixmaps;
wxBitmap m_bitmap;
WXDisplay* m_display;
WXPixmap m_labelPixmap, m_armPixmap, m_insensPixmap;
WXImage m_image;
};
#endif // _WX_BMPMOTIF_H_

56
include/wx/motif/button.h
View file

@ -1,56 +0,0 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/motif/button.h
// Purpose: wxButton class
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_BUTTON_H_
#define _WX_BUTTON_H_
// Pushbutton
class WXDLLIMPEXP_CORE wxButton: public wxButtonBase
{
public:
wxButton() { }
wxButton(wxWindow *parent,
wxWindowID id,
const wxString& label = wxEmptyString,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxASCII_STR(wxButtonNameStr))
{
Create(parent, id, label, pos, size, style, validator, name);
}
bool Create(wxWindow *parent, wxWindowID id,
const wxString& label = wxEmptyString,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxASCII_STR(wxButtonNameStr));
virtual wxWindow *SetDefault();
virtual void Command(wxCommandEvent& event);
static wxSize GetDefaultSize();
// Implementation
virtual wxSize GetMinSize() const;
protected:
virtual wxSize DoGetBestSize() const;
private:
wxSize OldGetBestSize() const;
wxSize OldGetMinSize() const;
void SetDefaultShadowThicknessAndResize();
wxDECLARE_DYNAMIC_CLASS(wxButton);
};
#endif // _WX_BUTTON_H_

61
include/wx/motif/checkbox.h
View file

@ -1,61 +0,0 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/motif/checkbox.h
// Purpose: wxCheckBox class
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CHECKBOX_H_
#define _WX_CHECKBOX_H_
// Checkbox item (single checkbox)
class WXDLLIMPEXP_CORE wxCheckBox: public wxCheckBoxBase
{
wxDECLARE_DYNAMIC_CLASS(wxCheckBox);
public:
inline wxCheckBox() { Init(); }
inline wxCheckBox(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxASCII_STR(wxCheckBoxNameStr))
{
Init();
Create(parent, id, label, pos, size, style, validator, name);
}
bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxASCII_STR(wxCheckBoxNameStr));
virtual void SetValue(bool);
virtual bool GetValue() const ;
virtual void Command(wxCommandEvent& event);
// Implementation
virtual void ChangeBackgroundColour();
private:
// common part of all constructors
void Init()
{
m_evtType = wxEVT_CHECKBOX;
}
virtual void DoSet3StateValue(wxCheckBoxState state);
virtual wxCheckBoxState DoGet3StateValue() const;
// public for the callback
public:
// either wxEVT_CHECKBOX or ..._TOGGLEBUTTON
wxEventType m_evtType;
};
#endif
// _WX_CHECKBOX_H_

76
include/wx/motif/checklst.h
View file

@ -1,76 +0,0 @@
///////////////////////////////////////////////////////////////////////////////
// Name: wx/motif/checklst.h
// Purpose: wxCheckListBox class - a listbox with checkable items
// Note: this is an optional class.
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CHECKLST_H_
#define _WX_CHECKLST_H_
#include "wx/listbox.h"
class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase
{
wxDECLARE_DYNAMIC_CLASS(wxCheckListBox);
public:
// ctors
wxCheckListBox();
wxCheckListBox(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
int nStrings = 0,
const wxString choices[] = NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxASCII_STR(wxListBoxNameStr));
wxCheckListBox(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
const wxArrayString& choices,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxASCII_STR(wxListBoxNameStr));
bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxASCII_STR(wxListBoxNameStr));
bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
const wxArrayString& choices,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxASCII_STR(wxListBoxNameStr));
// items may be checked
bool IsChecked(unsigned int uiIndex) const;
void Check(unsigned int uiIndex, bool bCheck = true);
// override base class functions
virtual int DoInsertItems(const wxArrayStringsAdapter& items,
unsigned int pos,
void **clientData, wxClientDataType type);
virtual int FindString(const wxString& s, bool bCase = false) const;
virtual void SetString(unsigned int n, const wxString& s);
virtual wxString GetString(unsigned int n) const;
private:
void DoToggleItem( int item, int x );
private:
wxDECLARE_EVENT_TABLE();
};
#endif
// _WX_CHECKLST_H_

21
include/wx/motif/chkconf.h
View file

@ -1,21 +0,0 @@
/*
* Name: wx/motif/chkconf.h
* Purpose: Motif-specific config settings checks
* Author: Vadim Zeitlin
* Modified by:
* Created: 2005-04-05 (extracted from wx/chkconf.h)
* Copyright: (c) 2005 Vadim Zeitlin <vadim@wxwidgets.org>
* Licence: wxWindows licence
*/
/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
#if !defined(wxUSE_GADGETS)
# define wxUSE_GADGETS 0
#endif
/* wxGraphicsContext is not implemented in wxMotif */
#if wxUSE_GRAPHICS_CONTEXT
# undef wxUSE_GRAPHICS_CONTEXT
# define wxUSE_GRAPHICS_CONTEXT 0
#endif

124
include/wx/motif/choice.h
View file

@ -1,124 +0,0 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/motif/choice.h
// Purpose: wxChoice class
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CHOICE_H_
#define _WX_CHOICE_H_
#include "wx/clntdata.h"
#ifndef wxWIDGET_ARRAY_DEFINED
#define wxWIDGET_ARRAY_DEFINED
#include "wx/dynarray.h"
WX_DEFINE_ARRAY_PTR(WXWidget, wxWidgetArray);
#endif
// Choice item
class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase
{
wxDECLARE_DYNAMIC_CLASS(wxChoice);
public:
wxChoice();
virtual ~wxChoice();
wxChoice(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxASCII_STR(wxChoiceNameStr))
{
Init();
Create(parent, id, pos, size, n, choices, style, validator, name);
}
wxChoice(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
const wxArrayString& choices,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxASCII_STR(wxChoiceNameStr))
{
Init();
Create(parent, id, pos, size, choices, style, validator, name);
}
bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxASCII_STR(wxChoiceNameStr));
bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos,
const wxSize& size,
const wxArrayString& choices,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxASCII_STR(wxChoiceNameStr));
// implementation of wxControlWithItems
virtual unsigned int GetCount() const;
virtual int GetSelection() const;
virtual void DoDeleteOneItem(unsigned int n);
virtual void DoClear();
virtual void SetString(unsigned int n, const wxString& s);
virtual wxString GetString(unsigned int n) const;
// implementation of wxChoiceBase
virtual void SetSelection(int n);
virtual void SetColumns(int n = 1 );
virtual int GetColumns() const ;
// Original API
virtual void Command(wxCommandEvent& event);
void SetFocus();
// Implementation
virtual void ChangeFont(bool keepOriginalSize = true);
virtual void ChangeBackgroundColour();
virtual void ChangeForegroundColour();
WXWidget GetTopWidget() const { return m_formWidget; }
WXWidget GetMainWidget() const { return m_buttonWidget; }
virtual wxSize DoGetBestSize() const;
// implementation, for wxChoiceCallback
const wxWidgetArray& GetWidgets() const { return m_widgetArray; }
const wxArrayString& GetStrings() const { return m_stringArray; }
protected:
// minimum size for the text ctrl
wxSize GetItemsSize() const;
// common part of all constructors
void Init();
WXWidget m_menuWidget;
WXWidget m_buttonWidget;
wxWidgetArray m_widgetArray;
WXWidget m_formWidget;
wxArrayString m_stringArray;
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
// implementation of wxControlWithItems
virtual int DoInsertItems(const wxArrayStringsAdapter& items,
unsigned int pos,
void **clientData, wxClientDataType type);
};
#endif // _WX_CHOICE_H_

Some files were not shown because too many files have changed in this diff Show more