Compare commits
357 Commits
v2.8.0
...
wxPy_2_8_1
Author | SHA1 | Date | |
---|---|---|---|
|
043fd155ae | ||
|
0d3847e80c | ||
|
e86fbab1ba | ||
|
1ddcb14574 | ||
|
a0d5472b1b | ||
|
6caa0f5cd1 | ||
|
5712281c5d | ||
|
68585e1770 | ||
|
4aab34290a | ||
|
f24b783af3 | ||
|
6d727f6c10 | ||
|
5f28de16f3 | ||
|
0fdd3cc881 | ||
|
447325a44f | ||
|
3aba082d50 | ||
|
fc9f11cc6f | ||
|
869c929083 | ||
|
9030e77918 | ||
|
67879c5b41 | ||
|
a0232aa520 | ||
|
01ad5e43bf | ||
|
1d51064ce3 | ||
|
0149e27783 | ||
|
7fa8d0854b | ||
|
fd363e1abc | ||
|
df794ecc9f | ||
|
9aaca412e2 | ||
|
6646ca90e8 | ||
|
b901ac2c3b | ||
|
04af2f5ce3 | ||
|
49f29fbe2c | ||
|
65d7319f85 | ||
|
1fe8ec6d3d | ||
|
0f0298b10c | ||
|
646c7e13ea | ||
|
6594faa98e | ||
|
5a2d9e121f | ||
|
6a6c9417a8 | ||
|
627ddac99e | ||
|
165d3652ff | ||
|
186453cc7c | ||
|
9249d38d6e | ||
|
fb96cf856e | ||
|
75d0223f8c | ||
|
8030e0e954 | ||
|
27587c251c | ||
|
b08d67c27b | ||
|
5541976c17 | ||
|
7d69a5715e | ||
|
61071e6160 | ||
|
3e47020738 | ||
|
2207fd2168 | ||
|
df0468c73a | ||
|
652dbdc0ab | ||
|
81073d9209 | ||
|
c25db58432 | ||
|
4d1f840337 | ||
|
a1b289f1f9 | ||
|
09a0945522 | ||
|
3f83a9cda3 | ||
|
3b5d20079c | ||
|
b8508db8b4 | ||
|
0d3997fd6d | ||
|
cfbf301d7c | ||
|
d95527de9a | ||
|
fc2b0e31bb | ||
|
4f690a1d5e | ||
|
5d389b0445 | ||
|
6a6e282245 | ||
|
302129f896 | ||
|
19a885344a | ||
|
46831f391b | ||
|
cfce9d35ad | ||
|
f1c5e92f3f | ||
|
da88bc1a18 | ||
|
d576c660f7 | ||
|
156d7d8626 | ||
|
e49426a206 | ||
|
7749035c4e | ||
|
f241631e6d | ||
|
4b6930c813 | ||
|
8d206c073d | ||
|
5a253c3f0a | ||
|
a8b2285edf | ||
|
21de14b331 | ||
|
e7b21b01fe | ||
|
3d490242f0 | ||
|
d40e9e06bb | ||
|
b6d8301814 | ||
|
e816f5c736 | ||
|
be809e82f2 | ||
|
9c80e160ec | ||
|
02f0eca5fb | ||
|
c640dfa5e8 | ||
|
d716e45315 | ||
|
9d5bd96c58 | ||
|
3273f8342e | ||
|
1ff18f49b9 | ||
|
8ef74b15f7 | ||
|
3b849b9a88 | ||
|
b432b50d61 | ||
|
715ce94da9 | ||
|
3633deedb4 | ||
|
a3c8c017cf | ||
|
fb66c150a4 | ||
|
63dd461bc8 | ||
|
a8990bd443 | ||
|
3173a64c51 | ||
|
5fd01bf150 | ||
|
1ceb4f4d19 | ||
|
070a1e7e3b | ||
|
0b8055d224 | ||
|
c267649e53 | ||
|
8e3fa7eecc | ||
|
c1cef60b50 | ||
|
6f8415ca56 | ||
|
46beb2e98d | ||
|
255dcbd7cb | ||
|
090afcf011 | ||
|
d200d68cbf | ||
|
311360b893 | ||
|
f559e6218d | ||
|
e7f84ba5b1 | ||
|
af0ee083f8 | ||
|
7bf325389e | ||
|
4fd169bda5 | ||
|
2887cb4e38 | ||
|
7de9aaf012 | ||
|
21ead7676a | ||
|
8854a202f4 | ||
|
a1d5a2937a | ||
|
9fcf8144d9 | ||
|
52b222fe31 | ||
|
ff202bcb56 | ||
|
bcbec8656f | ||
|
43c974071f | ||
|
ad31e6a2da | ||
|
2458daa728 | ||
|
0917b10c4b | ||
|
2c03d7714c | ||
|
b726328b48 | ||
|
3e85709e97 | ||
|
35c4b4da0a | ||
|
bde1da6d3f | ||
|
82950569f9 | ||
|
c4b37573a9 | ||
|
f2bbe5b675 | ||
|
d2aa263fd1 | ||
|
a2dc658bba | ||
|
bf41d9034a | ||
|
8f6dc819f8 | ||
|
0d93bb5039 | ||
|
9248adc8da | ||
|
633f0196de | ||
|
4f6eaf5ee2 | ||
|
783388d5d9 | ||
|
e196c0a258 | ||
|
c05daf1bfd | ||
|
a44a646b7e | ||
|
ed9a7a63b8 | ||
|
3d7a1b394b | ||
|
34d71f81f4 | ||
|
b0a54b8a6b | ||
|
0eaf8cd16c | ||
|
b64274c77a | ||
|
f80419c886 | ||
|
e5d3d8ad45 | ||
|
ccf6c43b3d | ||
|
6cfe484434 | ||
|
0bddba445f | ||
|
23fb9116c3 | ||
|
3e69f6e58e | ||
|
82ddc0cae3 | ||
|
8a14de8aa9 | ||
|
f7a5043240 | ||
|
c81f58f7e5 | ||
|
eee9bf2e5c | ||
|
ef1160a7dc | ||
|
7538fdc9a6 | ||
|
ca2261d33f | ||
|
4e8107d57a | ||
|
395e0a70ba | ||
|
aeffa0721d | ||
|
ffdbfc4a76 | ||
|
9f5e5c31a8 | ||
|
3bdec81e14 | ||
|
5448935a30 | ||
|
1a4b6b97b1 | ||
|
7528971e6b | ||
|
8e287ae93f | ||
|
631787c478 | ||
|
b2b4f8c0ca | ||
|
02d5015b1c | ||
|
61f84e2493 | ||
|
046c2f1404 | ||
|
defeae282f | ||
|
44038f9a6c | ||
|
e9a4bf7ddc | ||
|
99a7bebb65 | ||
|
de387fc99c | ||
|
b9d495a007 | ||
|
7e2ee0bf41 | ||
|
7f3e07a83a | ||
|
e0329d2476 | ||
|
12e424d28f | ||
|
d2a931c9f7 | ||
|
b3ff5a475b | ||
|
f321ab7fb4 | ||
|
9c6d8b7cdb | ||
|
ccea21ccf8 | ||
|
8605f9c571 | ||
|
338b2a02ce | ||
|
629ddfb03e | ||
|
f928b1ab18 | ||
|
0ae9003c21 | ||
|
3fafce674b | ||
|
574d48dbe4 | ||
|
190b93449e | ||
|
16837dc334 | ||
|
95fab76ba0 | ||
|
6969c2c318 | ||
|
e3eac0ff7f | ||
|
7947a11dad | ||
|
bdb5188415 | ||
|
dc99f469f5 | ||
|
59ccbf7fec | ||
|
2bd162773d | ||
|
e1944ad852 | ||
|
cefcc57db8 | ||
|
55424c8c22 | ||
|
015131a1fd | ||
|
38c213b192 | ||
|
e1463b9df0 | ||
|
c306c1e0f6 | ||
|
471046b088 | ||
|
cf6982fae6 | ||
|
5c7d3eb176 | ||
|
d69f7c5831 | ||
|
cbf6ba7559 | ||
|
cc197ed421 | ||
|
9a9b58229f | ||
|
f1f5f16f78 | ||
|
bc63f2c969 | ||
|
ff1bd293e1 | ||
|
8ebf24655c | ||
|
9b99c1e36a | ||
|
b370e7587f | ||
|
9fcbe07663 | ||
|
5b204a088a | ||
|
4d7e2cdad3 | ||
|
c0c677934f | ||
|
f02f4d43c5 | ||
|
afc2d3bc8a | ||
|
dbba880ee5 | ||
|
72d11e1734 | ||
|
9a137faacf | ||
|
e019c6429d | ||
|
f84a986cfc | ||
|
f0db59f269 | ||
|
4b32f8c79e | ||
|
facc1d350b | ||
|
89d1e2eeab | ||
|
09d48154cc | ||
|
bcf4fef288 | ||
|
d7db6a4351 | ||
|
757b694ba8 | ||
|
18c7af7e80 | ||
|
9e1c7236e0 | ||
|
9b9596de5e | ||
|
34841b216c | ||
|
8c0f22340e | ||
|
388703a573 | ||
|
698581160d | ||
|
779e158bb2 | ||
|
a2f2764dfb | ||
|
cd977e12f9 | ||
|
0646b21922 | ||
|
0d8a01fdaa | ||
|
8e509c4b0c | ||
|
be13a26775 | ||
|
84d3bc74b1 | ||
|
cd840087aa | ||
|
9c5fd8a319 | ||
|
5fe6c02bb8 | ||
|
9b8a360d4d | ||
|
dc4689ef73 | ||
|
d8bfd72731 | ||
|
2c4eefc056 | ||
|
6b44a33553 | ||
|
ede5511517 | ||
|
8c70a78958 | ||
|
dc7c33c455 | ||
|
9f8ffc5f8b | ||
|
9fea3325be | ||
|
0ec8d8f72c | ||
|
265db88d61 | ||
|
e6444871c1 | ||
|
4326154d28 | ||
|
31a8ceaf5f | ||
|
172d83f4ea | ||
|
62f04b576f | ||
|
0881232f66 | ||
|
948ddccfab | ||
|
3fa27f794b | ||
|
0ecdaebb94 | ||
|
fd7741f907 | ||
|
840c7ccebf | ||
|
10eeb875ec | ||
|
b529726eff | ||
|
86b6546709 | ||
|
0cdd04ad99 | ||
|
e28b9b9cb8 | ||
|
a73ae836df | ||
|
a7a0597ee7 | ||
|
68fc5c8025 | ||
|
e6239913ac | ||
|
8d3223cb32 | ||
|
169f3a3d6f | ||
|
d1fa6ef3dd | ||
|
af1f44f17e | ||
|
4ed51f4d1c | ||
|
eebbbda154 | ||
|
c33c11fa1d | ||
|
2c74c55876 | ||
|
9b4c231467 | ||
|
c60122bf37 | ||
|
6235857802 | ||
|
8fb6915941 | ||
|
a8728f8f37 | ||
|
1c62bcbeeb | ||
|
09d93215cf | ||
|
70b63a9909 | ||
|
5ec5b47f47 | ||
|
0a95d3369e | ||
|
95004448ad | ||
|
ef0abde66c | ||
|
8bc333d76d | ||
|
5b43c75c1d | ||
|
7420cf5bf3 | ||
|
ec184e3242 | ||
|
8138b9a4e2 | ||
|
0443b90dc4 | ||
|
1525e5435c | ||
|
152e99d73f | ||
|
0bf0b6bb87 | ||
|
7a71ffc175 | ||
|
675c8837a5 | ||
|
6f011faaf0 | ||
|
2901bc729b | ||
|
38f74dffc1 | ||
|
7cd8f61a4b | ||
|
2efce8f1ad | ||
|
698db322d0 | ||
|
bda4b4c684 | ||
|
ece5ecd8fb | ||
|
3f7f284d55 | ||
|
16ba9ea815 |
116
Makefile.in
116
Makefile.in
@@ -2157,6 +2157,7 @@ COND_TOOLKIT_MAC_GUI_HDR = \
|
||||
wx/mac/sound.h \
|
||||
wx/mac/spinbutt.h \
|
||||
wx/mac/spinctrl.h \
|
||||
wx/mac/srchctrl.h \
|
||||
wx/mac/statbmp.h \
|
||||
wx/mac/statbox.h \
|
||||
wx/mac/statline.h \
|
||||
@@ -2230,6 +2231,9 @@ COND_TOOLKIT_MAC_GUI_HDR = \
|
||||
wx/mac/carbon/printdlg.h \
|
||||
wx/mac/carbon/printmac.h \
|
||||
wx/mac/carbon/private.h \
|
||||
wx/mac/carbon/private/mactext.h \
|
||||
wx/mac/carbon/private/overlay.h \
|
||||
wx/mac/carbon/private/print.h \
|
||||
wx/mac/carbon/radiobox.h \
|
||||
wx/mac/carbon/radiobut.h \
|
||||
wx/mac/carbon/region.h \
|
||||
@@ -2237,6 +2241,7 @@ COND_TOOLKIT_MAC_GUI_HDR = \
|
||||
wx/mac/carbon/slider.h \
|
||||
wx/mac/carbon/spinbutt.h \
|
||||
wx/mac/carbon/spinctrl.h \
|
||||
wx/mac/carbon/srchctrl.h \
|
||||
wx/mac/carbon/statbmp.h \
|
||||
wx/mac/carbon/statbox.h \
|
||||
wx/mac/carbon/statline.h \
|
||||
@@ -2871,6 +2876,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \
|
||||
wx/generic/scrolwin.h \
|
||||
wx/generic/spinctlg.h \
|
||||
wx/generic/splitter.h \
|
||||
wx/generic/srchctlg.h \
|
||||
wx/generic/textdlgg.h \
|
||||
wx/generic/timer.h \
|
||||
wx/generic/treectlg.h \
|
||||
@@ -2988,6 +2994,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \
|
||||
wx/spinbutt.h \
|
||||
wx/spinctrl.h \
|
||||
wx/splitter.h \
|
||||
wx/srchctrl.h \
|
||||
wx/statline.h \
|
||||
wx/tab.h \
|
||||
wx/tabctrl.h \
|
||||
@@ -3096,6 +3103,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \
|
||||
wx/aui/aui.h \
|
||||
wx/richtext/richtextctrl.h \
|
||||
wx/richtext/richtextbuffer.h \
|
||||
wx/richtext/richtexthtml.h \
|
||||
wx/richtext/richtextstyles.h \
|
||||
wx/richtext/richtextxml.h \
|
||||
wx/richtext/richtextformatdlg.h \
|
||||
@@ -3497,6 +3505,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \
|
||||
monodll_rgncmn.o \
|
||||
monodll_settcmn.o \
|
||||
monodll_sizer.o \
|
||||
monodll_srchcmn.o \
|
||||
monodll_statbar.o \
|
||||
monodll_stockitem.o \
|
||||
monodll_tbarbase.o \
|
||||
@@ -3532,6 +3541,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \
|
||||
monodll_selstore.o \
|
||||
monodll_spinctlg.o \
|
||||
monodll_splitter.o \
|
||||
monodll_srchctlg.o \
|
||||
monodll_textdlgg.o \
|
||||
monodll_tipwin.o \
|
||||
monodll_toolbkg.o \
|
||||
@@ -3670,6 +3680,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \
|
||||
monodll_rgncmn.o \
|
||||
monodll_settcmn.o \
|
||||
monodll_sizer.o \
|
||||
monodll_srchcmn.o \
|
||||
monodll_statbar.o \
|
||||
monodll_stockitem.o \
|
||||
monodll_tbarbase.o \
|
||||
@@ -3705,6 +3716,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \
|
||||
monodll_selstore.o \
|
||||
monodll_spinctlg.o \
|
||||
monodll_splitter.o \
|
||||
monodll_srchctlg.o \
|
||||
monodll_textdlgg.o \
|
||||
monodll_tipwin.o \
|
||||
monodll_toolbkg.o \
|
||||
@@ -3717,6 +3729,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \
|
||||
@COND_TOOLKIT_COCOA@ monodll_gsockosx.o monodll_hid.o monodll_utilsexc_cf.o
|
||||
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS = \
|
||||
monodll_fontmgrcmn.o \
|
||||
monodll_socketevtdispatch.o \
|
||||
monodll_caret.o \
|
||||
monodll_colour.o \
|
||||
monodll_icon.o \
|
||||
@@ -3981,6 +3994,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS = \
|
||||
monodll_fontutil.o \
|
||||
monodll_utilsx11.o \
|
||||
monodll_displayx11.o \
|
||||
monodll_socketevtdispatch.o \
|
||||
monodll_icon.o \
|
||||
monodll_timer.o \
|
||||
monodll_app.o \
|
||||
@@ -3997,7 +4011,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS = \
|
||||
monodll_dcscreen.o \
|
||||
monodll_evtloop.o \
|
||||
monodll_font.o \
|
||||
monodll_gsockx11.o \
|
||||
monodll_minifram.o \
|
||||
monodll_nanox.o \
|
||||
monodll_palette.o \
|
||||
@@ -4263,6 +4276,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS = \
|
||||
monodll_slider.o \
|
||||
monodll_spinbutt.o \
|
||||
monodll_spinctrl.o \
|
||||
monodll_srchctrl.o \
|
||||
monodll_statbmp.o \
|
||||
monodll_statbox.o \
|
||||
monodll_statbrma.o \
|
||||
@@ -4548,6 +4562,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS = \
|
||||
@COND_TOOLKIT_COCOA@ monodll_gsockosx.o monodll_hid.o monodll_utilsexc_cf.o
|
||||
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_1 = \
|
||||
monodll_fontmgrcmn.o \
|
||||
monodll_socketevtdispatch.o \
|
||||
monodll_caret.o \
|
||||
monodll_colour.o \
|
||||
monodll_icon.o \
|
||||
@@ -4812,6 +4827,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 = \
|
||||
monodll_fontutil.o \
|
||||
monodll_utilsx11.o \
|
||||
monodll_displayx11.o \
|
||||
monodll_socketevtdispatch.o \
|
||||
monodll_icon.o \
|
||||
monodll_timer.o \
|
||||
monodll_app.o \
|
||||
@@ -4828,7 +4844,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 = \
|
||||
monodll_dcscreen.o \
|
||||
monodll_evtloop.o \
|
||||
monodll_font.o \
|
||||
monodll_gsockx11.o \
|
||||
monodll_minifram.o \
|
||||
monodll_nanox.o \
|
||||
monodll_palette.o \
|
||||
@@ -5271,6 +5286,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \
|
||||
monolib_rgncmn.o \
|
||||
monolib_settcmn.o \
|
||||
monolib_sizer.o \
|
||||
monolib_srchcmn.o \
|
||||
monolib_statbar.o \
|
||||
monolib_stockitem.o \
|
||||
monolib_tbarbase.o \
|
||||
@@ -5306,6 +5322,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \
|
||||
monolib_selstore.o \
|
||||
monolib_spinctlg.o \
|
||||
monolib_splitter.o \
|
||||
monolib_srchctlg.o \
|
||||
monolib_textdlgg.o \
|
||||
monolib_tipwin.o \
|
||||
monolib_toolbkg.o \
|
||||
@@ -5444,6 +5461,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \
|
||||
monolib_rgncmn.o \
|
||||
monolib_settcmn.o \
|
||||
monolib_sizer.o \
|
||||
monolib_srchcmn.o \
|
||||
monolib_statbar.o \
|
||||
monolib_stockitem.o \
|
||||
monolib_tbarbase.o \
|
||||
@@ -5479,6 +5497,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \
|
||||
monolib_selstore.o \
|
||||
monolib_spinctlg.o \
|
||||
monolib_splitter.o \
|
||||
monolib_srchctlg.o \
|
||||
monolib_textdlgg.o \
|
||||
monolib_tipwin.o \
|
||||
monolib_toolbkg.o \
|
||||
@@ -5491,6 +5510,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \
|
||||
@COND_TOOLKIT_COCOA@ monolib_gsockosx.o monolib_hid.o monolib_utilsexc_cf.o
|
||||
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_2 = \
|
||||
monolib_fontmgrcmn.o \
|
||||
monolib_socketevtdispatch.o \
|
||||
monolib_caret.o \
|
||||
monolib_colour.o \
|
||||
monolib_icon.o \
|
||||
@@ -5756,6 +5776,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2 = \
|
||||
monolib_fontutil.o \
|
||||
monolib_utilsx11.o \
|
||||
monolib_displayx11.o \
|
||||
monolib_socketevtdispatch.o \
|
||||
monolib_icon.o \
|
||||
monolib_timer.o \
|
||||
monolib_app.o \
|
||||
@@ -5772,7 +5793,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2 = \
|
||||
monolib_dcscreen.o \
|
||||
monolib_evtloop.o \
|
||||
monolib_font.o \
|
||||
monolib_gsockx11.o \
|
||||
monolib_minifram.o \
|
||||
monolib_nanox.o \
|
||||
monolib_palette.o \
|
||||
@@ -6038,6 +6058,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 = \
|
||||
monolib_slider.o \
|
||||
monolib_spinbutt.o \
|
||||
monolib_spinctrl.o \
|
||||
monolib_srchctrl.o \
|
||||
monolib_statbmp.o \
|
||||
monolib_statbox.o \
|
||||
monolib_statbrma.o \
|
||||
@@ -6323,6 +6344,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 = \
|
||||
@COND_TOOLKIT_COCOA@ monolib_gsockosx.o monolib_hid.o monolib_utilsexc_cf.o
|
||||
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_3 = \
|
||||
monolib_fontmgrcmn.o \
|
||||
monolib_socketevtdispatch.o \
|
||||
monolib_caret.o \
|
||||
monolib_colour.o \
|
||||
monolib_icon.o \
|
||||
@@ -6588,6 +6610,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 = \
|
||||
monolib_fontutil.o \
|
||||
monolib_utilsx11.o \
|
||||
monolib_displayx11.o \
|
||||
monolib_socketevtdispatch.o \
|
||||
monolib_icon.o \
|
||||
monolib_timer.o \
|
||||
monolib_app.o \
|
||||
@@ -6604,7 +6627,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 = \
|
||||
monolib_dcscreen.o \
|
||||
monolib_evtloop.o \
|
||||
monolib_font.o \
|
||||
monolib_gsockx11.o \
|
||||
monolib_minifram.o \
|
||||
monolib_nanox.o \
|
||||
monolib_palette.o \
|
||||
@@ -7275,6 +7297,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \
|
||||
coredll_rgncmn.o \
|
||||
coredll_settcmn.o \
|
||||
coredll_sizer.o \
|
||||
coredll_srchcmn.o \
|
||||
coredll_statbar.o \
|
||||
coredll_stockitem.o \
|
||||
coredll_tbarbase.o \
|
||||
@@ -7310,6 +7333,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \
|
||||
coredll_selstore.o \
|
||||
coredll_spinctlg.o \
|
||||
coredll_splitter.o \
|
||||
coredll_srchctlg.o \
|
||||
coredll_textdlgg.o \
|
||||
coredll_tipwin.o \
|
||||
coredll_toolbkg.o \
|
||||
@@ -7448,6 +7472,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \
|
||||
coredll_rgncmn.o \
|
||||
coredll_settcmn.o \
|
||||
coredll_sizer.o \
|
||||
coredll_srchcmn.o \
|
||||
coredll_statbar.o \
|
||||
coredll_stockitem.o \
|
||||
coredll_tbarbase.o \
|
||||
@@ -7483,6 +7508,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \
|
||||
coredll_selstore.o \
|
||||
coredll_spinctlg.o \
|
||||
coredll_splitter.o \
|
||||
coredll_srchctlg.o \
|
||||
coredll_textdlgg.o \
|
||||
coredll_tipwin.o \
|
||||
coredll_toolbkg.o \
|
||||
@@ -7495,6 +7521,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \
|
||||
@COND_TOOLKIT_COCOA@ coredll_gsockosx.o coredll_hid.o coredll_utilsexc_cf.o
|
||||
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_4 = \
|
||||
coredll_fontmgrcmn.o \
|
||||
coredll_socketevtdispatch.o \
|
||||
coredll_caret.o \
|
||||
coredll_colour.o \
|
||||
coredll_icon.o \
|
||||
@@ -7760,6 +7787,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4 = \
|
||||
coredll_fontutil.o \
|
||||
coredll_utilsx11.o \
|
||||
coredll_displayx11.o \
|
||||
coredll_socketevtdispatch.o \
|
||||
coredll_icon.o \
|
||||
coredll_timer.o \
|
||||
coredll_app.o \
|
||||
@@ -7776,7 +7804,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4 = \
|
||||
coredll_dcscreen.o \
|
||||
coredll_evtloop.o \
|
||||
coredll_font.o \
|
||||
coredll_gsockx11.o \
|
||||
coredll_minifram.o \
|
||||
coredll_nanox.o \
|
||||
coredll_palette.o \
|
||||
@@ -8042,6 +8069,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 = \
|
||||
coredll_slider.o \
|
||||
coredll_spinbutt.o \
|
||||
coredll_spinctrl.o \
|
||||
coredll_srchctrl.o \
|
||||
coredll_statbmp.o \
|
||||
coredll_statbox.o \
|
||||
coredll_statbrma.o \
|
||||
@@ -8327,6 +8355,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 = \
|
||||
@COND_TOOLKIT_COCOA@ coredll_gsockosx.o coredll_hid.o coredll_utilsexc_cf.o
|
||||
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_5 = \
|
||||
coredll_fontmgrcmn.o \
|
||||
coredll_socketevtdispatch.o \
|
||||
coredll_caret.o \
|
||||
coredll_colour.o \
|
||||
coredll_icon.o \
|
||||
@@ -8592,6 +8621,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5 = \
|
||||
coredll_fontutil.o \
|
||||
coredll_utilsx11.o \
|
||||
coredll_displayx11.o \
|
||||
coredll_socketevtdispatch.o \
|
||||
coredll_icon.o \
|
||||
coredll_timer.o \
|
||||
coredll_app.o \
|
||||
@@ -8608,7 +8638,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5 = \
|
||||
coredll_dcscreen.o \
|
||||
coredll_evtloop.o \
|
||||
coredll_font.o \
|
||||
coredll_gsockx11.o \
|
||||
coredll_minifram.o \
|
||||
coredll_nanox.o \
|
||||
coredll_palette.o \
|
||||
@@ -8723,6 +8752,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \
|
||||
corelib_rgncmn.o \
|
||||
corelib_settcmn.o \
|
||||
corelib_sizer.o \
|
||||
corelib_srchcmn.o \
|
||||
corelib_statbar.o \
|
||||
corelib_stockitem.o \
|
||||
corelib_tbarbase.o \
|
||||
@@ -8758,6 +8788,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \
|
||||
corelib_selstore.o \
|
||||
corelib_spinctlg.o \
|
||||
corelib_splitter.o \
|
||||
corelib_srchctlg.o \
|
||||
corelib_textdlgg.o \
|
||||
corelib_tipwin.o \
|
||||
corelib_toolbkg.o \
|
||||
@@ -8896,6 +8927,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \
|
||||
corelib_rgncmn.o \
|
||||
corelib_settcmn.o \
|
||||
corelib_sizer.o \
|
||||
corelib_srchcmn.o \
|
||||
corelib_statbar.o \
|
||||
corelib_stockitem.o \
|
||||
corelib_tbarbase.o \
|
||||
@@ -8931,6 +8963,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \
|
||||
corelib_selstore.o \
|
||||
corelib_spinctlg.o \
|
||||
corelib_splitter.o \
|
||||
corelib_srchctlg.o \
|
||||
corelib_textdlgg.o \
|
||||
corelib_tipwin.o \
|
||||
corelib_toolbkg.o \
|
||||
@@ -8943,6 +8976,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \
|
||||
@COND_TOOLKIT_COCOA@ corelib_gsockosx.o corelib_hid.o corelib_utilsexc_cf.o
|
||||
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_6 = \
|
||||
corelib_fontmgrcmn.o \
|
||||
corelib_socketevtdispatch.o \
|
||||
corelib_caret.o \
|
||||
corelib_colour.o \
|
||||
corelib_icon.o \
|
||||
@@ -9208,6 +9242,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6 = \
|
||||
corelib_fontutil.o \
|
||||
corelib_utilsx11.o \
|
||||
corelib_displayx11.o \
|
||||
corelib_socketevtdispatch.o \
|
||||
corelib_icon.o \
|
||||
corelib_timer.o \
|
||||
corelib_app.o \
|
||||
@@ -9224,7 +9259,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6 = \
|
||||
corelib_dcscreen.o \
|
||||
corelib_evtloop.o \
|
||||
corelib_font.o \
|
||||
corelib_gsockx11.o \
|
||||
corelib_minifram.o \
|
||||
corelib_nanox.o \
|
||||
corelib_palette.o \
|
||||
@@ -9490,6 +9524,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 = \
|
||||
corelib_slider.o \
|
||||
corelib_spinbutt.o \
|
||||
corelib_spinctrl.o \
|
||||
corelib_srchctrl.o \
|
||||
corelib_statbmp.o \
|
||||
corelib_statbox.o \
|
||||
corelib_statbrma.o \
|
||||
@@ -9775,6 +9810,7 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 = \
|
||||
@COND_TOOLKIT_COCOA@ corelib_gsockosx.o corelib_hid.o corelib_utilsexc_cf.o
|
||||
COND_TOOLKIT_DFB___LOWLEVEL_SRC_OBJECTS_7 = \
|
||||
corelib_fontmgrcmn.o \
|
||||
corelib_socketevtdispatch.o \
|
||||
corelib_caret.o \
|
||||
corelib_colour.o \
|
||||
corelib_icon.o \
|
||||
@@ -10040,6 +10076,7 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 = \
|
||||
corelib_fontutil.o \
|
||||
corelib_utilsx11.o \
|
||||
corelib_displayx11.o \
|
||||
corelib_socketevtdispatch.o \
|
||||
corelib_icon.o \
|
||||
corelib_timer.o \
|
||||
corelib_app.o \
|
||||
@@ -10056,7 +10093,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 = \
|
||||
corelib_dcscreen.o \
|
||||
corelib_evtloop.o \
|
||||
corelib_font.o \
|
||||
corelib_gsockx11.o \
|
||||
corelib_minifram.o \
|
||||
corelib_nanox.o \
|
||||
corelib_palette.o \
|
||||
@@ -12852,6 +12888,9 @@ monodll_notebmac.o: $(srcdir)/src/mac/carbon/notebmac.cpp $(MONODLL_ODEP)
|
||||
monodll_printmac.o: $(srcdir)/src/mac/carbon/printmac.cpp $(MONODLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/printmac.cpp
|
||||
|
||||
monodll_srchctrl.o: $(srcdir)/src/mac/carbon/srchctrl.cpp $(MONODLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/srchctrl.cpp
|
||||
|
||||
monodll_statbrma.o: $(srcdir)/src/mac/carbon/statbrma.cpp $(MONODLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/statbrma.cpp
|
||||
|
||||
@@ -14781,8 +14820,11 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp
|
||||
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@monodll_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/gsockx11.cpp
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@monodll_socketevtdispatch.o: $(srcdir)/src/common/socketevtdispatch.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/socketevtdispatch.cpp
|
||||
|
||||
@COND_TOOLKIT_DFB_USE_GUI_1@monodll_socketevtdispatch.o: $(srcdir)/src/common/socketevtdispatch.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/socketevtdispatch.cpp
|
||||
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@monodll_nanox.o: $(srcdir)/src/x11/nanox.c $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(MONODLL_CFLAGS) $(srcdir)/src/x11/nanox.c
|
||||
@@ -16224,6 +16266,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
|
||||
@COND_USE_GUI_1@monodll_sizer.o: $(srcdir)/src/common/sizer.cpp $(MONODLL_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
|
||||
|
||||
@COND_USE_GUI_1@monodll_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(MONODLL_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
|
||||
|
||||
@COND_USE_GUI_1@monodll_statbar.o: $(srcdir)/src/common/statbar.cpp $(MONODLL_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
|
||||
|
||||
@@ -16329,6 +16374,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
|
||||
@COND_USE_GUI_1@monodll_splitter.o: $(srcdir)/src/generic/splitter.cpp $(MONODLL_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
|
||||
|
||||
@COND_USE_GUI_1@monodll_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(MONODLL_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/srchctlg.cpp
|
||||
|
||||
@COND_USE_GUI_1@monodll_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(MONODLL_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
|
||||
|
||||
@@ -16959,6 +17007,9 @@ monolib_notebmac.o: $(srcdir)/src/mac/carbon/notebmac.cpp $(MONOLIB_ODEP)
|
||||
monolib_printmac.o: $(srcdir)/src/mac/carbon/printmac.cpp $(MONOLIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/printmac.cpp
|
||||
|
||||
monolib_srchctrl.o: $(srcdir)/src/mac/carbon/srchctrl.cpp $(MONOLIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/srchctrl.cpp
|
||||
|
||||
monolib_statbrma.o: $(srcdir)/src/mac/carbon/statbrma.cpp $(MONOLIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/statbrma.cpp
|
||||
|
||||
@@ -18888,8 +18939,11 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp
|
||||
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@monolib_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/gsockx11.cpp
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@monolib_socketevtdispatch.o: $(srcdir)/src/common/socketevtdispatch.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/socketevtdispatch.cpp
|
||||
|
||||
@COND_TOOLKIT_DFB_USE_GUI_1@monolib_socketevtdispatch.o: $(srcdir)/src/common/socketevtdispatch.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/socketevtdispatch.cpp
|
||||
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@monolib_nanox.o: $(srcdir)/src/x11/nanox.c $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(MONOLIB_CFLAGS) $(srcdir)/src/x11/nanox.c
|
||||
@@ -20331,6 +20385,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
|
||||
@COND_USE_GUI_1@monolib_sizer.o: $(srcdir)/src/common/sizer.cpp $(MONOLIB_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
|
||||
|
||||
@COND_USE_GUI_1@monolib_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(MONOLIB_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
|
||||
|
||||
@COND_USE_GUI_1@monolib_statbar.o: $(srcdir)/src/common/statbar.cpp $(MONOLIB_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
|
||||
|
||||
@@ -20436,6 +20493,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
|
||||
@COND_USE_GUI_1@monolib_splitter.o: $(srcdir)/src/generic/splitter.cpp $(MONOLIB_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
|
||||
|
||||
@COND_USE_GUI_1@monolib_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(MONOLIB_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/srchctlg.cpp
|
||||
|
||||
@COND_USE_GUI_1@monolib_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(MONOLIB_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
|
||||
|
||||
@@ -22065,6 +22125,9 @@ coredll_notebmac.o: $(srcdir)/src/mac/carbon/notebmac.cpp $(COREDLL_ODEP)
|
||||
coredll_printmac.o: $(srcdir)/src/mac/carbon/printmac.cpp $(COREDLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/printmac.cpp
|
||||
|
||||
coredll_srchctrl.o: $(srcdir)/src/mac/carbon/srchctrl.cpp $(COREDLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/srchctrl.cpp
|
||||
|
||||
coredll_statbrma.o: $(srcdir)/src/mac/carbon/statbrma.cpp $(COREDLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/statbrma.cpp
|
||||
|
||||
@@ -23376,8 +23439,11 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
|
||||
@COND_TOOLKIT_COCOA_USE_GUI_1@coredll_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(COREDLL_ODEP)
|
||||
@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp
|
||||
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@coredll_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(COREDLL_ODEP)
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/gsockx11.cpp
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@coredll_socketevtdispatch.o: $(srcdir)/src/common/socketevtdispatch.cpp $(COREDLL_ODEP)
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/socketevtdispatch.cpp
|
||||
|
||||
@COND_TOOLKIT_DFB_USE_GUI_1@coredll_socketevtdispatch.o: $(srcdir)/src/common/socketevtdispatch.cpp $(COREDLL_ODEP)
|
||||
@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/socketevtdispatch.cpp
|
||||
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@coredll_nanox.o: $(srcdir)/src/x11/nanox.c $(COREDLL_ODEP)
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(COREDLL_CFLAGS) $(srcdir)/src/x11/nanox.c
|
||||
@@ -24783,6 +24849,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
|
||||
@COND_USE_GUI_1@coredll_sizer.o: $(srcdir)/src/common/sizer.cpp $(COREDLL_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
|
||||
|
||||
@COND_USE_GUI_1@coredll_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(COREDLL_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
|
||||
|
||||
@COND_USE_GUI_1@coredll_statbar.o: $(srcdir)/src/common/statbar.cpp $(COREDLL_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
|
||||
|
||||
@@ -24888,6 +24957,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
|
||||
@COND_USE_GUI_1@coredll_splitter.o: $(srcdir)/src/generic/splitter.cpp $(COREDLL_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
|
||||
|
||||
@COND_USE_GUI_1@coredll_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(COREDLL_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/srchctlg.cpp
|
||||
|
||||
@COND_USE_GUI_1@coredll_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(COREDLL_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
|
||||
|
||||
@@ -25008,6 +25080,9 @@ corelib_notebmac.o: $(srcdir)/src/mac/carbon/notebmac.cpp $(CORELIB_ODEP)
|
||||
corelib_printmac.o: $(srcdir)/src/mac/carbon/printmac.cpp $(CORELIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/printmac.cpp
|
||||
|
||||
corelib_srchctrl.o: $(srcdir)/src/mac/carbon/srchctrl.cpp $(CORELIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/srchctrl.cpp
|
||||
|
||||
corelib_statbrma.o: $(srcdir)/src/mac/carbon/statbrma.cpp $(CORELIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/statbrma.cpp
|
||||
|
||||
@@ -26319,8 +26394,11 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
|
||||
@COND_TOOLKIT_COCOA_USE_GUI_1@corelib_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(CORELIB_ODEP)
|
||||
@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp
|
||||
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@corelib_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(CORELIB_ODEP)
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/gsockx11.cpp
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@corelib_socketevtdispatch.o: $(srcdir)/src/common/socketevtdispatch.cpp $(CORELIB_ODEP)
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/socketevtdispatch.cpp
|
||||
|
||||
@COND_TOOLKIT_DFB_USE_GUI_1@corelib_socketevtdispatch.o: $(srcdir)/src/common/socketevtdispatch.cpp $(CORELIB_ODEP)
|
||||
@COND_TOOLKIT_DFB_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/socketevtdispatch.cpp
|
||||
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@corelib_nanox.o: $(srcdir)/src/x11/nanox.c $(CORELIB_ODEP)
|
||||
@COND_TOOLKIT_X11_USE_GUI_1@ $(CCC) -c -o $@ $(CORELIB_CFLAGS) $(srcdir)/src/x11/nanox.c
|
||||
@@ -27726,6 +27804,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
|
||||
@COND_USE_GUI_1@corelib_sizer.o: $(srcdir)/src/common/sizer.cpp $(CORELIB_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
|
||||
|
||||
@COND_USE_GUI_1@corelib_srchcmn.o: $(srcdir)/src/common/srchcmn.cpp $(CORELIB_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/srchcmn.cpp
|
||||
|
||||
@COND_USE_GUI_1@corelib_statbar.o: $(srcdir)/src/common/statbar.cpp $(CORELIB_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/statbar.cpp
|
||||
|
||||
@@ -27831,6 +27912,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
|
||||
@COND_USE_GUI_1@corelib_splitter.o: $(srcdir)/src/generic/splitter.cpp $(CORELIB_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/splitter.cpp
|
||||
|
||||
@COND_USE_GUI_1@corelib_srchctlg.o: $(srcdir)/src/generic/srchctlg.cpp $(CORELIB_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/srchctlg.cpp
|
||||
|
||||
@COND_USE_GUI_1@corelib_textdlgg.o: $(srcdir)/src/generic/textdlgg.cpp $(CORELIB_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/textdlgg.cpp
|
||||
|
||||
|
@@ -54,22 +54,22 @@
|
||||
</add-formats>
|
||||
|
||||
<del-formats files="../../samples/*.bkl">
|
||||
autoconf,msvc6prj,msevc4prj,cbuilderx,cbx_unix
|
||||
autoconf,msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
|
||||
</del-formats>
|
||||
<del-formats files="../../demos/*.bkl">
|
||||
msvc6prj,msevc4prj,cbuilderx,cbx_unix
|
||||
msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
|
||||
</del-formats>
|
||||
<del-formats files="../../samples/html/html_samples.bkl">
|
||||
msvc6prj,msevc4prj,cbuilderx,cbx_unix
|
||||
msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
|
||||
</del-formats>
|
||||
<del-formats files="../../samples/mobile/mobile_samples.bkl">
|
||||
msvc6prj,msevc4prj,cbuilderx,cbx_unix
|
||||
msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
|
||||
</del-formats>
|
||||
<del-formats files="../../samples/opengl/opengl_samples.bkl">
|
||||
msvc6prj,msevc4prj,cbuilderx,cbx_unix
|
||||
msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
|
||||
</del-formats>
|
||||
<del-formats files="../../utils/*.bkl">
|
||||
msvc6prj,msevc4prj,cbuilderx,cbx_unix
|
||||
msvc6prj,msevc4prj,msvs2005prj,cbuilderx,cbx_unix
|
||||
</del-formats>
|
||||
|
||||
<!-- WinCE can't have console apps: -->
|
||||
@@ -81,7 +81,7 @@
|
||||
|
||||
<!-- HtmlCtrl sample is Cocoa only (autoconf format) -->
|
||||
<del-formats files="../../samples/html/htmlctrl/htmlctrl.bkl">
|
||||
borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,watcom,cbuilderx,cbx_unix
|
||||
borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2005prj,watcom,cbuilderx,cbx_unix
|
||||
</del-formats>
|
||||
|
||||
|
||||
@@ -114,6 +114,9 @@
|
||||
<add-flags files="wx.bkl" formats="msvc6prj">
|
||||
-o../msw/wx.dsw
|
||||
</add-flags>
|
||||
<add-flags files="wx.bkl" formats="msvs2005prj">
|
||||
-o../msw/wx.sln
|
||||
</add-flags>
|
||||
<add-flags files="wx.bkl" formats="msevc4prj">
|
||||
-o../wince/wx.vcw
|
||||
</add-flags>
|
||||
@@ -131,7 +134,7 @@
|
||||
-o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT).cbx
|
||||
</add-flags>
|
||||
<add-flags files="../../contrib/build/*/*.bkl"
|
||||
formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj">
|
||||
formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj,msvs2005prj">
|
||||
-DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
|
||||
</add-flags>
|
||||
|
||||
|
@@ -8,7 +8,7 @@
|
||||
the library.
|
||||
-->
|
||||
|
||||
<if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','cbuilderx'] and
|
||||
<if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2005prj','cbuilderx'] and
|
||||
TOOLKIT in ['PM','MSW','MGL','MOTIF']">
|
||||
|
||||
<set var="BUILD_CFG_FILE" make_var="1">
|
||||
|
@@ -347,7 +347,9 @@
|
||||
|
||||
<!-- deal with the need to copy setup.h here: -->
|
||||
|
||||
<set var="IS_MSVC_PRJ">$(FORMAT in ['msvc6prj','msevc4prj'])</set>
|
||||
<set var="IS_MSVC_PRJ">
|
||||
$(FORMAT in ['msvc6prj','msevc4prj','msvs2005prj'])
|
||||
</set>
|
||||
|
||||
<define-tag name="msvc-headers" rules="dll,lib">
|
||||
<if cond="IS_MSVC_PRJ">
|
||||
@@ -420,7 +422,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
|
||||
<set var="_custom_build_include_wx_msw_genrcdefs_h">
|
||||
Creating $(SETUPHDIR)\wx\msw\rcdefs.h
|
||||
|
||||
"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(DOLLAR)(SETUPHDIR)\wx\msw"
|
||||
"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(SETUPHDIR)\wx\msw"
|
||||
$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
|
||||
</set>
|
||||
</if>
|
||||
|
@@ -98,8 +98,8 @@ Accepted values: AMD64, IA64.
|
||||
<!-- FIXME: restore this once bakefile is fixed to not use
|
||||
/Gm /GZ (incompatible with /O2) w/ debug-info -->
|
||||
<set var="DEBUG_INFO_DEFAULT">
|
||||
<if cond="FORMAT in ['msvc','msvc6prj','msevc4prj']">1</if>
|
||||
<if cond="FORMAT not in ['msvc','msvc6prj','msevc4prj']">default</if>
|
||||
<if cond="FORMAT in ['msvc','msvc6prj','msevc4prj','msvs2005prj']">1</if>
|
||||
<if cond="FORMAT not in ['msvc','msvc6prj','msevc4prj','msvs2005prj']">default</if>
|
||||
</set>
|
||||
-->
|
||||
<set var="DEBUG_INFO_DEFAULT">default</set>
|
||||
@@ -231,8 +231,8 @@ Acts according to BUILD by default.
|
||||
|
||||
<!-- currently only VC++ can compile wxDebugReport which is in QA lib -->
|
||||
<set var="USE_QA_DEFAULT">
|
||||
<if cond="FORMAT in ['msvc','msvc6prj']">1</if>
|
||||
<if cond="FORMAT not in ['msvc','msvc6prj']">0</if>
|
||||
<if cond="FORMAT in ['msvc','msvc6prj','msvs2005prj']">1</if>
|
||||
<if cond="FORMAT not in ['msvc','msvc6prj','msvs2005prj']">0</if>
|
||||
</set>
|
||||
<option name="USE_QA">
|
||||
<values>0,1</values>
|
||||
|
@@ -638,6 +638,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/common/rgncmn.cpp
|
||||
src/common/settcmn.cpp
|
||||
src/common/sizer.cpp
|
||||
src/common/srchcmn.cpp
|
||||
src/common/statbar.cpp
|
||||
src/common/stockitem.cpp
|
||||
src/common/tbarbase.cpp
|
||||
@@ -673,6 +674,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/generic/selstore.cpp
|
||||
src/generic/spinctlg.cpp
|
||||
src/generic/splitter.cpp
|
||||
src/generic/srchctlg.cpp
|
||||
src/generic/textdlgg.cpp
|
||||
src/generic/tipwin.cpp
|
||||
src/generic/toolbkg.cpp
|
||||
@@ -736,6 +738,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/generic/scrolwin.h
|
||||
wx/generic/spinctlg.h
|
||||
wx/generic/splitter.h
|
||||
wx/generic/srchctlg.h
|
||||
wx/generic/textdlgg.h
|
||||
wx/generic/timer.h
|
||||
wx/generic/treectlg.h
|
||||
@@ -854,6 +857,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/spinbutt.h
|
||||
wx/spinctrl.h
|
||||
wx/splitter.h
|
||||
wx/srchctrl.h
|
||||
wx/statline.h
|
||||
wx/tab.h
|
||||
wx/tabctrl.h
|
||||
@@ -1395,6 +1399,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
|
||||
<set var="X11_LOWLEVEL_SRC" hints="files">
|
||||
$(XWIN_LOWLEVEL_SRC)
|
||||
src/common/socketevtdispatch.cpp
|
||||
src/generic/icon.cpp
|
||||
src/generic/timer.cpp
|
||||
src/x11/app.cpp
|
||||
@@ -1411,7 +1416,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/x11/dcscreen.cpp
|
||||
src/x11/evtloop.cpp
|
||||
src/x11/font.cpp
|
||||
src/x11/gsockx11.cpp
|
||||
src/x11/minifram.cpp
|
||||
src/x11/nanox.c
|
||||
src/x11/palette.cpp
|
||||
@@ -1814,6 +1818,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
|
||||
<set var="DFB_LOWLEVEL_SRC" hints="files">
|
||||
src/common/fontmgrcmn.cpp
|
||||
src/common/socketevtdispatch.cpp
|
||||
src/generic/caret.cpp
|
||||
src/generic/colour.cpp
|
||||
src/generic/icon.cpp
|
||||
@@ -2135,6 +2140,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/mac/carbon/slider.cpp
|
||||
src/mac/carbon/spinbutt.cpp
|
||||
src/mac/carbon/spinctrl.cpp
|
||||
src/mac/carbon/srchctrl.cpp
|
||||
src/mac/carbon/statbmp.cpp
|
||||
src/mac/carbon/statbox.cpp
|
||||
src/mac/carbon/statbrma.cpp
|
||||
@@ -2227,6 +2233,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/mac/sound.h
|
||||
wx/mac/spinbutt.h
|
||||
wx/mac/spinctrl.h
|
||||
wx/mac/srchctrl.h
|
||||
wx/mac/statbmp.h
|
||||
wx/mac/statbox.h
|
||||
wx/mac/statline.h
|
||||
@@ -2303,6 +2310,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/mac/carbon/printdlg.h
|
||||
wx/mac/carbon/printmac.h
|
||||
wx/mac/carbon/private.h
|
||||
wx/mac/carbon/private/mactext.h
|
||||
wx/mac/carbon/private/overlay.h
|
||||
wx/mac/carbon/private/print.h
|
||||
wx/mac/carbon/radiobox.h
|
||||
wx/mac/carbon/radiobut.h
|
||||
wx/mac/carbon/region.h
|
||||
@@ -2310,6 +2320,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/mac/carbon/slider.h
|
||||
wx/mac/carbon/spinbutt.h
|
||||
wx/mac/carbon/spinctrl.h
|
||||
wx/mac/carbon/srchctrl.h
|
||||
wx/mac/carbon/statbmp.h
|
||||
wx/mac/carbon/statbox.h
|
||||
wx/mac/carbon/statline.h
|
||||
@@ -3158,6 +3169,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
<set var="RICHTEXT_HDR" hints="files">
|
||||
wx/richtext/richtextctrl.h
|
||||
wx/richtext/richtextbuffer.h
|
||||
wx/richtext/richtexthtml.h
|
||||
wx/richtext/richtextstyles.h
|
||||
wx/richtext/richtextxml.h
|
||||
wx/richtext/richtextformatdlg.h
|
||||
|
@@ -24,7 +24,7 @@
|
||||
<!-- ...and when there are multiple libraries: -->
|
||||
<include file="multilib.bkl"/>
|
||||
|
||||
<if cond="FORMAT in ['msvc6prj','msevc4prj']">
|
||||
<if cond="FORMAT in ['msvc6prj','msevc4prj','msvs2005prj']">
|
||||
<set var="MSVC6PRJ_MERGED_TARGETS">
|
||||
<if cond="MONOLITHIC=='0'">$(MSVC6PRJ_MERGED_TARGETS_MULTILIB)</if>
|
||||
<if cond="MONOLITHIC=='1'">$(MSVC6PRJ_MERGED_TARGETS_MONOLIB)</if>
|
||||
|
@@ -1490,6 +1490,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_rgncmn.obj \
|
||||
$(OBJS)\monodll_settcmn.obj \
|
||||
$(OBJS)\monodll_sizer.obj \
|
||||
$(OBJS)\monodll_srchcmn.obj \
|
||||
$(OBJS)\monodll_statbar.obj \
|
||||
$(OBJS)\monodll_stockitem.obj \
|
||||
$(OBJS)\monodll_tbarbase.obj \
|
||||
@@ -1525,6 +1526,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_selstore.obj \
|
||||
$(OBJS)\monodll_spinctlg.obj \
|
||||
$(OBJS)\monodll_splitter.obj \
|
||||
$(OBJS)\monodll_srchctlg.obj \
|
||||
$(OBJS)\monodll_textdlgg.obj \
|
||||
$(OBJS)\monodll_tipwin.obj \
|
||||
$(OBJS)\monodll_toolbkg.obj \
|
||||
@@ -1713,6 +1715,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_rgncmn.obj \
|
||||
$(OBJS)\monodll_settcmn.obj \
|
||||
$(OBJS)\monodll_sizer.obj \
|
||||
$(OBJS)\monodll_srchcmn.obj \
|
||||
$(OBJS)\monodll_statbar.obj \
|
||||
$(OBJS)\monodll_stockitem.obj \
|
||||
$(OBJS)\monodll_tbarbase.obj \
|
||||
@@ -1748,6 +1751,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_selstore.obj \
|
||||
$(OBJS)\monodll_spinctlg.obj \
|
||||
$(OBJS)\monodll_splitter.obj \
|
||||
$(OBJS)\monodll_srchctlg.obj \
|
||||
$(OBJS)\monodll_textdlgg.obj \
|
||||
$(OBJS)\monodll_tipwin.obj \
|
||||
$(OBJS)\monodll_toolbkg.obj \
|
||||
@@ -2102,6 +2106,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_rgncmn.obj \
|
||||
$(OBJS)\monolib_settcmn.obj \
|
||||
$(OBJS)\monolib_sizer.obj \
|
||||
$(OBJS)\monolib_srchcmn.obj \
|
||||
$(OBJS)\monolib_statbar.obj \
|
||||
$(OBJS)\monolib_stockitem.obj \
|
||||
$(OBJS)\monolib_tbarbase.obj \
|
||||
@@ -2137,6 +2142,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_selstore.obj \
|
||||
$(OBJS)\monolib_spinctlg.obj \
|
||||
$(OBJS)\monolib_splitter.obj \
|
||||
$(OBJS)\monolib_srchctlg.obj \
|
||||
$(OBJS)\monolib_textdlgg.obj \
|
||||
$(OBJS)\monolib_tipwin.obj \
|
||||
$(OBJS)\monolib_toolbkg.obj \
|
||||
@@ -2325,6 +2331,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_rgncmn.obj \
|
||||
$(OBJS)\monolib_settcmn.obj \
|
||||
$(OBJS)\monolib_sizer.obj \
|
||||
$(OBJS)\monolib_srchcmn.obj \
|
||||
$(OBJS)\monolib_statbar.obj \
|
||||
$(OBJS)\monolib_stockitem.obj \
|
||||
$(OBJS)\monolib_tbarbase.obj \
|
||||
@@ -2360,6 +2367,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_selstore.obj \
|
||||
$(OBJS)\monolib_spinctlg.obj \
|
||||
$(OBJS)\monolib_splitter.obj \
|
||||
$(OBJS)\monolib_srchctlg.obj \
|
||||
$(OBJS)\monolib_textdlgg.obj \
|
||||
$(OBJS)\monolib_tipwin.obj \
|
||||
$(OBJS)\monolib_toolbkg.obj \
|
||||
@@ -2622,6 +2630,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_rgncmn.obj \
|
||||
$(OBJS)\coredll_settcmn.obj \
|
||||
$(OBJS)\coredll_sizer.obj \
|
||||
$(OBJS)\coredll_srchcmn.obj \
|
||||
$(OBJS)\coredll_statbar.obj \
|
||||
$(OBJS)\coredll_stockitem.obj \
|
||||
$(OBJS)\coredll_tbarbase.obj \
|
||||
@@ -2657,6 +2666,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_selstore.obj \
|
||||
$(OBJS)\coredll_spinctlg.obj \
|
||||
$(OBJS)\coredll_splitter.obj \
|
||||
$(OBJS)\coredll_srchctlg.obj \
|
||||
$(OBJS)\coredll_textdlgg.obj \
|
||||
$(OBJS)\coredll_tipwin.obj \
|
||||
$(OBJS)\coredll_toolbkg.obj \
|
||||
@@ -2845,6 +2855,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_rgncmn.obj \
|
||||
$(OBJS)\coredll_settcmn.obj \
|
||||
$(OBJS)\coredll_sizer.obj \
|
||||
$(OBJS)\coredll_srchcmn.obj \
|
||||
$(OBJS)\coredll_statbar.obj \
|
||||
$(OBJS)\coredll_stockitem.obj \
|
||||
$(OBJS)\coredll_tbarbase.obj \
|
||||
@@ -2880,6 +2891,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_selstore.obj \
|
||||
$(OBJS)\coredll_spinctlg.obj \
|
||||
$(OBJS)\coredll_splitter.obj \
|
||||
$(OBJS)\coredll_srchctlg.obj \
|
||||
$(OBJS)\coredll_textdlgg.obj \
|
||||
$(OBJS)\coredll_tipwin.obj \
|
||||
$(OBJS)\coredll_toolbkg.obj \
|
||||
@@ -3069,6 +3081,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_rgncmn.obj \
|
||||
$(OBJS)\corelib_settcmn.obj \
|
||||
$(OBJS)\corelib_sizer.obj \
|
||||
$(OBJS)\corelib_srchcmn.obj \
|
||||
$(OBJS)\corelib_statbar.obj \
|
||||
$(OBJS)\corelib_stockitem.obj \
|
||||
$(OBJS)\corelib_tbarbase.obj \
|
||||
@@ -3104,6 +3117,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_selstore.obj \
|
||||
$(OBJS)\corelib_spinctlg.obj \
|
||||
$(OBJS)\corelib_splitter.obj \
|
||||
$(OBJS)\corelib_srchctlg.obj \
|
||||
$(OBJS)\corelib_textdlgg.obj \
|
||||
$(OBJS)\corelib_tipwin.obj \
|
||||
$(OBJS)\corelib_toolbkg.obj \
|
||||
@@ -3292,6 +3306,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_rgncmn.obj \
|
||||
$(OBJS)\corelib_settcmn.obj \
|
||||
$(OBJS)\corelib_sizer.obj \
|
||||
$(OBJS)\corelib_srchcmn.obj \
|
||||
$(OBJS)\corelib_statbar.obj \
|
||||
$(OBJS)\corelib_stockitem.obj \
|
||||
$(OBJS)\corelib_tbarbase.obj \
|
||||
@@ -3327,6 +3342,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_selstore.obj \
|
||||
$(OBJS)\corelib_spinctlg.obj \
|
||||
$(OBJS)\corelib_splitter.obj \
|
||||
$(OBJS)\corelib_srchctlg.obj \
|
||||
$(OBJS)\corelib_textdlgg.obj \
|
||||
$(OBJS)\corelib_tipwin.obj \
|
||||
$(OBJS)\corelib_toolbkg.obj \
|
||||
@@ -6161,6 +6177,11 @@ $(OBJS)\monodll_sizer.obj: ..\..\src\common\sizer.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_srchcmn.obj: ..\..\src\common\srchcmn.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_statbar.obj: ..\..\src\common\statbar.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
|
||||
@@ -6336,6 +6357,11 @@ $(OBJS)\monodll_splitter.obj: ..\..\src\generic\splitter.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
|
||||
@@ -8148,6 +8174,11 @@ $(OBJS)\monolib_sizer.obj: ..\..\src\common\sizer.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_srchcmn.obj: ..\..\src\common\srchcmn.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_statbar.obj: ..\..\src\common\statbar.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
|
||||
@@ -8323,6 +8354,11 @@ $(OBJS)\monolib_splitter.obj: ..\..\src\generic\splitter.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
|
||||
@@ -10159,6 +10195,11 @@ $(OBJS)\coredll_sizer.obj: ..\..\src\common\sizer.cpp
|
||||
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\coredll_srchcmn.obj: ..\..\src\common\srchcmn.cpp
|
||||
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\coredll_statbar.obj: ..\..\src\common\statbar.cpp
|
||||
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
|
||||
@@ -10334,6 +10375,11 @@ $(OBJS)\coredll_splitter.obj: ..\..\src\generic\splitter.cpp
|
||||
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\coredll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
|
||||
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\coredll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
|
||||
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
|
||||
@@ -11424,6 +11470,11 @@ $(OBJS)\corelib_sizer.obj: ..\..\src\common\sizer.cpp
|
||||
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\corelib_srchcmn.obj: ..\..\src\common\srchcmn.cpp
|
||||
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\corelib_statbar.obj: ..\..\src\common\statbar.cpp
|
||||
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
|
||||
@@ -11599,6 +11650,11 @@ $(OBJS)\corelib_splitter.obj: ..\..\src\generic\splitter.cpp
|
||||
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\corelib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
|
||||
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\corelib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
|
||||
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
|
||||
|
@@ -1500,6 +1500,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_rgncmn.o \
|
||||
$(OBJS)\monodll_settcmn.o \
|
||||
$(OBJS)\monodll_sizer.o \
|
||||
$(OBJS)\monodll_srchcmn.o \
|
||||
$(OBJS)\monodll_statbar.o \
|
||||
$(OBJS)\monodll_stockitem.o \
|
||||
$(OBJS)\monodll_tbarbase.o \
|
||||
@@ -1535,6 +1536,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_selstore.o \
|
||||
$(OBJS)\monodll_spinctlg.o \
|
||||
$(OBJS)\monodll_splitter.o \
|
||||
$(OBJS)\monodll_srchctlg.o \
|
||||
$(OBJS)\monodll_textdlgg.o \
|
||||
$(OBJS)\monodll_tipwin.o \
|
||||
$(OBJS)\monodll_toolbkg.o \
|
||||
@@ -1725,6 +1727,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_rgncmn.o \
|
||||
$(OBJS)\monodll_settcmn.o \
|
||||
$(OBJS)\monodll_sizer.o \
|
||||
$(OBJS)\monodll_srchcmn.o \
|
||||
$(OBJS)\monodll_statbar.o \
|
||||
$(OBJS)\monodll_stockitem.o \
|
||||
$(OBJS)\monodll_tbarbase.o \
|
||||
@@ -1760,6 +1763,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_selstore.o \
|
||||
$(OBJS)\monodll_spinctlg.o \
|
||||
$(OBJS)\monodll_splitter.o \
|
||||
$(OBJS)\monodll_srchctlg.o \
|
||||
$(OBJS)\monodll_textdlgg.o \
|
||||
$(OBJS)\monodll_tipwin.o \
|
||||
$(OBJS)\monodll_toolbkg.o \
|
||||
@@ -2118,6 +2122,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_rgncmn.o \
|
||||
$(OBJS)\monolib_settcmn.o \
|
||||
$(OBJS)\monolib_sizer.o \
|
||||
$(OBJS)\monolib_srchcmn.o \
|
||||
$(OBJS)\monolib_statbar.o \
|
||||
$(OBJS)\monolib_stockitem.o \
|
||||
$(OBJS)\monolib_tbarbase.o \
|
||||
@@ -2153,6 +2158,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_selstore.o \
|
||||
$(OBJS)\monolib_spinctlg.o \
|
||||
$(OBJS)\monolib_splitter.o \
|
||||
$(OBJS)\monolib_srchctlg.o \
|
||||
$(OBJS)\monolib_textdlgg.o \
|
||||
$(OBJS)\monolib_tipwin.o \
|
||||
$(OBJS)\monolib_toolbkg.o \
|
||||
@@ -2343,6 +2349,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_rgncmn.o \
|
||||
$(OBJS)\monolib_settcmn.o \
|
||||
$(OBJS)\monolib_sizer.o \
|
||||
$(OBJS)\monolib_srchcmn.o \
|
||||
$(OBJS)\monolib_statbar.o \
|
||||
$(OBJS)\monolib_stockitem.o \
|
||||
$(OBJS)\monolib_tbarbase.o \
|
||||
@@ -2378,6 +2385,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_selstore.o \
|
||||
$(OBJS)\monolib_spinctlg.o \
|
||||
$(OBJS)\monolib_splitter.o \
|
||||
$(OBJS)\monolib_srchctlg.o \
|
||||
$(OBJS)\monolib_textdlgg.o \
|
||||
$(OBJS)\monolib_tipwin.o \
|
||||
$(OBJS)\monolib_toolbkg.o \
|
||||
@@ -2654,6 +2662,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_rgncmn.o \
|
||||
$(OBJS)\coredll_settcmn.o \
|
||||
$(OBJS)\coredll_sizer.o \
|
||||
$(OBJS)\coredll_srchcmn.o \
|
||||
$(OBJS)\coredll_statbar.o \
|
||||
$(OBJS)\coredll_stockitem.o \
|
||||
$(OBJS)\coredll_tbarbase.o \
|
||||
@@ -2689,6 +2698,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_selstore.o \
|
||||
$(OBJS)\coredll_spinctlg.o \
|
||||
$(OBJS)\coredll_splitter.o \
|
||||
$(OBJS)\coredll_srchctlg.o \
|
||||
$(OBJS)\coredll_textdlgg.o \
|
||||
$(OBJS)\coredll_tipwin.o \
|
||||
$(OBJS)\coredll_toolbkg.o \
|
||||
@@ -2879,6 +2889,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_rgncmn.o \
|
||||
$(OBJS)\coredll_settcmn.o \
|
||||
$(OBJS)\coredll_sizer.o \
|
||||
$(OBJS)\coredll_srchcmn.o \
|
||||
$(OBJS)\coredll_statbar.o \
|
||||
$(OBJS)\coredll_stockitem.o \
|
||||
$(OBJS)\coredll_tbarbase.o \
|
||||
@@ -2914,6 +2925,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_selstore.o \
|
||||
$(OBJS)\coredll_spinctlg.o \
|
||||
$(OBJS)\coredll_splitter.o \
|
||||
$(OBJS)\coredll_srchctlg.o \
|
||||
$(OBJS)\coredll_textdlgg.o \
|
||||
$(OBJS)\coredll_tipwin.o \
|
||||
$(OBJS)\coredll_toolbkg.o \
|
||||
@@ -3109,6 +3121,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_rgncmn.o \
|
||||
$(OBJS)\corelib_settcmn.o \
|
||||
$(OBJS)\corelib_sizer.o \
|
||||
$(OBJS)\corelib_srchcmn.o \
|
||||
$(OBJS)\corelib_statbar.o \
|
||||
$(OBJS)\corelib_stockitem.o \
|
||||
$(OBJS)\corelib_tbarbase.o \
|
||||
@@ -3144,6 +3157,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_selstore.o \
|
||||
$(OBJS)\corelib_spinctlg.o \
|
||||
$(OBJS)\corelib_splitter.o \
|
||||
$(OBJS)\corelib_srchctlg.o \
|
||||
$(OBJS)\corelib_textdlgg.o \
|
||||
$(OBJS)\corelib_tipwin.o \
|
||||
$(OBJS)\corelib_toolbkg.o \
|
||||
@@ -3334,6 +3348,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_rgncmn.o \
|
||||
$(OBJS)\corelib_settcmn.o \
|
||||
$(OBJS)\corelib_sizer.o \
|
||||
$(OBJS)\corelib_srchcmn.o \
|
||||
$(OBJS)\corelib_statbar.o \
|
||||
$(OBJS)\corelib_stockitem.o \
|
||||
$(OBJS)\corelib_tbarbase.o \
|
||||
@@ -3369,6 +3384,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_selstore.o \
|
||||
$(OBJS)\corelib_spinctlg.o \
|
||||
$(OBJS)\corelib_splitter.o \
|
||||
$(OBJS)\corelib_srchctlg.o \
|
||||
$(OBJS)\corelib_textdlgg.o \
|
||||
$(OBJS)\corelib_tipwin.o \
|
||||
$(OBJS)\corelib_toolbkg.o \
|
||||
@@ -6378,6 +6394,11 @@ $(OBJS)\monodll_sizer.o: ../../src/common/sizer.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monodll_srchcmn.o: ../../src/common/srchcmn.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monodll_statbar.o: ../../src/common/statbar.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
@@ -6553,6 +6574,11 @@ $(OBJS)\monodll_splitter.o: ../../src/generic/splitter.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monodll_srchctlg.o: ../../src/generic/srchctlg.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monodll_textdlgg.o: ../../src/generic/textdlgg.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
@@ -8465,6 +8491,11 @@ $(OBJS)\monolib_sizer.o: ../../src/common/sizer.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monolib_srchcmn.o: ../../src/common/srchcmn.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monolib_statbar.o: ../../src/common/statbar.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
@@ -8640,6 +8671,11 @@ $(OBJS)\monolib_splitter.o: ../../src/generic/splitter.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monolib_srchctlg.o: ../../src/generic/srchctlg.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monolib_textdlgg.o: ../../src/generic/textdlgg.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
@@ -10576,6 +10612,11 @@ $(OBJS)\coredll_sizer.o: ../../src/common/sizer.cpp
|
||||
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\coredll_srchcmn.o: ../../src/common/srchcmn.cpp
|
||||
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\coredll_statbar.o: ../../src/common/statbar.cpp
|
||||
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
@@ -10751,6 +10792,11 @@ $(OBJS)\coredll_splitter.o: ../../src/generic/splitter.cpp
|
||||
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\coredll_srchctlg.o: ../../src/generic/srchctlg.cpp
|
||||
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\coredll_textdlgg.o: ../../src/generic/textdlgg.cpp
|
||||
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
@@ -11941,6 +11987,11 @@ $(OBJS)\corelib_sizer.o: ../../src/common/sizer.cpp
|
||||
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\corelib_srchcmn.o: ../../src/common/srchcmn.cpp
|
||||
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\corelib_statbar.o: ../../src/common/statbar.cpp
|
||||
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
@@ -12116,6 +12167,11 @@ $(OBJS)\corelib_splitter.o: ../../src/generic/splitter.cpp
|
||||
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\corelib_srchctlg.o: ../../src/generic/srchctlg.cpp
|
||||
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\corelib_textdlgg.o: ../../src/generic/textdlgg.cpp
|
||||
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
@@ -1657,6 +1657,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_rgncmn.obj \
|
||||
$(OBJS)\monodll_settcmn.obj \
|
||||
$(OBJS)\monodll_sizer.obj \
|
||||
$(OBJS)\monodll_srchcmn.obj \
|
||||
$(OBJS)\monodll_statbar.obj \
|
||||
$(OBJS)\monodll_stockitem.obj \
|
||||
$(OBJS)\monodll_tbarbase.obj \
|
||||
@@ -1692,6 +1693,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_selstore.obj \
|
||||
$(OBJS)\monodll_spinctlg.obj \
|
||||
$(OBJS)\monodll_splitter.obj \
|
||||
$(OBJS)\monodll_srchctlg.obj \
|
||||
$(OBJS)\monodll_textdlgg.obj \
|
||||
$(OBJS)\monodll_tipwin.obj \
|
||||
$(OBJS)\monodll_toolbkg.obj \
|
||||
@@ -1880,6 +1882,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_rgncmn.obj \
|
||||
$(OBJS)\monodll_settcmn.obj \
|
||||
$(OBJS)\monodll_sizer.obj \
|
||||
$(OBJS)\monodll_srchcmn.obj \
|
||||
$(OBJS)\monodll_statbar.obj \
|
||||
$(OBJS)\monodll_stockitem.obj \
|
||||
$(OBJS)\monodll_tbarbase.obj \
|
||||
@@ -1915,6 +1918,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_selstore.obj \
|
||||
$(OBJS)\monodll_spinctlg.obj \
|
||||
$(OBJS)\monodll_splitter.obj \
|
||||
$(OBJS)\monodll_srchctlg.obj \
|
||||
$(OBJS)\monodll_textdlgg.obj \
|
||||
$(OBJS)\monodll_tipwin.obj \
|
||||
$(OBJS)\monodll_toolbkg.obj \
|
||||
@@ -2275,6 +2279,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_rgncmn.obj \
|
||||
$(OBJS)\monolib_settcmn.obj \
|
||||
$(OBJS)\monolib_sizer.obj \
|
||||
$(OBJS)\monolib_srchcmn.obj \
|
||||
$(OBJS)\monolib_statbar.obj \
|
||||
$(OBJS)\monolib_stockitem.obj \
|
||||
$(OBJS)\monolib_tbarbase.obj \
|
||||
@@ -2310,6 +2315,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_selstore.obj \
|
||||
$(OBJS)\monolib_spinctlg.obj \
|
||||
$(OBJS)\monolib_splitter.obj \
|
||||
$(OBJS)\monolib_srchctlg.obj \
|
||||
$(OBJS)\monolib_textdlgg.obj \
|
||||
$(OBJS)\monolib_tipwin.obj \
|
||||
$(OBJS)\monolib_toolbkg.obj \
|
||||
@@ -2498,6 +2504,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_rgncmn.obj \
|
||||
$(OBJS)\monolib_settcmn.obj \
|
||||
$(OBJS)\monolib_sizer.obj \
|
||||
$(OBJS)\monolib_srchcmn.obj \
|
||||
$(OBJS)\monolib_statbar.obj \
|
||||
$(OBJS)\monolib_stockitem.obj \
|
||||
$(OBJS)\monolib_tbarbase.obj \
|
||||
@@ -2533,6 +2540,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_selstore.obj \
|
||||
$(OBJS)\monolib_spinctlg.obj \
|
||||
$(OBJS)\monolib_splitter.obj \
|
||||
$(OBJS)\monolib_srchctlg.obj \
|
||||
$(OBJS)\monolib_textdlgg.obj \
|
||||
$(OBJS)\monolib_tipwin.obj \
|
||||
$(OBJS)\monolib_toolbkg.obj \
|
||||
@@ -2825,6 +2833,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_rgncmn.obj \
|
||||
$(OBJS)\coredll_settcmn.obj \
|
||||
$(OBJS)\coredll_sizer.obj \
|
||||
$(OBJS)\coredll_srchcmn.obj \
|
||||
$(OBJS)\coredll_statbar.obj \
|
||||
$(OBJS)\coredll_stockitem.obj \
|
||||
$(OBJS)\coredll_tbarbase.obj \
|
||||
@@ -2860,6 +2869,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_selstore.obj \
|
||||
$(OBJS)\coredll_spinctlg.obj \
|
||||
$(OBJS)\coredll_splitter.obj \
|
||||
$(OBJS)\coredll_srchctlg.obj \
|
||||
$(OBJS)\coredll_textdlgg.obj \
|
||||
$(OBJS)\coredll_tipwin.obj \
|
||||
$(OBJS)\coredll_toolbkg.obj \
|
||||
@@ -3048,6 +3058,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_rgncmn.obj \
|
||||
$(OBJS)\coredll_settcmn.obj \
|
||||
$(OBJS)\coredll_sizer.obj \
|
||||
$(OBJS)\coredll_srchcmn.obj \
|
||||
$(OBJS)\coredll_statbar.obj \
|
||||
$(OBJS)\coredll_stockitem.obj \
|
||||
$(OBJS)\coredll_tbarbase.obj \
|
||||
@@ -3083,6 +3094,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_selstore.obj \
|
||||
$(OBJS)\coredll_spinctlg.obj \
|
||||
$(OBJS)\coredll_splitter.obj \
|
||||
$(OBJS)\coredll_srchctlg.obj \
|
||||
$(OBJS)\coredll_textdlgg.obj \
|
||||
$(OBJS)\coredll_tipwin.obj \
|
||||
$(OBJS)\coredll_toolbkg.obj \
|
||||
@@ -3278,6 +3290,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_rgncmn.obj \
|
||||
$(OBJS)\corelib_settcmn.obj \
|
||||
$(OBJS)\corelib_sizer.obj \
|
||||
$(OBJS)\corelib_srchcmn.obj \
|
||||
$(OBJS)\corelib_statbar.obj \
|
||||
$(OBJS)\corelib_stockitem.obj \
|
||||
$(OBJS)\corelib_tbarbase.obj \
|
||||
@@ -3313,6 +3326,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_selstore.obj \
|
||||
$(OBJS)\corelib_spinctlg.obj \
|
||||
$(OBJS)\corelib_splitter.obj \
|
||||
$(OBJS)\corelib_srchctlg.obj \
|
||||
$(OBJS)\corelib_textdlgg.obj \
|
||||
$(OBJS)\corelib_tipwin.obj \
|
||||
$(OBJS)\corelib_toolbkg.obj \
|
||||
@@ -3501,6 +3515,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_rgncmn.obj \
|
||||
$(OBJS)\corelib_settcmn.obj \
|
||||
$(OBJS)\corelib_sizer.obj \
|
||||
$(OBJS)\corelib_srchcmn.obj \
|
||||
$(OBJS)\corelib_statbar.obj \
|
||||
$(OBJS)\corelib_stockitem.obj \
|
||||
$(OBJS)\corelib_tbarbase.obj \
|
||||
@@ -3536,6 +3551,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_selstore.obj \
|
||||
$(OBJS)\corelib_spinctlg.obj \
|
||||
$(OBJS)\corelib_splitter.obj \
|
||||
$(OBJS)\corelib_srchctlg.obj \
|
||||
$(OBJS)\corelib_textdlgg.obj \
|
||||
$(OBJS)\corelib_tipwin.obj \
|
||||
$(OBJS)\corelib_toolbkg.obj \
|
||||
@@ -6494,6 +6510,11 @@ $(OBJS)\monodll_sizer.obj: ..\..\src\common\sizer.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_srchcmn.obj: ..\..\src\common\srchcmn.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_statbar.obj: ..\..\src\common\statbar.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
|
||||
@@ -6669,6 +6690,11 @@ $(OBJS)\monodll_splitter.obj: ..\..\src\generic\splitter.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
|
||||
@@ -8481,6 +8507,11 @@ $(OBJS)\monolib_sizer.obj: ..\..\src\common\sizer.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_srchcmn.obj: ..\..\src\common\srchcmn.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_statbar.obj: ..\..\src\common\statbar.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
|
||||
@@ -8656,6 +8687,11 @@ $(OBJS)\monolib_splitter.obj: ..\..\src\generic\splitter.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
|
||||
@@ -10492,6 +10528,11 @@ $(OBJS)\coredll_sizer.obj: ..\..\src\common\sizer.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\coredll_srchcmn.obj: ..\..\src\common\srchcmn.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\coredll_statbar.obj: ..\..\src\common\statbar.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
|
||||
@@ -10667,6 +10708,11 @@ $(OBJS)\coredll_splitter.obj: ..\..\src\generic\splitter.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\coredll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\coredll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
|
||||
@@ -11757,6 +11803,11 @@ $(OBJS)\corelib_sizer.obj: ..\..\src\common\sizer.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\corelib_srchcmn.obj: ..\..\src\common\srchcmn.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\corelib_statbar.obj: ..\..\src\common\statbar.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
|
||||
@@ -11932,6 +11983,11 @@ $(OBJS)\corelib_splitter.obj: ..\..\src\generic\splitter.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\corelib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\corelib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
|
||||
|
@@ -383,6 +383,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
|
||||
$(OBJS)\monodll_rgncmn.obj &
|
||||
$(OBJS)\monodll_settcmn.obj &
|
||||
$(OBJS)\monodll_sizer.obj &
|
||||
$(OBJS)\monodll_srchcmn.obj &
|
||||
$(OBJS)\monodll_statbar.obj &
|
||||
$(OBJS)\monodll_stockitem.obj &
|
||||
$(OBJS)\monodll_tbarbase.obj &
|
||||
@@ -418,6 +419,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
|
||||
$(OBJS)\monodll_selstore.obj &
|
||||
$(OBJS)\monodll_spinctlg.obj &
|
||||
$(OBJS)\monodll_splitter.obj &
|
||||
$(OBJS)\monodll_srchctlg.obj &
|
||||
$(OBJS)\monodll_textdlgg.obj &
|
||||
$(OBJS)\monodll_tipwin.obj &
|
||||
$(OBJS)\monodll_toolbkg.obj &
|
||||
@@ -608,6 +610,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
|
||||
$(OBJS)\monodll_rgncmn.obj &
|
||||
$(OBJS)\monodll_settcmn.obj &
|
||||
$(OBJS)\monodll_sizer.obj &
|
||||
$(OBJS)\monodll_srchcmn.obj &
|
||||
$(OBJS)\monodll_statbar.obj &
|
||||
$(OBJS)\monodll_stockitem.obj &
|
||||
$(OBJS)\monodll_tbarbase.obj &
|
||||
@@ -643,6 +646,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
|
||||
$(OBJS)\monodll_selstore.obj &
|
||||
$(OBJS)\monodll_spinctlg.obj &
|
||||
$(OBJS)\monodll_splitter.obj &
|
||||
$(OBJS)\monodll_srchctlg.obj &
|
||||
$(OBJS)\monodll_textdlgg.obj &
|
||||
$(OBJS)\monodll_tipwin.obj &
|
||||
$(OBJS)\monodll_toolbkg.obj &
|
||||
@@ -1005,6 +1009,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
|
||||
$(OBJS)\monolib_rgncmn.obj &
|
||||
$(OBJS)\monolib_settcmn.obj &
|
||||
$(OBJS)\monolib_sizer.obj &
|
||||
$(OBJS)\monolib_srchcmn.obj &
|
||||
$(OBJS)\monolib_statbar.obj &
|
||||
$(OBJS)\monolib_stockitem.obj &
|
||||
$(OBJS)\monolib_tbarbase.obj &
|
||||
@@ -1040,6 +1045,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
|
||||
$(OBJS)\monolib_selstore.obj &
|
||||
$(OBJS)\monolib_spinctlg.obj &
|
||||
$(OBJS)\monolib_splitter.obj &
|
||||
$(OBJS)\monolib_srchctlg.obj &
|
||||
$(OBJS)\monolib_textdlgg.obj &
|
||||
$(OBJS)\monolib_tipwin.obj &
|
||||
$(OBJS)\monolib_toolbkg.obj &
|
||||
@@ -1230,6 +1236,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
|
||||
$(OBJS)\monolib_rgncmn.obj &
|
||||
$(OBJS)\monolib_settcmn.obj &
|
||||
$(OBJS)\monolib_sizer.obj &
|
||||
$(OBJS)\monolib_srchcmn.obj &
|
||||
$(OBJS)\monolib_statbar.obj &
|
||||
$(OBJS)\monolib_stockitem.obj &
|
||||
$(OBJS)\monolib_tbarbase.obj &
|
||||
@@ -1265,6 +1272,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
|
||||
$(OBJS)\monolib_selstore.obj &
|
||||
$(OBJS)\monolib_spinctlg.obj &
|
||||
$(OBJS)\monolib_splitter.obj &
|
||||
$(OBJS)\monolib_srchctlg.obj &
|
||||
$(OBJS)\monolib_textdlgg.obj &
|
||||
$(OBJS)\monolib_tipwin.obj &
|
||||
$(OBJS)\monolib_toolbkg.obj &
|
||||
@@ -1548,6 +1556,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
|
||||
$(OBJS)\coredll_rgncmn.obj &
|
||||
$(OBJS)\coredll_settcmn.obj &
|
||||
$(OBJS)\coredll_sizer.obj &
|
||||
$(OBJS)\coredll_srchcmn.obj &
|
||||
$(OBJS)\coredll_statbar.obj &
|
||||
$(OBJS)\coredll_stockitem.obj &
|
||||
$(OBJS)\coredll_tbarbase.obj &
|
||||
@@ -1583,6 +1592,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
|
||||
$(OBJS)\coredll_selstore.obj &
|
||||
$(OBJS)\coredll_spinctlg.obj &
|
||||
$(OBJS)\coredll_splitter.obj &
|
||||
$(OBJS)\coredll_srchctlg.obj &
|
||||
$(OBJS)\coredll_textdlgg.obj &
|
||||
$(OBJS)\coredll_tipwin.obj &
|
||||
$(OBJS)\coredll_toolbkg.obj &
|
||||
@@ -1773,6 +1783,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
|
||||
$(OBJS)\coredll_rgncmn.obj &
|
||||
$(OBJS)\coredll_settcmn.obj &
|
||||
$(OBJS)\coredll_sizer.obj &
|
||||
$(OBJS)\coredll_srchcmn.obj &
|
||||
$(OBJS)\coredll_statbar.obj &
|
||||
$(OBJS)\coredll_stockitem.obj &
|
||||
$(OBJS)\coredll_tbarbase.obj &
|
||||
@@ -1808,6 +1819,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
|
||||
$(OBJS)\coredll_selstore.obj &
|
||||
$(OBJS)\coredll_spinctlg.obj &
|
||||
$(OBJS)\coredll_splitter.obj &
|
||||
$(OBJS)\coredll_srchctlg.obj &
|
||||
$(OBJS)\coredll_textdlgg.obj &
|
||||
$(OBJS)\coredll_tipwin.obj &
|
||||
$(OBJS)\coredll_toolbkg.obj &
|
||||
@@ -2005,6 +2017,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
|
||||
$(OBJS)\corelib_rgncmn.obj &
|
||||
$(OBJS)\corelib_settcmn.obj &
|
||||
$(OBJS)\corelib_sizer.obj &
|
||||
$(OBJS)\corelib_srchcmn.obj &
|
||||
$(OBJS)\corelib_statbar.obj &
|
||||
$(OBJS)\corelib_stockitem.obj &
|
||||
$(OBJS)\corelib_tbarbase.obj &
|
||||
@@ -2040,6 +2053,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
|
||||
$(OBJS)\corelib_selstore.obj &
|
||||
$(OBJS)\corelib_spinctlg.obj &
|
||||
$(OBJS)\corelib_splitter.obj &
|
||||
$(OBJS)\corelib_srchctlg.obj &
|
||||
$(OBJS)\corelib_textdlgg.obj &
|
||||
$(OBJS)\corelib_tipwin.obj &
|
||||
$(OBJS)\corelib_toolbkg.obj &
|
||||
@@ -2230,6 +2244,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
|
||||
$(OBJS)\corelib_rgncmn.obj &
|
||||
$(OBJS)\corelib_settcmn.obj &
|
||||
$(OBJS)\corelib_sizer.obj &
|
||||
$(OBJS)\corelib_srchcmn.obj &
|
||||
$(OBJS)\corelib_statbar.obj &
|
||||
$(OBJS)\corelib_stockitem.obj &
|
||||
$(OBJS)\corelib_tbarbase.obj &
|
||||
@@ -2265,6 +2280,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
|
||||
$(OBJS)\corelib_selstore.obj &
|
||||
$(OBJS)\corelib_spinctlg.obj &
|
||||
$(OBJS)\corelib_splitter.obj &
|
||||
$(OBJS)\corelib_srchctlg.obj &
|
||||
$(OBJS)\corelib_textdlgg.obj &
|
||||
$(OBJS)\corelib_tipwin.obj &
|
||||
$(OBJS)\corelib_toolbkg.obj &
|
||||
@@ -6606,6 +6622,11 @@ $(OBJS)\monodll_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\monodll_srchcmn.obj : .AUTODEPEND ..\..\src\common\srchcmn.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\monodll_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
@@ -6781,6 +6802,11 @@ $(OBJS)\monodll_splitter.obj : .AUTODEPEND ..\..\src\generic\splitter.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\monodll_srchctlg.obj : .AUTODEPEND ..\..\src\generic\srchctlg.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\monodll_textdlgg.obj : .AUTODEPEND ..\..\src\generic\textdlgg.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
@@ -8693,6 +8719,11 @@ $(OBJS)\monolib_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\monolib_srchcmn.obj : .AUTODEPEND ..\..\src\common\srchcmn.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\monolib_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
@@ -8868,6 +8899,11 @@ $(OBJS)\monolib_splitter.obj : .AUTODEPEND ..\..\src\generic\splitter.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\monolib_srchctlg.obj : .AUTODEPEND ..\..\src\generic\srchctlg.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\monolib_textdlgg.obj : .AUTODEPEND ..\..\src\generic\textdlgg.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
@@ -10804,6 +10840,11 @@ $(OBJS)\coredll_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\coredll_srchcmn.obj : .AUTODEPEND ..\..\src\common\srchcmn.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\coredll_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
|
||||
@@ -10979,6 +11020,11 @@ $(OBJS)\coredll_splitter.obj : .AUTODEPEND ..\..\src\generic\splitter.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\coredll_srchctlg.obj : .AUTODEPEND ..\..\src\generic\srchctlg.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\coredll_textdlgg.obj : .AUTODEPEND ..\..\src\generic\textdlgg.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
|
||||
@@ -12169,6 +12215,11 @@ $(OBJS)\corelib_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\corelib_srchcmn.obj : .AUTODEPEND ..\..\src\common\srchcmn.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\corelib_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
|
||||
@@ -12344,6 +12395,11 @@ $(OBJS)\corelib_splitter.obj : .AUTODEPEND ..\..\src\generic\splitter.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\corelib_srchctlg.obj : .AUTODEPEND ..\..\src\generic\srchctlg.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\corelib_textdlgg.obj : .AUTODEPEND ..\..\src\generic\textdlgg.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
|
||||
|
@@ -778,6 +778,10 @@ SOURCE=..\..\src\common\sizer.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\src\common\srchcmn.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\src\common\statbar.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@@ -4674,6 +4678,10 @@ SOURCE=..\..\src\generic\splitter.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\src\generic\srchctlg.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\src\generic\statusbr.cpp
|
||||
|
||||
!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release"
|
||||
@@ -8353,6 +8361,10 @@ SOURCE=..\..\include\wx\generic\splitter.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\include\wx\generic\srchctlg.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\include\wx\generic\statusbr.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@@ -9193,6 +9205,10 @@ SOURCE=..\..\include\wx\richtext\richtextformatdlg.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\include\wx\richtext\richtexthtml.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\include\wx\richtext\richtextprint.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@@ -9265,6 +9281,10 @@ SOURCE=..\..\include\wx\splitter.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\include\wx\srchctrl.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\include\wx\statbmp.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
@@ -970,6 +970,10 @@ SOURCE=..\..\include\wx\richtext\richtextformatdlg.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\include\wx\richtext\richtexthtml.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\include\wx\richtext\richtextprint.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
@@ -352,6 +352,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
|
||||
$(OBJS)\monodll_rgncmn.obj &
|
||||
$(OBJS)\monodll_settcmn.obj &
|
||||
$(OBJS)\monodll_sizer.obj &
|
||||
$(OBJS)\monodll_srchcmn.obj &
|
||||
$(OBJS)\monodll_statbar.obj &
|
||||
$(OBJS)\monodll_stockitem.obj &
|
||||
$(OBJS)\monodll_tbarbase.obj &
|
||||
@@ -387,6 +388,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
|
||||
$(OBJS)\monodll_selstore.obj &
|
||||
$(OBJS)\monodll_spinctlg.obj &
|
||||
$(OBJS)\monodll_splitter.obj &
|
||||
$(OBJS)\monodll_srchctlg.obj &
|
||||
$(OBJS)\monodll_textdlgg.obj &
|
||||
$(OBJS)\monodll_tipwin.obj &
|
||||
$(OBJS)\monodll_toolbkg.obj &
|
||||
@@ -527,6 +529,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
|
||||
$(OBJS)\monodll_rgncmn.obj &
|
||||
$(OBJS)\monodll_settcmn.obj &
|
||||
$(OBJS)\monodll_sizer.obj &
|
||||
$(OBJS)\monodll_srchcmn.obj &
|
||||
$(OBJS)\monodll_statbar.obj &
|
||||
$(OBJS)\monodll_stockitem.obj &
|
||||
$(OBJS)\monodll_tbarbase.obj &
|
||||
@@ -562,6 +565,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
|
||||
$(OBJS)\monodll_selstore.obj &
|
||||
$(OBJS)\monodll_spinctlg.obj &
|
||||
$(OBJS)\monodll_splitter.obj &
|
||||
$(OBJS)\monodll_srchctlg.obj &
|
||||
$(OBJS)\monodll_textdlgg.obj &
|
||||
$(OBJS)\monodll_tipwin.obj &
|
||||
$(OBJS)\monodll_toolbkg.obj &
|
||||
@@ -893,6 +897,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
|
||||
$(OBJS)\monolib_rgncmn.obj &
|
||||
$(OBJS)\monolib_settcmn.obj &
|
||||
$(OBJS)\monolib_sizer.obj &
|
||||
$(OBJS)\monolib_srchcmn.obj &
|
||||
$(OBJS)\monolib_statbar.obj &
|
||||
$(OBJS)\monolib_stockitem.obj &
|
||||
$(OBJS)\monolib_tbarbase.obj &
|
||||
@@ -928,6 +933,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
|
||||
$(OBJS)\monolib_selstore.obj &
|
||||
$(OBJS)\monolib_spinctlg.obj &
|
||||
$(OBJS)\monolib_splitter.obj &
|
||||
$(OBJS)\monolib_srchctlg.obj &
|
||||
$(OBJS)\monolib_textdlgg.obj &
|
||||
$(OBJS)\monolib_tipwin.obj &
|
||||
$(OBJS)\monolib_toolbkg.obj &
|
||||
@@ -1068,6 +1074,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
|
||||
$(OBJS)\monolib_rgncmn.obj &
|
||||
$(OBJS)\monolib_settcmn.obj &
|
||||
$(OBJS)\monolib_sizer.obj &
|
||||
$(OBJS)\monolib_srchcmn.obj &
|
||||
$(OBJS)\monolib_statbar.obj &
|
||||
$(OBJS)\monolib_stockitem.obj &
|
||||
$(OBJS)\monolib_tbarbase.obj &
|
||||
@@ -1103,6 +1110,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
|
||||
$(OBJS)\monolib_selstore.obj &
|
||||
$(OBJS)\monolib_spinctlg.obj &
|
||||
$(OBJS)\monolib_splitter.obj &
|
||||
$(OBJS)\monolib_srchctlg.obj &
|
||||
$(OBJS)\monolib_textdlgg.obj &
|
||||
$(OBJS)\monolib_tipwin.obj &
|
||||
$(OBJS)\monolib_toolbkg.obj &
|
||||
@@ -1360,6 +1368,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
|
||||
$(OBJS)\coredll_rgncmn.obj &
|
||||
$(OBJS)\coredll_settcmn.obj &
|
||||
$(OBJS)\coredll_sizer.obj &
|
||||
$(OBJS)\coredll_srchcmn.obj &
|
||||
$(OBJS)\coredll_statbar.obj &
|
||||
$(OBJS)\coredll_stockitem.obj &
|
||||
$(OBJS)\coredll_tbarbase.obj &
|
||||
@@ -1395,6 +1404,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
|
||||
$(OBJS)\coredll_selstore.obj &
|
||||
$(OBJS)\coredll_spinctlg.obj &
|
||||
$(OBJS)\coredll_splitter.obj &
|
||||
$(OBJS)\coredll_srchctlg.obj &
|
||||
$(OBJS)\coredll_textdlgg.obj &
|
||||
$(OBJS)\coredll_tipwin.obj &
|
||||
$(OBJS)\coredll_toolbkg.obj &
|
||||
@@ -1535,6 +1545,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
|
||||
$(OBJS)\coredll_rgncmn.obj &
|
||||
$(OBJS)\coredll_settcmn.obj &
|
||||
$(OBJS)\coredll_sizer.obj &
|
||||
$(OBJS)\coredll_srchcmn.obj &
|
||||
$(OBJS)\coredll_statbar.obj &
|
||||
$(OBJS)\coredll_stockitem.obj &
|
||||
$(OBJS)\coredll_tbarbase.obj &
|
||||
@@ -1570,6 +1581,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
|
||||
$(OBJS)\coredll_selstore.obj &
|
||||
$(OBJS)\coredll_spinctlg.obj &
|
||||
$(OBJS)\coredll_splitter.obj &
|
||||
$(OBJS)\coredll_srchctlg.obj &
|
||||
$(OBJS)\coredll_textdlgg.obj &
|
||||
$(OBJS)\coredll_tipwin.obj &
|
||||
$(OBJS)\coredll_toolbkg.obj &
|
||||
@@ -1748,6 +1760,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
|
||||
$(OBJS)\corelib_rgncmn.obj &
|
||||
$(OBJS)\corelib_settcmn.obj &
|
||||
$(OBJS)\corelib_sizer.obj &
|
||||
$(OBJS)\corelib_srchcmn.obj &
|
||||
$(OBJS)\corelib_statbar.obj &
|
||||
$(OBJS)\corelib_stockitem.obj &
|
||||
$(OBJS)\corelib_tbarbase.obj &
|
||||
@@ -1783,6 +1796,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
|
||||
$(OBJS)\corelib_selstore.obj &
|
||||
$(OBJS)\corelib_spinctlg.obj &
|
||||
$(OBJS)\corelib_splitter.obj &
|
||||
$(OBJS)\corelib_srchctlg.obj &
|
||||
$(OBJS)\corelib_textdlgg.obj &
|
||||
$(OBJS)\corelib_tipwin.obj &
|
||||
$(OBJS)\corelib_toolbkg.obj &
|
||||
@@ -1923,6 +1937,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
|
||||
$(OBJS)\corelib_rgncmn.obj &
|
||||
$(OBJS)\corelib_settcmn.obj &
|
||||
$(OBJS)\corelib_sizer.obj &
|
||||
$(OBJS)\corelib_srchcmn.obj &
|
||||
$(OBJS)\corelib_statbar.obj &
|
||||
$(OBJS)\corelib_stockitem.obj &
|
||||
$(OBJS)\corelib_tbarbase.obj &
|
||||
@@ -1958,6 +1973,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
|
||||
$(OBJS)\corelib_selstore.obj &
|
||||
$(OBJS)\corelib_spinctlg.obj &
|
||||
$(OBJS)\corelib_splitter.obj &
|
||||
$(OBJS)\corelib_srchctlg.obj &
|
||||
$(OBJS)\corelib_textdlgg.obj &
|
||||
$(OBJS)\corelib_tipwin.obj &
|
||||
$(OBJS)\corelib_toolbkg.obj &
|
||||
@@ -5986,6 +6002,11 @@ $(OBJS)\monodll_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\monodll_srchcmn.obj : .AUTODEPEND ..\..\src\common\srchcmn.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\monodll_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
@@ -6161,6 +6182,11 @@ $(OBJS)\monodll_splitter.obj : .AUTODEPEND ..\..\src\generic\splitter.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\monodll_srchctlg.obj : .AUTODEPEND ..\..\src\generic\srchctlg.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\monodll_textdlgg.obj : .AUTODEPEND ..\..\src\generic\textdlgg.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
@@ -7844,6 +7870,11 @@ $(OBJS)\monolib_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\monolib_srchcmn.obj : .AUTODEPEND ..\..\src\common\srchcmn.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\monolib_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
@@ -8019,6 +8050,11 @@ $(OBJS)\monolib_splitter.obj : .AUTODEPEND ..\..\src\generic\splitter.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\monolib_srchctlg.obj : .AUTODEPEND ..\..\src\generic\srchctlg.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\monolib_textdlgg.obj : .AUTODEPEND ..\..\src\generic\textdlgg.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
@@ -9684,6 +9720,11 @@ $(OBJS)\coredll_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\coredll_srchcmn.obj : .AUTODEPEND ..\..\src\common\srchcmn.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\coredll_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
|
||||
@@ -9859,6 +9900,11 @@ $(OBJS)\coredll_splitter.obj : .AUTODEPEND ..\..\src\generic\splitter.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\coredll_srchctlg.obj : .AUTODEPEND ..\..\src\generic\srchctlg.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\coredll_textdlgg.obj : .AUTODEPEND ..\..\src\generic\textdlgg.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
|
||||
@@ -10886,6 +10932,11 @@ $(OBJS)\corelib_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\corelib_srchcmn.obj : .AUTODEPEND ..\..\src\common\srchcmn.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\corelib_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
|
||||
@@ -11061,6 +11112,11 @@ $(OBJS)\corelib_splitter.obj : .AUTODEPEND ..\..\src\generic\splitter.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\corelib_srchctlg.obj : .AUTODEPEND ..\..\src\generic\srchctlg.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\corelib_textdlgg.obj : .AUTODEPEND ..\..\src\generic\textdlgg.cpp
|
||||
$(CXX) -bt=os2 -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
|
||||
|
@@ -1,12 +1,12 @@
|
||||
rem Uncomment the next line to set the version; used also in wxWidgets.iss
|
||||
SET WXW_VER=2.8.0
|
||||
SET WXW_VER=2.8.1
|
||||
if (%WXW_VER%)==() SET WXW_VER=CVS
|
||||
|
||||
echo docs building for %WXW_VER%
|
||||
|
||||
rem This builds the docs in %WXWIN% in a number of formats
|
||||
rem and a clean inno setup in a second tree
|
||||
rem it uses a number of tools nmake, gnuwin32 zip, ghostscript, MS word, cvsNT
|
||||
rem it uses a number of tools nmake, gnuwin32 zip & dos2unix, ghostscript, MS word, cvsNT
|
||||
rem cvs is in the path already from CVSNT install
|
||||
rem writes a log file in c:\
|
||||
|
||||
@@ -18,14 +18,22 @@ set PATH=%PATH%;C:\wx\wxw26b\utils\tex2rtf\src\vc_based;C:\wx\Gnu\bin;c:\progra~
|
||||
set PATH=%PATH%;C:\Program Files\gs\gs8.51\lib;C:\Program Files\gs\gs8.51\bin
|
||||
echo %PATH% >> c:\temp.log
|
||||
|
||||
rem update wxwidgets (holds docs) and inno (cvs wxMSW module only)
|
||||
rem update wxwidgets (holds docs) and inno (cvs wxMSW setup.exe only)
|
||||
c:
|
||||
cd %WXWIN%
|
||||
cvs up -P -d
|
||||
|
||||
rem now inno
|
||||
cd \wx\inno\wxWidgets
|
||||
del c*.*
|
||||
if exist include\wx\msw\setup.h del include\wx\msw\setup.h
|
||||
if exist include\wx\univ\setup.h del include\wx\univ\setup.h
|
||||
cvs up -P
|
||||
dos2unix configure
|
||||
dos2unix config.guess
|
||||
dos2unix config.sub
|
||||
copy include\wx\msw\setup0.h include\wx\msw\setup.h
|
||||
copy include\wx\univ\setup0.h include\wx\univ\setup.h
|
||||
echo CVS update >> c:\temp.log
|
||||
|
||||
rem add bakefile build...
|
||||
|
144
configure
vendored
144
configure
vendored
@@ -1,7 +1,7 @@
|
||||
#! /bin/sh
|
||||
# From configure.in Id: configure.in.
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.0.
|
||||
# Generated by GNU Autoconf 2.59 for wxWidgets 2.8.1.
|
||||
#
|
||||
# Report bugs to <wx-dev@lists.wxwidgets.org>.
|
||||
#
|
||||
@@ -270,8 +270,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='wxWidgets'
|
||||
PACKAGE_TARNAME='wxwidgets'
|
||||
PACKAGE_VERSION='2.8.0'
|
||||
PACKAGE_STRING='wxWidgets 2.8.0'
|
||||
PACKAGE_VERSION='2.8.1'
|
||||
PACKAGE_STRING='wxWidgets 2.8.1'
|
||||
PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org'
|
||||
|
||||
ac_unique_file="wx-config.in"
|
||||
@@ -870,7 +870,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures wxWidgets 2.8.0 to adapt to many kinds of systems.
|
||||
\`configure' configures wxWidgets 2.8.1 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@@ -936,7 +936,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of wxWidgets 2.8.0:";;
|
||||
short | recursive ) echo "Configuration of wxWidgets 2.8.1:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@@ -1086,6 +1086,7 @@ Optional Features:
|
||||
--enable-radiobtn use wxRadioButton class
|
||||
--enable-sash use wxSashWindow class
|
||||
--enable-scrollbar use wxScrollBar class and scrollable windows
|
||||
--enable-searchctrl use wxSearchCtrl class
|
||||
--enable-slider use wxSlider class
|
||||
--enable-spinbtn use wxSpinButton class
|
||||
--enable-spinctrl use wxSpinCtrl class
|
||||
@@ -1338,7 +1339,7 @@ fi
|
||||
test -n "$ac_init_help" && exit 0
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
wxWidgets configure 2.8.0
|
||||
wxWidgets configure 2.8.1
|
||||
generated by GNU Autoconf 2.59
|
||||
|
||||
Copyright (C) 2003 Free Software Foundation, Inc.
|
||||
@@ -1352,7 +1353,7 @@ cat >&5 <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by wxWidgets $as_me 2.8.0, which was
|
||||
It was created by wxWidgets $as_me 2.8.1, which was
|
||||
generated by GNU Autoconf 2.59. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@@ -1803,8 +1804,8 @@ test -n "$target_alias" &&
|
||||
|
||||
wx_major_version_number=2
|
||||
wx_minor_version_number=8
|
||||
wx_release_number=0
|
||||
wx_subrelease_number=0
|
||||
wx_release_number=1
|
||||
wx_subrelease_number=1
|
||||
|
||||
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
|
||||
WX_VERSION=$WX_RELEASE.$wx_release_number
|
||||
@@ -2365,6 +2366,7 @@ if test $DEBUG_CONFIGURE = 1; then
|
||||
DEFAULT_wxUSE_RADIOBTN=no
|
||||
DEFAULT_wxUSE_SASH=no
|
||||
DEFAULT_wxUSE_SCROLLBAR=no
|
||||
DEFAULT_wxUSE_SEARCHCTRL=no
|
||||
DEFAULT_wxUSE_SLIDER=no
|
||||
DEFAULT_wxUSE_SPINBTN=no
|
||||
DEFAULT_wxUSE_SPINCTRL=no
|
||||
@@ -2588,6 +2590,7 @@ else
|
||||
DEFAULT_wxUSE_RADIOBTN=yes
|
||||
DEFAULT_wxUSE_SASH=yes
|
||||
DEFAULT_wxUSE_SCROLLBAR=yes
|
||||
DEFAULT_wxUSE_SEARCHCTRL=yes
|
||||
DEFAULT_wxUSE_SLIDER=yes
|
||||
DEFAULT_wxUSE_SPINBTN=yes
|
||||
DEFAULT_wxUSE_SPINCTRL=yes
|
||||
@@ -7997,6 +8000,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then
|
||||
DEFAULT_wxUSE_RADIOBTN=yes
|
||||
DEFAULT_wxUSE_SASH=yes
|
||||
DEFAULT_wxUSE_SCROLLBAR=yes
|
||||
DEFAULT_wxUSE_SEARCHCTRL=yes
|
||||
DEFAULT_wxUSE_SLIDER=yes
|
||||
DEFAULT_wxUSE_SPINBTN=yes
|
||||
DEFAULT_wxUSE_SPINCTRL=yes
|
||||
@@ -8049,6 +8053,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then
|
||||
DEFAULT_wxUSE_RADIOBTN=no
|
||||
DEFAULT_wxUSE_SASH=no
|
||||
DEFAULT_wxUSE_SCROLLBAR=no
|
||||
DEFAULT_wxUSE_SEARCHCTRL=no
|
||||
DEFAULT_wxUSE_SLIDER=no
|
||||
DEFAULT_wxUSE_SPINBTN=no
|
||||
DEFAULT_wxUSE_SPINCTRL=no
|
||||
@@ -9505,6 +9510,47 @@ echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
|
||||
enablestring=
|
||||
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-searchctrl" >&5
|
||||
echo $ECHO_N "checking for --${enablestring:-enable}-searchctrl... $ECHO_C" >&6
|
||||
no_cache=0
|
||||
# Check whether --enable-searchctrl or --disable-searchctrl was given.
|
||||
if test "${enable_searchctrl+set}" = set; then
|
||||
enableval="$enable_searchctrl"
|
||||
|
||||
if test "$enableval" = yes; then
|
||||
ac_cv_use_searchctrl='wxUSE_SEARCHCTRL=yes'
|
||||
else
|
||||
ac_cv_use_searchctrl='wxUSE_SEARCHCTRL=no'
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
LINE=`grep "wxUSE_SEARCHCTRL" ${wx_arg_cache_file}`
|
||||
if test "x$LINE" != x ; then
|
||||
eval "DEFAULT_$LINE"
|
||||
else
|
||||
no_cache=1
|
||||
fi
|
||||
|
||||
ac_cv_use_searchctrl='wxUSE_SEARCHCTRL='$DEFAULT_wxUSE_SEARCHCTRL
|
||||
|
||||
fi;
|
||||
|
||||
eval "$ac_cv_use_searchctrl"
|
||||
if test "$no_cache" != 1; then
|
||||
echo $ac_cv_use_searchctrl >> ${wx_arg_cache_file}.tmp
|
||||
fi
|
||||
|
||||
if test "$wxUSE_SEARCHCTRL" = yes; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
|
||||
enablestring=
|
||||
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-slider" >&5
|
||||
echo $ECHO_N "checking for --${enablestring:-enable}-slider... $ECHO_C" >&6
|
||||
@@ -29764,7 +29810,7 @@ _ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <X11/Intrinsic.h>
|
||||
#include <X11/Xlib.h>
|
||||
_ACEOF
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
||||
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
||||
@@ -29791,7 +29837,7 @@ else
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
for ac_dir in $ac_x_header_dirs; do
|
||||
if test -r "$ac_dir/X11/Intrinsic.h"; then
|
||||
if test -r "$ac_dir/X11/Xlib.h"; then
|
||||
ac_x_includes=$ac_dir
|
||||
break
|
||||
fi
|
||||
@@ -29805,18 +29851,18 @@ if test "$ac_x_libraries" = no; then
|
||||
# See if we find them without any special options.
|
||||
# Don't add to $LIBS permanently.
|
||||
ac_save_LIBS=$LIBS
|
||||
LIBS="-lXt $LIBS"
|
||||
LIBS="-lX11 $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <X11/Intrinsic.h>
|
||||
#include <X11/Xlib.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
XtMalloc (0)
|
||||
XrmInitialize ()
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
@@ -29854,7 +29900,7 @@ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
|
||||
do
|
||||
# Don't even attempt the hair of trying to link an X program!
|
||||
for ac_extension in a so sl; do
|
||||
if test -r $ac_dir/libXt.$ac_extension; then
|
||||
if test -r $ac_dir/libX11.$ac_extension; then
|
||||
ac_x_libraries=$ac_dir
|
||||
break 2
|
||||
fi
|
||||
@@ -35852,7 +35898,7 @@ cat >>conftest.$ac_ext <<_ACEOF
|
||||
int main (void)
|
||||
{
|
||||
char buffer[128];
|
||||
snprintf (buffer, 128, "%2\$d %3\$d %1\$d", 1, 2, 3);
|
||||
snprintf (buffer, 128, "%2$d %3$d %1$d", 1, 2, 3);
|
||||
if (strcmp ("2 3 1", buffer) == 0)
|
||||
exit (0);
|
||||
exit (1);
|
||||
@@ -46017,9 +46063,9 @@ _ACEOF
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DATAOBJ" = "yes"; then
|
||||
if test "$wxUSE_MGL" = 1; then
|
||||
{ echo "$as_me:$LINENO: WARNING: wxDataObject not yet supported under MGL... disabled" >&5
|
||||
echo "$as_me: WARNING: wxDataObject not yet supported under MGL... disabled" >&2;}
|
||||
if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
|
||||
{ echo "$as_me:$LINENO: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&5
|
||||
echo "$as_me: WARNING: wxDataObject not yet supported under $TOOLKIT... disabled" >&2;}
|
||||
wxUSE_DATAOBJ=no
|
||||
else
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
@@ -46035,9 +46081,9 @@ echo "$as_me: WARNING: Clipboard and drag-and-drop require wxDataObject -- disab
|
||||
fi
|
||||
|
||||
if test "$wxUSE_CLIPBOARD" = "yes"; then
|
||||
if test "$wxUSE_MGL" = 1; then
|
||||
{ echo "$as_me:$LINENO: WARNING: Clipboard not yet supported under MGL... disabled" >&5
|
||||
echo "$as_me: WARNING: Clipboard not yet supported under MGL... disabled" >&2;}
|
||||
if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
|
||||
{ echo "$as_me:$LINENO: WARNING: Clipboard not yet supported under $TOOLKIT... disabled" >&5
|
||||
echo "$as_me: WARNING: Clipboard not yet supported under $TOOLKIT... disabled" >&2;}
|
||||
wxUSE_CLIPBOARD=no
|
||||
fi
|
||||
|
||||
@@ -46058,21 +46104,10 @@ echo "$as_me: WARNING: Drag and drop is only supported under GTK+ 1.2... disable
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MOTIF" = 1; then
|
||||
{ echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under Motif... disabled" >&5
|
||||
echo "$as_me: WARNING: Drag and drop not yet supported under Motif... disabled" >&2;}
|
||||
wxUSE_DRAG_AND_DROP=no
|
||||
fi
|
||||
|
||||
if test "$wxUSE_X11" = 1; then
|
||||
{ echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under X11... disabled" >&5
|
||||
echo "$as_me: WARNING: Drag and drop not yet supported under X11... disabled" >&2;}
|
||||
wxUSE_DRAG_AND_DROP=no
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MGL" = 1; then
|
||||
{ echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under MGL... disabled" >&5
|
||||
echo "$as_me: WARNING: Drag and drop not yet supported under MGL... disabled" >&2;}
|
||||
if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_MGL" = 1 -o \
|
||||
"$wxUSE_DFB" = 1; then
|
||||
{ echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&5
|
||||
echo "$as_me: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&2;}
|
||||
wxUSE_DRAG_AND_DROP=no
|
||||
fi
|
||||
|
||||
@@ -46259,11 +46294,17 @@ _ACEOF
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DISPLAY" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
if test "$wxUSE_DFB" = 1 -o "$wxUSE_MGL" = 1; then
|
||||
{ echo "$as_me:$LINENO: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >&5
|
||||
echo "$as_me: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" >&2;}
|
||||
wxUSE_DISPLAY=no
|
||||
else
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_DISPLAY 1
|
||||
_ACEOF
|
||||
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon"
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon"
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DETECT_SM" = "yes"; then
|
||||
@@ -46405,6 +46446,14 @@ _ACEOF
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_SEARCHCTRL" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_SEARCHCTRL 1
|
||||
_ACEOF
|
||||
|
||||
USES_CONTROLS=1
|
||||
fi
|
||||
|
||||
if test "$wxUSE_SLIDER" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_SLIDER 1
|
||||
@@ -46698,7 +46747,10 @@ _ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <Carbon/Carbon.h>
|
||||
|
||||
#include <Carbon/Carbon.h>
|
||||
#include <WebKit/WebKit.h>
|
||||
|
||||
|
||||
#include <WebKit/HIWebView.h>
|
||||
_ACEOF
|
||||
@@ -46839,10 +46891,16 @@ _ACEOF
|
||||
fi
|
||||
|
||||
if test "$wxUSE_PALETTE" = "yes" ; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
if test "$wxUSE_DFB" = 1; then
|
||||
{ echo "$as_me:$LINENO: WARNING: wxPalette not yet supported under DFB... disabled" >&5
|
||||
echo "$as_me: WARNING: wxPalette not yet supported under DFB... disabled" >&2;}
|
||||
wxUSE_PALETTE=no
|
||||
else
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_PALETTE 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then
|
||||
@@ -51384,7 +51442,7 @@ _ASBOX
|
||||
} >&5
|
||||
cat >&5 <<_CSEOF
|
||||
|
||||
This file was extended by wxWidgets $as_me 2.8.0, which was
|
||||
This file was extended by wxWidgets $as_me 2.8.1, which was
|
||||
generated by GNU Autoconf 2.59. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@@ -51447,7 +51505,7 @@ _ACEOF
|
||||
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
ac_cs_version="\\
|
||||
wxWidgets config.status 2.8.0
|
||||
wxWidgets config.status 2.8.1
|
||||
configured by $0, generated by GNU Autoconf 2.59,
|
||||
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
|
77
configure.in
77
configure.in
@@ -17,7 +17,7 @@ dnl ---------------------------------------------------------------------------
|
||||
dnl initialization
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
AC_INIT([wxWidgets], [2.8.0], [wx-dev@lists.wxwidgets.org])
|
||||
AC_INIT([wxWidgets], [2.8.1], [wx-dev@lists.wxwidgets.org])
|
||||
|
||||
dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
|
||||
AC_CONFIG_SRCDIR([wx-config.in])
|
||||
@@ -34,8 +34,8 @@ dnl wx_release_number += 1
|
||||
|
||||
wx_major_version_number=2
|
||||
wx_minor_version_number=8
|
||||
wx_release_number=0
|
||||
wx_subrelease_number=0
|
||||
wx_release_number=1
|
||||
wx_subrelease_number=1
|
||||
|
||||
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
|
||||
WX_VERSION=$WX_RELEASE.$wx_release_number
|
||||
@@ -552,6 +552,7 @@ if test $DEBUG_CONFIGURE = 1; then
|
||||
DEFAULT_wxUSE_RADIOBTN=no
|
||||
DEFAULT_wxUSE_SASH=no
|
||||
DEFAULT_wxUSE_SCROLLBAR=no
|
||||
DEFAULT_wxUSE_SEARCHCTRL=no
|
||||
DEFAULT_wxUSE_SLIDER=no
|
||||
DEFAULT_wxUSE_SPINBTN=no
|
||||
DEFAULT_wxUSE_SPINCTRL=no
|
||||
@@ -775,6 +776,7 @@ else
|
||||
DEFAULT_wxUSE_RADIOBTN=yes
|
||||
DEFAULT_wxUSE_SASH=yes
|
||||
DEFAULT_wxUSE_SCROLLBAR=yes
|
||||
DEFAULT_wxUSE_SEARCHCTRL=yes
|
||||
DEFAULT_wxUSE_SLIDER=yes
|
||||
DEFAULT_wxUSE_SPINBTN=yes
|
||||
DEFAULT_wxUSE_SPINCTRL=yes
|
||||
@@ -1107,6 +1109,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then
|
||||
DEFAULT_wxUSE_RADIOBTN=yes
|
||||
DEFAULT_wxUSE_SASH=yes
|
||||
DEFAULT_wxUSE_SCROLLBAR=yes
|
||||
DEFAULT_wxUSE_SEARCHCTRL=yes
|
||||
DEFAULT_wxUSE_SLIDER=yes
|
||||
DEFAULT_wxUSE_SPINBTN=yes
|
||||
DEFAULT_wxUSE_SPINCTRL=yes
|
||||
@@ -1159,6 +1162,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then
|
||||
DEFAULT_wxUSE_RADIOBTN=no
|
||||
DEFAULT_wxUSE_SASH=no
|
||||
DEFAULT_wxUSE_SCROLLBAR=no
|
||||
DEFAULT_wxUSE_SEARCHCTRL=no
|
||||
DEFAULT_wxUSE_SLIDER=no
|
||||
DEFAULT_wxUSE_SPINBTN=no
|
||||
DEFAULT_wxUSE_SPINCTRL=no
|
||||
@@ -1214,6 +1218,7 @@ WX_ARG_ENABLE(radiobox, [ --enable-radiobox use wxRadioBox class], wxU
|
||||
WX_ARG_ENABLE(radiobtn, [ --enable-radiobtn use wxRadioButton class], wxUSE_RADIOBTN)
|
||||
WX_ARG_ENABLE(sash, [ --enable-sash use wxSashWindow class], wxUSE_SASH)
|
||||
WX_ARG_ENABLE(scrollbar, [ --enable-scrollbar use wxScrollBar class and scrollable windows], wxUSE_SCROLLBAR)
|
||||
WX_ARG_ENABLE(searchctrl, [ --enable-searchctrl use wxSearchCtrl class], wxUSE_SEARCHCTRL)
|
||||
WX_ARG_ENABLE(slider, [ --enable-slider use wxSlider class], wxUSE_SLIDER)
|
||||
WX_ARG_ENABLE(spinbtn, [ --enable-spinbtn use wxSpinButton class], wxUSE_SPINBTN)
|
||||
WX_ARG_ENABLE(spinctrl, [ --enable-spinctrl use wxSpinCtrl class], wxUSE_SPINCTRL)
|
||||
@@ -2540,11 +2545,16 @@ fi
|
||||
|
||||
dnl check for C99 string to long long conversion functions, assume that if we
|
||||
dnl have the unsigned variants, then we have the signed ones as well
|
||||
dnl
|
||||
dnl at least under SGI these functions are only available in C99 code and not
|
||||
dnl in C++ so do these tests using C++ compiler
|
||||
AC_LANG_PUSH(C++)
|
||||
if test "wxUSE_UNICODE" = "yes"; then
|
||||
WX_CHECK_FUNCS(wcstoull)
|
||||
else
|
||||
WX_CHECK_FUNCS(strtoull)
|
||||
fi
|
||||
AC_LANG_POP()
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Optional libraries
|
||||
@@ -3199,12 +3209,12 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
|
||||
|
||||
dnl test for XIM support in libgdk
|
||||
AC_CHECK_LIB(gdk, gdk_im_open, AC_DEFINE(HAVE_XIM))
|
||||
fi
|
||||
|
||||
dnl we need poll() in src/gtk/app.cpp (we know that Darwin doesn't
|
||||
dnl have it but we do the check for the others)
|
||||
if test "$USE_DARWIN" != 1; then
|
||||
AC_CHECK_FUNCS(poll)
|
||||
dnl we need poll() in src/gtk1/app.cpp (we know that Darwin doesn't
|
||||
dnl have it but we do the check for the others)
|
||||
if test "$USE_DARWIN" != 1; then
|
||||
AC_CHECK_FUNCS(poll)
|
||||
fi
|
||||
fi
|
||||
|
||||
TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
|
||||
@@ -4552,7 +4562,7 @@ if test "$ac_cv_func_snprintf" = "yes"; then
|
||||
int main (void)
|
||||
{
|
||||
char buffer[128];
|
||||
snprintf (buffer, 128, "%2\$d %3\$d %1\$d", 1, 2, 3);
|
||||
snprintf (buffer, 128, "%2$d %3$d %1$d", 1, 2, 3);
|
||||
if (strcmp ("2 3 1", buffer) == 0)
|
||||
exit (0);
|
||||
exit (1);
|
||||
@@ -6614,8 +6624,8 @@ if test "$wxUSE_IPC" = "yes"; then
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DATAOBJ" = "yes"; then
|
||||
if test "$wxUSE_MGL" = 1; then
|
||||
AC_MSG_WARN([wxDataObject not yet supported under MGL... disabled])
|
||||
if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
|
||||
AC_MSG_WARN([wxDataObject not yet supported under $TOOLKIT... disabled])
|
||||
wxUSE_DATAOBJ=no
|
||||
else
|
||||
AC_DEFINE(wxUSE_DATAOBJ)
|
||||
@@ -6627,8 +6637,8 @@ else
|
||||
fi
|
||||
|
||||
if test "$wxUSE_CLIPBOARD" = "yes"; then
|
||||
if test "$wxUSE_MGL" = 1; then
|
||||
AC_MSG_WARN([Clipboard not yet supported under MGL... disabled])
|
||||
if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then
|
||||
AC_MSG_WARN([Clipboard not yet supported under $TOOLKIT... disabled])
|
||||
wxUSE_CLIPBOARD=no
|
||||
fi
|
||||
|
||||
@@ -6645,18 +6655,9 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MOTIF" = 1; then
|
||||
AC_MSG_WARN([Drag and drop not yet supported under Motif... disabled])
|
||||
wxUSE_DRAG_AND_DROP=no
|
||||
fi
|
||||
|
||||
if test "$wxUSE_X11" = 1; then
|
||||
AC_MSG_WARN([Drag and drop not yet supported under X11... disabled])
|
||||
wxUSE_DRAG_AND_DROP=no
|
||||
fi
|
||||
|
||||
if test "$wxUSE_MGL" = 1; then
|
||||
AC_MSG_WARN([Drag and drop not yet supported under MGL... disabled])
|
||||
if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_MGL" = 1 -o \
|
||||
"$wxUSE_DFB" = 1; then
|
||||
AC_MSG_WARN([Drag and drop not yet supported under $TOOLKIT... disabled])
|
||||
wxUSE_DRAG_AND_DROP=no
|
||||
fi
|
||||
|
||||
@@ -6783,8 +6784,13 @@ if test "$wxUSE_FONTPICKERCTRL" = "yes"; then
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DISPLAY" = "yes"; then
|
||||
AC_DEFINE(wxUSE_DISPLAY)
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon"
|
||||
if test "$wxUSE_DFB" = 1 -o "$wxUSE_MGL" = 1; then
|
||||
AC_MSG_WARN([wxDisplay not yet supported under $TOOLKIT... disabled])
|
||||
wxUSE_DISPLAY=no
|
||||
else
|
||||
AC_DEFINE(wxUSE_DISPLAY)
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon"
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_DETECT_SM" = "yes"; then
|
||||
@@ -6882,6 +6888,11 @@ if test "$wxUSE_SCROLLBAR" = "yes"; then
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
|
||||
fi
|
||||
|
||||
if test "$wxUSE_SEARCHCTRL" = "yes"; then
|
||||
AC_DEFINE(wxUSE_SEARCHCTRL)
|
||||
USES_CONTROLS=1
|
||||
fi
|
||||
|
||||
if test "$wxUSE_SLIDER" = "yes"; then
|
||||
AC_DEFINE(wxUSE_SLIDER)
|
||||
USES_CONTROLS=1
|
||||
@@ -7085,7 +7096,10 @@ if test "$wxUSE_WEBKIT" = "yes"; then
|
||||
AC_MSG_WARN([WebKit headers not found; disabling wxWebKit])
|
||||
wxUSE_WEBKIT=no
|
||||
],
|
||||
[#include <Carbon/Carbon.h>])
|
||||
[
|
||||
#include <Carbon/Carbon.h>
|
||||
#include <WebKit/WebKit.h>
|
||||
])
|
||||
CPPFLAGS="$old_CPPFLAGS"
|
||||
elif test "$wxUSE_COCOA" = 1; then
|
||||
AC_DEFINE(wxUSE_WEBKIT)
|
||||
@@ -7146,7 +7160,12 @@ if test "$wxUSE_VALIDATORS" = "yes"; then
|
||||
fi
|
||||
|
||||
if test "$wxUSE_PALETTE" = "yes" ; then
|
||||
AC_DEFINE(wxUSE_PALETTE)
|
||||
if test "$wxUSE_DFB" = 1; then
|
||||
AC_MSG_WARN([wxPalette not yet supported under DFB... disabled])
|
||||
wxUSE_PALETTE=no
|
||||
else
|
||||
AC_DEFINE(wxUSE_PALETTE)
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then
|
||||
|
@@ -887,9 +887,7 @@ void wxFrameLayout::DoSetBarState( cbBarInfo* pBar )
|
||||
pMiniFrm->Create( &GetParentFrame(), wxID_ANY, pBar->mName,
|
||||
wxPoint( 50,50 ),
|
||||
wxSize ( 0, 0 ),
|
||||
wxFRAME_FLOAT_ON_PARENT |
|
||||
wxNO_BORDER |
|
||||
wxFRAME_NO_TASKBAR
|
||||
wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT
|
||||
);
|
||||
|
||||
pMiniFrm->SetClient( pBar->mpBarWnd );
|
||||
|
@@ -791,9 +791,10 @@ public:
|
||||
wxSTCListBoxWin(wxWindow* parent, wxWindowID id, Point WXUNUSED(location)) :
|
||||
wxPopupWindow(parent, wxBORDER_NONE)
|
||||
{
|
||||
|
||||
SetBackgroundColour(*wxBLACK); // for our simple border
|
||||
|
||||
lv = new wxSTCListBox(parent, id, wxDefaultPosition, wxDefaultSize,
|
||||
lv = new wxSTCListBox(parent, id, wxPoint(-50,-50), wxDefaultSize,
|
||||
wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER | wxBORDER_NONE);
|
||||
lv->SetCursor(wxCursor(wxCURSOR_ARROW));
|
||||
lv->InsertColumn(0, wxEmptyString);
|
||||
@@ -897,17 +898,27 @@ END_EVENT_TABLE()
|
||||
|
||||
|
||||
|
||||
#else // wxUSE_POPUPWIN -----------------------------------
|
||||
#else // !wxUSE_POPUPWIN -----------------------------------
|
||||
|
||||
// A normal window to place the wxSTCListBox upon.
|
||||
class wxSTCListBoxWin : public wxWindow {
|
||||
// A normal window to place the wxSTCListBox upon, but make it behave as much
|
||||
// like a wxPopupWindow as possible
|
||||
class wxSTCListBoxWin : public wxFrame {
|
||||
private:
|
||||
wxListView* lv;
|
||||
CallBackAction doubleClickAction;
|
||||
void* doubleClickActionData;
|
||||
public:
|
||||
wxSTCListBoxWin(wxWindow* parent, wxWindowID id, Point location) :
|
||||
wxWindow(parent, id, wxPoint(location.x, location.y), wxSize(0,0), wxSIMPLE_BORDER )
|
||||
wxFrame(parent, id, wxEmptyString, wxPoint(location.x, location.y), wxSize(0,0),
|
||||
wxFRAME_NO_TASKBAR
|
||||
| wxFRAME_FLOAT_ON_PARENT
|
||||
#ifdef __WXMAC__
|
||||
| wxPOPUP_WINDOW
|
||||
| wxNO_BORDER
|
||||
#else
|
||||
| wxSIMPLE_BORDER
|
||||
#endif
|
||||
)
|
||||
{
|
||||
|
||||
lv = new wxSTCListBox(this, id, wxDefaultPosition, wxDefaultSize,
|
||||
@@ -921,14 +932,15 @@ public:
|
||||
lv->SetFocus();
|
||||
|
||||
Hide();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// On OSX and (possibly others) there can still be pending
|
||||
// messages/events for the list control when Scintilla wants to
|
||||
// close it, so do a pending delete of it instead of destroying
|
||||
// immediately.
|
||||
bool Destroy() {
|
||||
bool Destroy()
|
||||
{
|
||||
#ifdef __WXMAC__
|
||||
// The bottom edge of this window is not getting properly
|
||||
// refreshed upon deletion, so help it out...
|
||||
@@ -943,7 +955,8 @@ public:
|
||||
}
|
||||
|
||||
|
||||
int IconWidth() {
|
||||
int IconWidth()
|
||||
{
|
||||
wxImageList* il = lv->GetImageList(wxIMAGE_LIST_SMALL);
|
||||
if (il != NULL) {
|
||||
int w, h;
|
||||
@@ -954,18 +967,22 @@ public:
|
||||
}
|
||||
|
||||
|
||||
void SetDoubleClickAction(CallBackAction action, void *data) {
|
||||
void SetDoubleClickAction(CallBackAction action, void *data)
|
||||
{
|
||||
doubleClickAction = action;
|
||||
doubleClickActionData = data;
|
||||
}
|
||||
|
||||
|
||||
void OnFocus(wxFocusEvent& event) {
|
||||
void OnFocus(wxFocusEvent& event)
|
||||
{
|
||||
ActivateParent();
|
||||
GetParent()->SetFocus();
|
||||
event.Skip();
|
||||
}
|
||||
|
||||
void OnSize(wxSizeEvent& event) {
|
||||
void OnSize(wxSizeEvent& event)
|
||||
{
|
||||
// resize the child
|
||||
wxSize sz = GetClientSize();
|
||||
lv->SetSize(sz);
|
||||
@@ -976,15 +993,44 @@ public:
|
||||
event.Skip();
|
||||
}
|
||||
|
||||
void ActivateParent()
|
||||
{
|
||||
// Although we're a frame, we always want the parent to be active, so
|
||||
// raise it whenever we get shown, focused, etc.
|
||||
wxTopLevelWindow *frame = wxDynamicCast(
|
||||
wxGetTopLevelParent(GetParent()), wxTopLevelWindow);
|
||||
if (frame)
|
||||
frame->Raise();
|
||||
}
|
||||
|
||||
|
||||
virtual void DoSetSize(int x, int y,
|
||||
int width, int height,
|
||||
int sizeFlags = wxSIZE_AUTO)
|
||||
{
|
||||
// convert coords to screen coords since we're a top-level window
|
||||
if (x != wxDefaultCoord) {
|
||||
GetParent()->ClientToScreen(&x, NULL);
|
||||
}
|
||||
if (y != wxDefaultCoord) {
|
||||
GetParent()->ClientToScreen(NULL, &y);
|
||||
}
|
||||
wxFrame::DoSetSize(x, y, width, height, sizeFlags);
|
||||
}
|
||||
|
||||
virtual bool Show(bool show = true)
|
||||
{
|
||||
bool rv = wxFrame::Show(show);
|
||||
if (rv && show)
|
||||
ActivateParent();
|
||||
#ifdef __WXMAC__
|
||||
virtual bool Show(bool show = true) {
|
||||
bool rv = wxWindow::Show(show);
|
||||
GetParent()->Refresh(false);
|
||||
#endif
|
||||
return rv;
|
||||
}
|
||||
#endif
|
||||
|
||||
void OnActivate(wxListEvent& WXUNUSED(event)) {
|
||||
void OnActivate(wxListEvent& WXUNUSED(event))
|
||||
{
|
||||
doubleClickAction(doubleClickActionData);
|
||||
}
|
||||
|
||||
@@ -1193,7 +1239,7 @@ void ListBoxImpl::Select(int n) {
|
||||
n = 0;
|
||||
select = false;
|
||||
}
|
||||
GETLB(id)->Focus(n);
|
||||
GETLB(id)->EnsureVisible(n);
|
||||
GETLB(id)->Select(n, select);
|
||||
}
|
||||
|
||||
|
@@ -87,7 +87,7 @@ void wxSTCDropTarget::OnLeave() {
|
||||
#define wxSTCCallTipBase wxPopupWindow
|
||||
#define param2 wxBORDER_NONE // popup's 2nd param is flags
|
||||
#else
|
||||
#define wxSTCCallTipBase wxWindow
|
||||
#define wxSTCCallTipBase wxFrame
|
||||
#define param2 -1 // wxWindow's 2nd param is ID
|
||||
#endif
|
||||
|
||||
@@ -95,8 +95,19 @@ void wxSTCDropTarget::OnLeave() {
|
||||
|
||||
class wxSTCCallTip : public wxSTCCallTipBase {
|
||||
public:
|
||||
wxSTCCallTip(wxWindow* parent, CallTip* ct, ScintillaWX* swx)
|
||||
: wxSTCCallTipBase(parent, param2),
|
||||
wxSTCCallTip(wxWindow* parent, CallTip* ct, ScintillaWX* swx) :
|
||||
#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
|
||||
wxSTCCallTipBase(parent, wxBORDER_NONE),
|
||||
#else
|
||||
wxSTCCallTipBase(parent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize,
|
||||
wxFRAME_NO_TASKBAR
|
||||
| wxFRAME_FLOAT_ON_PARENT
|
||||
| wxBORDER_NONE
|
||||
#ifdef __WXMAC__
|
||||
| wxPOPUP_WINDOW
|
||||
#endif
|
||||
),
|
||||
#endif
|
||||
m_ct(ct), m_swx(swx), m_cx(wxDefaultCoord), m_cy(wxDefaultCoord)
|
||||
{
|
||||
}
|
||||
@@ -112,7 +123,8 @@ public:
|
||||
|
||||
bool AcceptsFocus() const { return false; }
|
||||
|
||||
void OnPaint(wxPaintEvent& WXUNUSED(evt)) {
|
||||
void OnPaint(wxPaintEvent& WXUNUSED(evt))
|
||||
{
|
||||
wxBufferedPaintDC dc(this);
|
||||
Surface* surfaceWindow = Surface::Allocate();
|
||||
surfaceWindow->Init(&dc, m_ct->wDraw.GetID());
|
||||
@@ -121,22 +133,25 @@ public:
|
||||
delete surfaceWindow;
|
||||
}
|
||||
|
||||
void OnFocus(wxFocusEvent& event) {
|
||||
void OnFocus(wxFocusEvent& event)
|
||||
{
|
||||
GetParent()->SetFocus();
|
||||
event.Skip();
|
||||
}
|
||||
|
||||
void OnLeftDown(wxMouseEvent& event) {
|
||||
void OnLeftDown(wxMouseEvent& event)
|
||||
{
|
||||
wxPoint pt = event.GetPosition();
|
||||
Point p(pt.x, pt.y);
|
||||
m_ct->MouseClick(p);
|
||||
m_swx->CallTipClick();
|
||||
}
|
||||
|
||||
#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
|
||||
virtual void DoSetSize(int x, int y,
|
||||
int width, int height,
|
||||
int sizeFlags = wxSIZE_AUTO) {
|
||||
int sizeFlags = wxSIZE_AUTO)
|
||||
{
|
||||
// convert coords to screen coords since we're a top-level window
|
||||
if (x != wxDefaultCoord) {
|
||||
m_cx = x;
|
||||
GetParent()->ClientToScreen(&x, NULL);
|
||||
@@ -147,9 +162,27 @@ public:
|
||||
}
|
||||
wxSTCCallTipBase::DoSetSize(x, y, width, height, sizeFlags);
|
||||
}
|
||||
#endif
|
||||
|
||||
wxPoint GetMyPosition() {
|
||||
#if wxUSE_POPUPWIN && wxSTC_USE_POPUP
|
||||
#else
|
||||
virtual bool Show( bool show = true )
|
||||
{
|
||||
// Although we're a frame, we always want the parent to be active, so
|
||||
// raise it whenever we get shown.
|
||||
bool rv = wxSTCCallTipBase::Show(show);
|
||||
if (rv && show)
|
||||
{
|
||||
wxTopLevelWindow *frame = wxDynamicCast(
|
||||
wxGetTopLevelParent(GetParent()), wxTopLevelWindow);
|
||||
if (frame)
|
||||
frame->Raise();
|
||||
}
|
||||
return rv;
|
||||
}
|
||||
#endif
|
||||
|
||||
wxPoint GetMyPosition()
|
||||
{
|
||||
return wxPoint(m_cx, m_cy);
|
||||
}
|
||||
|
||||
|
8
debian/README.HowToBuild.txt
vendored
8
debian/README.HowToBuild.txt
vendored
@@ -149,6 +149,14 @@ When finished the binary and source packages will be left in the
|
||||
parent dir of the source tree.
|
||||
|
||||
|
||||
Automating the process
|
||||
----------------------
|
||||
|
||||
The script debian/build_all automates the above stepds and builds both
|
||||
wxWidgets and wxPython packages in both ANSI and Unicode modes. You should do
|
||||
the build manually at least the first time however to make sure you have all
|
||||
the prerequisites and the build doesn't fail.
|
||||
|
||||
|
||||
Other Sources of Information
|
||||
----------------------------
|
||||
|
49
debian/build_all
vendored
Executable file
49
debian/build_all
vendored
Executable file
@@ -0,0 +1,49 @@
|
||||
#!/bin/sh
|
||||
##############################################################################
|
||||
# Name: debian/build_all
|
||||
# Purpose: build both ANSI and Unicode Debian packages at once
|
||||
# Created: 2006-12-13
|
||||
# RCS-ID: $Id$
|
||||
# Copyright: (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
|
||||
# Licence: wxWindows licence
|
||||
##############################################################################
|
||||
|
||||
# The following variables may be defined:
|
||||
# wx The wxWidgets root directory (if it's unset you have to run the
|
||||
# script from this directory)
|
||||
# debsrc_dir If set, suppose there are already debian sources in this dir
|
||||
|
||||
set -e
|
||||
wx_dir=${wx-`pwd`}
|
||||
if [ ! -f $wx_dir/debian/build_all ]; then
|
||||
echo "Please run the script from the root wx directory" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
(
|
||||
if [ -z $debsrc_dir ]; then
|
||||
configure_dir=/tmp/wxtmp-$$
|
||||
|
||||
mkdir $configure_dir
|
||||
cd $configure_dir
|
||||
$wx_dir/configure --without-subdirs > /dev/null
|
||||
make debian-dist > /dev/null
|
||||
debsrc_dir=`grep 'DEBIAN_SOURCE_DIR =' Makefile | sed 's@.*/@@'`
|
||||
cd ..
|
||||
rm -rf $configure_dir
|
||||
fi
|
||||
|
||||
cd $wx_dir/../$debsrc_dir
|
||||
./debian/rules debian/control
|
||||
dpkg-buildpackage -rfakeroot > /dev/null
|
||||
|
||||
fakeroot ./debian/rules clean
|
||||
|
||||
sed -i '/^WX_UNICODE := /s/1/0/' debian/rules
|
||||
rm debian/control
|
||||
./debian/rules debian/control
|
||||
dpkg-buildpackage -rfakeroot > /dev/null
|
||||
|
||||
fakeroot ./debian/rules clean
|
||||
|
||||
) 2>&1 | tee $wx_dir/debian/build.log
|
33
debian/changelog
vendored
33
debian/changelog
vendored
@@ -1,3 +1,34 @@
|
||||
wxwidgets2.8 (2.8.1.1-0) unstable; urgency=low
|
||||
|
||||
* Fix compilation with wxUSE_STL=1
|
||||
* wxGrid::GetBestSize() returns same size the grid would have after AutoSize()
|
||||
* Added wxTreeCtrl::CollapseAll[Children]() and IsEmpty() (Francesco Montorsi)
|
||||
* Several RTL-related positioning fixes (Diaa Sami)
|
||||
* Fix wxConfig::DeleteGroup() for arguments with trailing slash (David Hart)
|
||||
* Fix memory leak in wxGrid::ShowCellEditControl() (Christian Sturmlechner)
|
||||
* Don't crash if command line is not valid UTF-8 (Unicode build only)
|
||||
* Added wxSizerFlags::Shaped() and FixedMinSize() methods
|
||||
* Added wxCSConv::IsOk() (Manuel Martin)
|
||||
* Added wxDateTime::GetDateOnly()
|
||||
* Made wxTextFile work with unseekable files again (David Hart)
|
||||
* Added wxCONFIG_USE_SUBDIR flag to wxFileConfig (Giuseppe Bilotta)
|
||||
* Added wxSearchCtrl::[Get|Set]DescriptiveText
|
||||
|
||||
-- Robin Dunn <robin@alldunn.com> Fri, 19 Jan 2007 12:02:52 -0800
|
||||
|
||||
wxwidgets2.8 (2.8.0.1-1) unstable; urgency=low
|
||||
|
||||
* No changes, just a different packager
|
||||
|
||||
-- Vadim Zeitlin <vadim@wxwindows.org> Dec, 13 Wed 2006 17:40:24 +0100
|
||||
|
||||
wxwidgets2.8 (2.8.0.1-0) unstable; urgency=low
|
||||
|
||||
* Add wxSearchCtrl
|
||||
* Official wxPython release
|
||||
|
||||
-- Robin Dunn <robin@alldunn.com> Mon, 11 Dec 2006 18:50:29 -0800
|
||||
|
||||
wxwidgets2.8 (2.8.0.0-0rc3) unstable; urgency=low
|
||||
|
||||
* wxFileSystem::OpenFile() takes wxFS_SEEKABLE by default now.
|
||||
@@ -45,7 +76,7 @@ wxwidgets2.7 (2.7.1.2-0) unstable; urgency=low
|
||||
wxwidgets2.7 (2.7.1.1-0) unstable; urgency=low
|
||||
|
||||
* First 2.7.x release from wxPython team.
|
||||
* Many enhancements, changes, fixes and updates. See
|
||||
* Many enhancements, changes, fixes and updates. See
|
||||
http://wxpython.org/CHANGES.txt for details.
|
||||
|
||||
-- Robin Dunn <robin@alldunn.com> Wed, 18 Oct 2006 17:09:53 -0700
|
||||
|
5
debian/wx-config.1
vendored
5
debian/wx-config.1
vendored
@@ -70,6 +70,11 @@ Output the wxWidgets version number in all its glory.
|
||||
.TP 15
|
||||
.B \-\-basename
|
||||
Output the base name of the wxWidgets libraries.
|
||||
.TP 15
|
||||
.B \-\-selected-config
|
||||
Output the signature of the selected wxWidgets library.
|
||||
This is a string of the form "port-unicode-release-version".
|
||||
|
||||
|
||||
.SS Feature options
|
||||
These options select features which determine which wxWidgets
|
||||
|
@@ -33,34 +33,6 @@
|
||||
|
||||
ScoreFile::ScoreFile(const wxString& appName)
|
||||
{
|
||||
#if 0
|
||||
wxString filename;
|
||||
m_configFilename << "/usr/local/share/" << appName << ".scores";
|
||||
if (access(m_configFilename, F_OK) == 0)
|
||||
{
|
||||
if (access(m_configFilename, R_OK | W_OK) != 0)
|
||||
{
|
||||
// file is not r/w - use local file instead
|
||||
m_configFilename = wxFileConfig::GetLocalFileName(appName);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
int fd = creat(m_configFilename, 0666);
|
||||
|
||||
if (fd < 0)
|
||||
{
|
||||
// failed to create file - use local file instead
|
||||
m_configFilename = wxFileConfig::GetLocalFileName(appName);
|
||||
}
|
||||
else
|
||||
{
|
||||
// ensure created file has rw-rw-rw permissions
|
||||
close(fd);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
m_config = new wxConfig(appName, _T("wxWidgets"), appName, wxEmptyString,
|
||||
wxCONFIG_USE_LOCAL_FILE); // only local
|
||||
}
|
||||
@@ -68,11 +40,6 @@ ScoreFile::ScoreFile(const wxString& appName)
|
||||
ScoreFile::~ScoreFile()
|
||||
{
|
||||
delete m_config;
|
||||
#ifdef __WXGTK__
|
||||
// ensure score file has rw-rw-rw permissions
|
||||
// (wxFileConfig sets them to rw-------)
|
||||
chmod(m_configFilename, 0666);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
@@ -17,7 +17,7 @@ DOCDIR=${WX_TEMP_DIR}/wxWidgets/docs/
|
||||
CURDATE=`date -I`
|
||||
|
||||
# build info
|
||||
BUILD_VERSION=2.8.0-rc1
|
||||
BUILD_VERSION=2.8.2
|
||||
BUILD_TAG=HEAD
|
||||
|
||||
|
||||
|
@@ -37,56 +37,60 @@ fi
|
||||
getfilelist(){
|
||||
port=$1
|
||||
outfile=$2
|
||||
|
||||
|
||||
filelist="base.rsp"
|
||||
contribfiles="stc.rsp contrib.rsp ogl.rsp"
|
||||
utilsfiles="tex2rtf.rsp utils.rsp utilmake.rsp"
|
||||
commonfiles="generic.rsp jpeg.rsp tiff.rsp xml.rsp deprecated.rsp makefile.rsp $utilsfiles $contribfiles"
|
||||
|
||||
|
||||
if [ ! $port = "base" ]; then
|
||||
filelist="$filelist $commonfiles"
|
||||
fi
|
||||
|
||||
filelist="$filelist $commonfiles"
|
||||
fi
|
||||
|
||||
if [ $port = "msw" ] || [ $port = "all" ]; then
|
||||
filelist="$filelist msw.rsp univ.rsp vc.rsp mmedia.rsp wince.rsp dmc.rsp"
|
||||
fi
|
||||
|
||||
|
||||
if [ $port = "os2" ] || [ $port = "all" ]; then
|
||||
filelist="$filelist os2.rsp"
|
||||
fi
|
||||
|
||||
|
||||
if [ $port = "x11" ] || [ $port = "all" ]; then
|
||||
filelist="$filelist x11.rsp"
|
||||
filelist="$filelist univ.rsp x11.rsp"
|
||||
fi
|
||||
|
||||
if [ $port = "mgl" ] || [ $port = "all" ]; then
|
||||
filelist="$filelist mgl.rsp"
|
||||
fi
|
||||
|
||||
if [ $port = "mgl" ] || [ $port = "all" ]; then
|
||||
filelist="$filelist mgl.rsp"
|
||||
if [ $port = "dfb" ] || [ $port = "all" ]; then
|
||||
filelist="$filelist dfb.rsp"
|
||||
fi
|
||||
|
||||
if [ $port = "gtk" ] || [ $port = "all" ]; then
|
||||
filelist="$filelist gtk.rsp"
|
||||
fi
|
||||
|
||||
|
||||
if [ $port = "motif" ] || [ $port = "all" ]; then
|
||||
filelist="$filelist motif.rsp"
|
||||
fi
|
||||
|
||||
|
||||
if [ $port = "mac" ] || [ $port = "all" ]; then
|
||||
filelist="$filelist mac.rsp cocoa.rsp"
|
||||
fi
|
||||
|
||||
|
||||
if [ $port = "all" ]; then
|
||||
filelist="$filelist gtk1.rsp palmos.rsp docsrc.rsp"
|
||||
fi
|
||||
|
||||
|
||||
tempfile="/tmp/wx$port.files.in"
|
||||
rm -f $outfile
|
||||
|
||||
|
||||
olddir=$PWD
|
||||
cd $MANIFESTDIR
|
||||
|
||||
|
||||
cat $filelist > $outfile
|
||||
|
||||
|
||||
cd $olddir
|
||||
}
|
||||
|
||||
@@ -94,12 +98,12 @@ copyfilelist(){
|
||||
FILELIST=$1
|
||||
APPDIR=$2
|
||||
DESTDIR=$3
|
||||
|
||||
|
||||
for line in `cat $FILELIST` ; do
|
||||
if [ "$line" != "" ]; then
|
||||
subdir=`dirname $line`
|
||||
mkdir -p $DESTDIR/$subdir
|
||||
cp -rf $APPDIR/$line $DESTDIR/$subdir
|
||||
cp -rf $APPDIR/$line $DESTDIR/$subdir
|
||||
fi
|
||||
done
|
||||
}
|
||||
@@ -113,7 +117,7 @@ doinit()
|
||||
|
||||
dospinport(){
|
||||
port=$1
|
||||
|
||||
|
||||
case "$port" in
|
||||
all)
|
||||
portname="Widgets";;
|
||||
@@ -124,17 +128,17 @@ dospinport(){
|
||||
mac)
|
||||
portname="Mac";;
|
||||
*)
|
||||
# for all the others (DFB, GTK, MGL, MSW, X11) just use the
|
||||
# for all the others (DFB, GTK, MGL, DFB, MSW, X11) just use the
|
||||
# upper-case version as they are abbreviations
|
||||
portname=`echo $port | tr '[a-z]' '[A-Z]'`;;
|
||||
esac
|
||||
|
||||
|
||||
echo "Creating wx$portname distribution..."
|
||||
|
||||
cd $APPDIR
|
||||
portfiles="/tmp/wx$port.files"
|
||||
getfilelist "$port" "$portfiles"
|
||||
|
||||
|
||||
TMPFILESDIR=/tmp/wx$port/wx$portname-$VERSION
|
||||
rm -rf $TMPFILESDIR
|
||||
mkdir -p $TMPFILESDIR
|
||||
@@ -164,7 +168,7 @@ dospinport(){
|
||||
popd
|
||||
rm -rf /tmp/wx$port
|
||||
rm ${portfiles}
|
||||
# rm /tmp/textfiles
|
||||
rm /tmp/textfiles
|
||||
}
|
||||
|
||||
prepareforrelease()
|
||||
@@ -174,7 +178,7 @@ prepareforrelease()
|
||||
cp $WEBFILES/site/faq*.htm $APPDIR/docs/html
|
||||
cp $WEBFILES/site/platform.htm $APPDIR/docs/html
|
||||
cp $WEBFILES/site/i18n.htm $APPDIR/docs/html
|
||||
|
||||
|
||||
echo Copying readme files...
|
||||
cp $APPDIR/docs/msw/readme.txt README-MSW.txt
|
||||
cp $APPDIR/docs/msw/install.txt INSTALL-MSW.txt
|
||||
@@ -186,6 +190,8 @@ prepareforrelease()
|
||||
|
||||
cp $APPDIR/docs/mgl/readme.txt $APPDIR/readme-mgl.txt
|
||||
cp $APPDIR/docs/mgl/install.txt $APPDIR/install-mgl.txt
|
||||
|
||||
cp $APPDIR/docs/dfb/install.txt $APPDIR/install-dfb.txt
|
||||
|
||||
cp $APPDIR/docs/x11/readme.txt $APPDIR/readme-x11.txt
|
||||
cp $APPDIR/docs/x11/install.txt $APPDIR/install-x11.txt
|
||||
@@ -201,7 +207,7 @@ prepareforrelease()
|
||||
|
||||
cp $APPDIR/docs/cocoa/readme.txt $APPDIR/readme-cocoa.txt
|
||||
cp $APPDIR/docs/cocoa/install.txt $APPDIR/install-cocoa.txt
|
||||
|
||||
|
||||
# Now delete a few files that are unnecessary
|
||||
rm -f BuildCVS.txt descrip.mms
|
||||
rm -f setup.h_vms
|
||||
@@ -210,16 +216,16 @@ prepareforrelease()
|
||||
rm -f src/mingegcs.bat
|
||||
# rm -f *.spec
|
||||
rm -f src/gtk/descrip.mms src/motif/descrip.mms
|
||||
|
||||
|
||||
# Copy setup0.h files to setup.h
|
||||
# OS/2 always built with configure now
|
||||
# cp $APPDIR/include/wx/os2/setup0.h $APPDIR/include/wx/os2/setup.h
|
||||
cp $APPDIR/include/wx/msw/setup0.h $APPDIR/include/wx/msw/setup.h
|
||||
cp $APPDIR/include/wx/univ/setup0.h $APPDIR/include/wx/univ/setup.h
|
||||
|
||||
|
||||
# Make MSW project files always have DOS line endings.
|
||||
unix2dos `cat $MANIFESTDIR/vc.rsp`
|
||||
|
||||
unix2dos `cat $MANIFESTDIR/vc.rsp`
|
||||
|
||||
popd
|
||||
}
|
||||
|
||||
@@ -280,11 +286,12 @@ fi
|
||||
|
||||
# Do wxAll spin
|
||||
if [ "$SPINWXALL" = "1" ] || [ "$SPINALL" = "1" ]; then
|
||||
dospinport "all"
|
||||
dospinport "all"
|
||||
fi
|
||||
|
||||
if [ "$SPINALL" = "1" ]; then
|
||||
dospinport "mgl"
|
||||
dospinport "dfb"
|
||||
dospinport "gtk"
|
||||
dospinport "x11"
|
||||
dospinport "motif"
|
||||
|
@@ -14,6 +14,17 @@ if [ $# != 1 ]; then
|
||||
exit 2
|
||||
fi
|
||||
|
||||
# don't do configure; config.sub; config.guess
|
||||
if [ `basename $1` = "configure" ] ; then
|
||||
exit 1
|
||||
fi
|
||||
if [ `basename $1` = "config.sub" ] ; then
|
||||
exit 1
|
||||
fi
|
||||
if [ `basename $1` = "config.guess" ] ; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
entries=`dirname $1`/CVS/Entries
|
||||
if [ ! -f $entries ]; then
|
||||
echo "CVS entries file \"$entries\" not found." >&2
|
||||
|
@@ -21,7 +21,6 @@ do_build
|
||||
make prefix=$INSTALLDIR install
|
||||
|
||||
if [ "$WXPYTHON" == "1" ]; then
|
||||
make -C contrib/src/animate prefix=$INSTALLDIR install
|
||||
make -C contrib/src/gizmos prefix=$INSTALLDIR install
|
||||
make -C contrib/src/stc prefix=$INSTALLDIR install
|
||||
fi
|
||||
|
6
distrib/scripts/manifests/dfb.rsp
Normal file
6
distrib/scripts/manifests/dfb.rsp
Normal file
@@ -0,0 +1,6 @@
|
||||
install-dfb.txt
|
||||
|
||||
include/wx/dfb/*.h
|
||||
include/wx/dfb/private/*.h
|
||||
src/dfb/*.cpp
|
||||
docs/dfb/*.txt
|
@@ -118,8 +118,6 @@ include/wx/richtext/*.h
|
||||
include/wx/aui/*.h
|
||||
lib/dummy
|
||||
|
||||
tools/gettext/*.*
|
||||
|
||||
utils/*.bkl
|
||||
utils/make*.*
|
||||
utils/configure
|
||||
|
@@ -3,6 +3,8 @@ readme-mac.txt
|
||||
|
||||
lib/dummy
|
||||
|
||||
distrib/mac/pbsetup-sh
|
||||
|
||||
docs/licence.txt
|
||||
docs/mac/*.txt
|
||||
docs/mac/*.hqx
|
||||
|
@@ -16,9 +16,6 @@ docs/wine/COPYING.LIB
|
||||
docs/microwin/readme.txt
|
||||
docs/microwin/microwindows.patches
|
||||
|
||||
tools/gettext/*.exe
|
||||
tools/gettext/*.sed
|
||||
|
||||
src/cwcopysetup.bat
|
||||
src/cwdcopysetup.bat
|
||||
src/common/*.rc
|
||||
|
@@ -125,8 +125,6 @@ include/wx/html/msw/*.ico
|
||||
include/wx/html/msw/*.rc
|
||||
lib/dummy
|
||||
|
||||
tools/gettext/*.*
|
||||
|
||||
bitmaps/xpm/16x16/*.*
|
||||
bitmaps/xpm/32x32/*.*
|
||||
bitmaps/xpm/64x64/*.*
|
||||
|
@@ -1,3 +1,5 @@
|
||||
include/msvc/wx/setup.h
|
||||
|
||||
build/msw/*.dsp
|
||||
build/msw/*.dsw
|
||||
|
||||
|
@@ -21,13 +21,6 @@ docs/x11/makewxx11
|
||||
|
||||
lib/dummy
|
||||
|
||||
mobile/configure
|
||||
mobile/configure.in
|
||||
mobile/Makefile.in
|
||||
mobile/wxedit/Makefile.in
|
||||
mobile/wxedit/*.cpp
|
||||
mobile/wxedit/*.h
|
||||
|
||||
misc/afm/*.afm
|
||||
misc/gs_afm/*.afm
|
||||
|
||||
|
@@ -42,7 +42,7 @@ else
|
||||
cvs update -d -P
|
||||
fi
|
||||
#copy setup0.h setup.h for msw
|
||||
find . -name setup.h | xargs rm -rf
|
||||
rm include/wx/msw/setup.h
|
||||
cp include/wx/msw/setup0.h include/wx/msw/setup.h
|
||||
|
||||
# this is where we will store the wxAll tarball we create
|
||||
@@ -131,7 +131,7 @@ else
|
||||
cp $g $START_DIR/$DIST_DIR/readme-`echo $g | sed -e "s|${DOCDIR}||g" | sed -e "s|msw/wince|wince|g" | sed -e "s|/readme.txt||g"`-${BUILD_VERSION}.txt
|
||||
done
|
||||
# Rename double readme
|
||||
mv $START_DIR/$DIST_DIR/readme-readme-${BUILD_VERSION}.txt $START_DIR/$DIST_DIR/readme-${BUILD_VERSION}.txt
|
||||
mv $START_DIR/$DIST_DIR/readme-readme.txt-${BUILD_VERSION}.txt $START_DIR/$DIST_DIR/readme-${BUILD_VERSION}.txt
|
||||
## copy files ...
|
||||
mkdir ${FTPDIR}/
|
||||
cp $START_DIR/$DIST_DIR/* ${FTPDIR}/
|
||||
|
@@ -52,6 +52,8 @@ docopydocs()
|
||||
|
||||
cp $APPDIR/docs/mgl/readme.txt $DESTDIR/readme-mgl-$VERSION.txt
|
||||
cp $APPDIR/docs/mgl/install.txt $DESTDIR/install-mgl-$VERSION.txt
|
||||
|
||||
cp $APPDIR/docs/dfb/install.txt $DESTDIR/install-dfb-$VERSION.txt
|
||||
|
||||
cp $APPDIR/docs/cocoa/readme.txt $DESTDIR/readme-cocoa-$VERSION.txt
|
||||
cp $APPDIR/docs/cocoa/install.txt $DESTDIR/install-cocoa-$VERSION.txt
|
||||
@@ -64,4 +66,4 @@ docopydocs()
|
||||
|
||||
cp $APPDIR/docs/readme_vms.txt $DESTDIR/readme-vms-$VERSION.txt
|
||||
|
||||
}
|
||||
}
|
||||
|
@@ -68,7 +68,8 @@ Deprecated methods since 2.6.x and their replacements
|
||||
wxFS_SEEKABLE flags is deprecated. You can still seek, but use the flag.
|
||||
- Constructor wxZipInputStream(const wxString& archive, const wxString& file)
|
||||
deprecated in favour of wxFileSystem (other zip ctors are not deprecated).
|
||||
|
||||
- wx{Dir|File}Dialog::{Set|Get}Style deprecated in favour of the generic
|
||||
wxWindow::{Set|Get}WindowStyle()
|
||||
|
||||
|
||||
Major new features in 2.8 release
|
||||
@@ -84,7 +85,55 @@ Major new features in 2.8 release
|
||||
- Further functionality including wxAnimationCtrl (moved from contrib/src/anim
|
||||
and enhanced), wxSimpleHtmlListBox, wxHyperlinkCtrl, wxColourPickerCtrl,
|
||||
wxDirPickerCtrl, wxFilePickerCtrl, wxFontPickerCtrl, wxCollapsiblePane,
|
||||
wxAboutBox, wxTreebook, tar streams.
|
||||
wxSearchCtrl, wxAboutBox, wxTreebook, tar streams.
|
||||
|
||||
|
||||
2.8.2
|
||||
-----
|
||||
|
||||
All:
|
||||
|
||||
- Added wxSizerFlags::Shaped() and FixedMinSize() methods
|
||||
- Added wxCSConv::IsOk() (Manuel Martin)
|
||||
- Added wxDateTime::GetDateOnly()
|
||||
- Made wxTextFile work with unseekable files again (David Hart)
|
||||
- Added wxCONFIG_USE_SUBDIR flag to wxFileConfig (Giuseppe Bilotta)
|
||||
- Added wxSearchCtrl::[Get|Set]DescriptiveText
|
||||
|
||||
wxMSW
|
||||
|
||||
- Fix lack of spin control update event when control lost focus
|
||||
- Corrected drawing of bitmaps for disabled menu items
|
||||
|
||||
wxMac
|
||||
|
||||
- Added support for the wxFRAME_FLOAT_ON_PARENT style
|
||||
|
||||
|
||||
2.8.1
|
||||
-----
|
||||
|
||||
All:
|
||||
|
||||
- Fix compilation with wxUSE_STL=1
|
||||
- wxGrid::GetBestSize() returns same size the grid would have after AutoSize()
|
||||
- Added wxTreeCtrl::CollapseAll[Children]() and IsEmpty() (Francesco Montorsi)
|
||||
- Several RTL-related positioning fixes (Diaa Sami)
|
||||
- Fix wxConfig::DeleteGroup() for arguments with trailing slash (David Hart)
|
||||
- Fix memory leak in wxGrid::ShowCellEditControl() (Christian Sturmlechner)
|
||||
|
||||
wxMSW:
|
||||
|
||||
- Fixed compilation with Borland C++ in Unicode mode but without MSLU
|
||||
- Show taskbar icon menu on right button release, not press
|
||||
|
||||
wxGTK:
|
||||
|
||||
- Don't crash if command line is not valid UTF-8 (Unicode build only)
|
||||
|
||||
wxUniv:
|
||||
|
||||
- It is now possible to set background colour of wxStaticText
|
||||
|
||||
|
||||
2.8.0
|
||||
@@ -92,6 +141,7 @@ Major new features in 2.8 release
|
||||
|
||||
All:
|
||||
|
||||
- Added wxSearchCtrl (Vince Harron)
|
||||
- wxCSConv("UTF-16/32") now behaves correctly, i.e. same as wxMBConvUTF16/32
|
||||
- wxArrayString::Alloc() now works as reserve() and doesn't clear array contents
|
||||
- Fixed long standing bug in wxFileConfig groups renaming (Antti Koivisto).
|
||||
@@ -125,7 +175,7 @@ All:
|
||||
- Added wxFilterFSHandler and wxArchiveFSHandler.
|
||||
- Added wxString::ToLongLong() and ToULongLong().
|
||||
|
||||
All (GUI):
|
||||
All (GUI):
|
||||
|
||||
- wxMemoryDC constructor now optionally accepts a wxBitmap parameter,
|
||||
calling SelectObject itself if a valid bitmap is passed.
|
||||
|
@@ -28,11 +28,7 @@ wxWidgets features that don't work in wxDFB yet:
|
||||
|
||||
$ ./configure --with-directfb \
|
||||
--with-themes=mono \
|
||||
--disable-sockets \
|
||||
--disable-accel \
|
||||
--disable-display \
|
||||
--disable-palette \
|
||||
--disable-dataobj \
|
||||
--disable-popupwin \
|
||||
--disable-help \
|
||||
--disable-combobox \
|
||||
|
@@ -1,5 +1,5 @@
|
||||
wxWidgets 2.8 for GTK+ installation
|
||||
-----------------------------------
|
||||
wxWidgets for GTK+ installation
|
||||
-------------------------------
|
||||
|
||||
IMPORTANT NOTE:
|
||||
|
||||
|
@@ -1,8 +1,7 @@
|
||||
Welcome to wxWidgets 2.8.0 for GTK+
|
||||
-----------------------------------
|
||||
Welcome to wxWidgets for GTK+
|
||||
-----------------------------
|
||||
|
||||
You have downloaded version 2.8 of the GTK+ port of the
|
||||
wxWidgets GUI library.
|
||||
You have downloaded the GTK+ port of the wxWidgets GUI library.
|
||||
|
||||
It is recommended to use at least GTK+ 2.2.3 to get the
|
||||
most out of wxWidgets and some features are only available
|
||||
|
@@ -30,7 +30,7 @@ No base class
|
||||
|
||||
\wxheading{See also}
|
||||
|
||||
\helpref{wxAuiManager}{wxauimanager},
|
||||
\helpref{wxAuiManager}{wxauimanager},
|
||||
\helpref{wxAuiPaneInfo}{wxauipaneinfo}
|
||||
|
||||
\wxheading{Data structures}
|
||||
|
@@ -125,7 +125,7 @@ enum wxAuiManagerOption
|
||||
|
||||
\func{}{wxAuiManager}{\param{wxWindow* }{managed\_wnd = NULL}, \param{unsigned int }{flags = wxAUI\_MGR\_DEFAULT}}
|
||||
|
||||
Constructor. \arg{frame} specifies the wxFrame which should be managed.
|
||||
Constructor. \arg{managed\_wnd} specifies the wxFrame which should be managed.
|
||||
\arg{flags} specifies options which allow the frame management behavior
|
||||
to be modified.
|
||||
|
||||
@@ -166,9 +166,11 @@ Returns the current art provider being used.
|
||||
|
||||
See also: \helpref{wxAuiDockArt}{wxauidockart}.
|
||||
|
||||
\membersection{wxAuiManager::GetDockSizeConstraint}\label{wxauimanagergetdocksizeconstraint}
|
||||
|
||||
\func{void}{GetDockSizeConstraint}{\param{double* }{widthpct}, \param{double* }{heightpct}}
|
||||
|
||||
Returns the current dock constraint values. See SetDockSizeConstraint() for more information.
|
||||
Returns the current dock constraint values. See \helpref{SetDockSizeConstraint()}{wxauimanagersetdocksizeconstraint} for more information.
|
||||
|
||||
\membersection{wxAuiManager::GetFlags}\label{wxauimanagergetflags}
|
||||
|
||||
@@ -182,6 +184,8 @@ Returns the current manager's flags.
|
||||
|
||||
Returns the frame currently being managed by wxAuiManager.
|
||||
|
||||
\membersection{wxAuiManager::GetManager}\label{wxauimanagergetmanager}
|
||||
|
||||
\func{static wxAuiManager*}{GetManager}{\param{wxWindow* }{window}}
|
||||
|
||||
Calling this method will return the wxAuiManager for a given window. The \arg{window} parameter should
|
||||
@@ -269,6 +273,8 @@ will be deleted by wxAuiManager.
|
||||
|
||||
See also: \helpref{wxAuiDockArt}{wxauidockart}.
|
||||
|
||||
\membersection{wxAuiManager::SetDockSizeConstraint}\label{wxauimanagersetdocksizeconstraint}
|
||||
|
||||
\func{void}{SetDockSizeConstraint}{\param{double }{widthpct}, \param{double }{heightpct}}
|
||||
|
||||
When a user creates a new dock by dragging a window into a docked position, often times the large size of the
|
||||
|
@@ -20,7 +20,7 @@ No base class
|
||||
|
||||
\wxheading{See also}
|
||||
|
||||
\helpref{wxAuiManager}{wxauimanager},
|
||||
\helpref{wxAuiManager}{wxauimanager},
|
||||
\helpref{wxAuiDockArt}{wxauidockart}
|
||||
|
||||
\wxheading{Data structures}
|
||||
@@ -55,15 +55,16 @@ Copy constructor.
|
||||
\membersection{wxAuiPaneInfo::BestSize}\label{wxauipaneinfobestsize}
|
||||
|
||||
\func{wxAuiPaneInfo\&}{BestSize}{\param{const wxSize\& }{size}}
|
||||
|
||||
\func{wxAuiPaneInfo\&}{BestSize}{\param{int }{x}, \param{int }{y}}
|
||||
|
||||
BestSize() sets the ideal size for the pane. The docking manager will attempt to use this size as much as possible when docking or floating the pane.
|
||||
BestSize() sets the ideal size for the pane. The docking manager will attempt to use this size as much as possible when docking or floating the pane.
|
||||
|
||||
\membersection{wxAuiPaneInfo::Bottom}\label{wxauipaneinfobottom}
|
||||
|
||||
\func{wxAuiPaneInfo\&}{Bottom}{\void}
|
||||
|
||||
Bottom() sets the pane dock position to the bottom side of the frame. This is
|
||||
Bottom() sets the pane dock position to the bottom side of the frame. This is
|
||||
the same thing as calling Direction(wxAUI\_DOCK\_BOTTOM).
|
||||
|
||||
\membersection{wxAuiPaneInfo::BottomDockable}\label{wxauipaneinfobottomdockable}
|
||||
@@ -82,36 +83,26 @@ Caption() sets the caption of the pane.
|
||||
|
||||
\func{wxAuiPaneInfo\&}{CaptionVisible}{\param{bool }{visible = true}}
|
||||
|
||||
CaptionVisible indicates that a pane caption should be visible. If false, no pane caption is drawn.
|
||||
CaptionVisible indicates that a pane caption should be visible. If false, no pane caption is drawn.
|
||||
|
||||
\membersection{wxAuiPaneInfo::Centre}\label{wxauipaneinfocentre}
|
||||
|
||||
\func{wxAuiPaneInfo\&}{Centre}{\void}
|
||||
|
||||
\func{wxAuiPaneInfo\&}{Center}{\void}
|
||||
|
||||
Center() sets the pane dock position to the left side of the frame. This is
|
||||
the same thing as calling Direction(wxAUI\_DOCK\_CENTRE).
|
||||
Center() sets the pane dock position to the left side of the frame.
|
||||
The centre pane is the space in the middle after all border panes (left, top, right, bottom) are subtracted from the layout.
|
||||
|
||||
This is the same thing as calling Direction(wxAUI\_DOCK\_CENTRE).
|
||||
|
||||
\membersection{wxAuiPaneInfo::CentrePane}\label{wxauipaneinfocentrepane}
|
||||
|
||||
\func{wxAuiPaneInfo\&}{CentrePane}{\void}
|
||||
|
||||
\func{wxAuiPaneInfo\&}{CenterPane}{\void}
|
||||
|
||||
CentrePane() specifies that the pane should adopt the default centre pane settings.
|
||||
|
||||
\membersection{wxAuiPaneInfo::Centre}\label{wxauipaneinfocentre}
|
||||
|
||||
\func{wxAuiPaneInfo\&}{Centre}{\void}
|
||||
\func{wxAuiPaneInfo\&}{Center}{\void}
|
||||
|
||||
Centre() sets the pane to the center position of the frame. The centre pane is the space in the middle after all border panes (left, top, right, bottom) are subtracted from the layout.
|
||||
|
||||
\membersection{wxAuiPaneInfo::CentrePane}\label{wxauipaneinfocentrepane}
|
||||
|
||||
\func{wxAuiPaneInfo\&}{CentrePane}{\void}
|
||||
\func{wxAuiPaneInfo\&}{CenterPane}{\void}
|
||||
|
||||
CentrePane() specifies that the pane should adopt the default center pane settings. Centre panes usually do not have caption bars. This function provides an easy way of preparing a pane to be displayed in the center dock position.
|
||||
CentrePane() specifies that the pane should adopt the default center pane settings. Centre panes usually do not have caption bars. This function provides an easy way of preparing a pane to be displayed in the center dock position.
|
||||
|
||||
\membersection{wxAuiPaneInfo::CloseButton}\label{wxauipaneinfoclosebutton}
|
||||
|
||||
@@ -129,13 +120,13 @@ DefaultPane() specifies that the pane should adopt the default pane settings.
|
||||
|
||||
\func{wxAuiPaneInfo\&}{DestroyOnClose}{\param{bool }{b = true}}
|
||||
|
||||
DestroyOnClose() indicates whether a pane should be detroyed when it is closed. Normally a pane is simply hidden when the close button is clicked. Setting DestroyOnClose to true will cause the window to be destroyed when the user clicks the pane's close button.
|
||||
DestroyOnClose() indicates whether a pane should be detroyed when it is closed. Normally a pane is simply hidden when the close button is clicked. Setting DestroyOnClose to true will cause the window to be destroyed when the user clicks the pane's close button.
|
||||
|
||||
\membersection{wxAuiPaneInfo::Direction}\label{wxauipaneinfodirection}
|
||||
|
||||
\func{wxAuiPaneInfo\&}{Direction}{\param{int }{direction}}
|
||||
|
||||
Direction() determines the direction of the docked pane. It is functionally the same as calling Left(), Right(), Top() or Bottom(), except that docking direction may be specified programmatically via the parameter.
|
||||
Direction() determines the direction of the docked pane. It is functionally the same as calling Left(), Right(), Top() or Bottom(), except that docking direction may be specified programmatically via the parameter.
|
||||
|
||||
\membersection{wxAuiPaneInfo::Dock}\label{wxauipaneinfodock}
|
||||
|
||||
@@ -146,13 +137,13 @@ Direction() determines the direction of the docked pane. It is functionally the
|
||||
|
||||
\func{wxAuiPaneInfo\&}{Dockable}{\param{bool }{b = true}}
|
||||
|
||||
Dockable() specifies whether a frame can be docked or not. It is the same as specifying TopDockable(b).BottomDockable(b).LeftDockable(b).RightDockable(b).
|
||||
Dockable() specifies whether a frame can be docked or not. It is the same as specifying TopDockable(b).BottomDockable(b).LeftDockable(b).RightDockable(b).
|
||||
|
||||
\membersection{wxAuiPaneInfo::Fixed}\label{wxauipaneinfofixed}
|
||||
|
||||
\func{wxAuiPaneInfo\&}{Fixed}{\void}
|
||||
|
||||
Fixed() forces a pane to be fixed size so that it cannot be resized. After calling Fixed(), IsFixed() will return true.
|
||||
Fixed() forces a pane to be fixed size so that it cannot be resized. After calling Fixed(), IsFixed() will return true.
|
||||
|
||||
\membersection{wxAuiPaneInfo::Float}\label{wxauipaneinfofloat}
|
||||
|
||||
@@ -169,6 +160,7 @@ Floatable() sets whether the user will be able to undock a pane and turn it into
|
||||
\membersection{wxAuiPaneInfo::FloatingPosition}\label{wxauipaneinfofloatingposition}
|
||||
|
||||
\func{wxAuiPaneInfo\&}{FloatingPosition}{\param{const wxPoint\& }{pos}}
|
||||
|
||||
\func{wxAuiPaneInfo\&}{FloatingPosition}{\param{int }{x}, \param{int }{y}}
|
||||
|
||||
FloatingPosition() sets the position of the floating pane.
|
||||
@@ -176,6 +168,7 @@ FloatingPosition() sets the position of the floating pane.
|
||||
\membersection{wxAuiPaneInfo::FloatingSize}\label{wxauipaneinfofloatingsize}
|
||||
|
||||
\func{wxAuiPaneInfo\&}{FloatingSize}{\param{const wxSize\& }{size}}
|
||||
|
||||
\func{wxAuiPaneInfo\&}{FloatingSize}{\param{int }{x}, \param{int }{y}}
|
||||
|
||||
FloatingSize() sets the size of the floating pane.
|
||||
@@ -298,7 +291,7 @@ IsMoveable() returns true if the docked frame can be undocked or moved to anothe
|
||||
|
||||
\constfunc{bool}{IsOk}{\void}
|
||||
|
||||
IsOk() returns true if the wxAuiPaneInfo structure is valid. A pane structure is valid if it has an associated window.
|
||||
IsOk() returns true if the wxAuiPaneInfo structure is valid. A pane structure is valid if it has an associated window.
|
||||
|
||||
\membersection{wxAuiPaneInfo::IsResizable}\label{wxauipaneinfoisresizable}
|
||||
|
||||
@@ -334,13 +327,13 @@ IsTopDockable() returns true if the pane can be docked at the top of the managed
|
||||
|
||||
\func{wxAuiPaneInfo\&}{Layer}{\param{int }{layer}}
|
||||
|
||||
Layer() determines the layer of the docked pane. The dock layer is similar to an onion, the inner-most layer being layer 0. Each shell moving in the outward direction has a higher layer number. This allows for more complex docking layout formation.
|
||||
Layer() determines the layer of the docked pane. The dock layer is similar to an onion, the inner-most layer being layer 0. Each shell moving in the outward direction has a higher layer number. This allows for more complex docking layout formation.
|
||||
|
||||
\membersection{wxAuiPaneInfo::Left}\label{wxauipaneinfoleft}
|
||||
|
||||
\func{wxAuiPaneInfo\&}{Left}{\void}
|
||||
|
||||
Left() sets the pane dock position to the left side of the frame. This is the
|
||||
Left() sets the pane dock position to the left side of the frame. This is the
|
||||
same thing as calling Direction(wxAUI\_DOCK\_LEFT).
|
||||
|
||||
\membersection{wxAuiPaneInfo::LeftDockable}\label{wxauipaneinfoleftdockable}
|
||||
@@ -352,6 +345,7 @@ LeftDockable() indicates whether a pane can be docked on the left of the frame.
|
||||
\membersection{wxAuiPaneInfo::MaxSize}\label{wxauipaneinfomaxsize}
|
||||
|
||||
\func{wxAuiPaneInfo\&}{MaxSize}{\param{const wxSize\& }{size}}
|
||||
|
||||
\func{wxAuiPaneInfo\&}{MaxSize}{\param{int }{x}, \param{int }{y}}
|
||||
|
||||
MaxSize() sets the maximum size of the pane.
|
||||
@@ -365,9 +359,10 @@ MaximizeButton() indicates that a maximize button should be drawn for the pane.
|
||||
\membersection{wxAuiPaneInfo::MinSize}\label{wxauipaneinfominsize}
|
||||
|
||||
\func{wxAuiPaneInfo\&}{MinSize}{\param{const wxSize\& }{size}}
|
||||
|
||||
\func{wxAuiPaneInfo\&}{MinSize}{\param{int }{x}, \param{int }{y}}
|
||||
|
||||
MinSize() sets the minimum size of the pane. Please note that this is only partially supported as of this writing.
|
||||
MinSize() sets the minimum size of the pane. Please note that this is only partially supported as of this writing.
|
||||
|
||||
\membersection{wxAuiPaneInfo::MinimizeButton}\label{wxauipaneinfominimizebutton}
|
||||
|
||||
@@ -385,7 +380,7 @@ Movable indicates whether a frame can be moved.
|
||||
|
||||
\func{wxAuiPaneInfo\&}{Name}{\param{const wxString\& }{n}}
|
||||
|
||||
Name() sets the name of the pane so it can be referenced in lookup functions. If a name is not specified by the user, a random name is assigned to the pane when it is added to the manager.
|
||||
Name() sets the name of the pane so it can be referenced in lookup functions. If a name is not specified by the user, a random name is assigned to the pane when it is added to the manager.
|
||||
|
||||
\membersection{wxAuiPaneInfo::PaneBorder}\label{wxauipaneinfopaneborder}
|
||||
|
||||
@@ -409,7 +404,7 @@ Position() determines the position of the docked pane.
|
||||
|
||||
\func{wxAuiPaneInfo\&}{Resizable}{\param{bool }{resizable = true}}
|
||||
|
||||
Resizable() allows a pane to be resized if the parameter is true, and forces it to be a fixed size if the parameter is false. This is simply an antonym for Fixed().
|
||||
Resizable() allows a pane to be resized if the parameter is true, and forces it to be a fixed size if the parameter is false. This is simply an antonym for Fixed().
|
||||
|
||||
\membersection{wxAuiPaneInfo::Right}\label{wxauipaneinforight}
|
||||
|
||||
@@ -470,7 +465,7 @@ TopDockable() indicates whether a pane can be docked at the top of the frame.
|
||||
|
||||
\func{wxAuiPaneInfo\&}{Window}{\param{wxWindow* }{w}}
|
||||
|
||||
Window() assigns the window pointer that the wxAuiPaneInfo should use. This normally does not need to be specified, as the window pointer is automatically assigned to the wxAuiPaneInfo structure as soon as it is added to the manager.
|
||||
Window() assigns the window pointer that the wxAuiPaneInfo should use. This normally does not need to be specified, as the window pointer is automatically assigned to the wxAuiPaneInfo structure as soon as it is added to the manager.
|
||||
|
||||
\membersection{wxAuiPaneInfo::operator=}\label{wxauipaneinfooperatorassign}
|
||||
|
||||
|
@@ -348,6 +348,7 @@
|
||||
\input setcursorevt.tex
|
||||
\input ipcservr.tex
|
||||
\input hprovsmp.tex
|
||||
\input srchctrl.tex
|
||||
\input sngchdlg.tex
|
||||
\input snglinst.tex
|
||||
\input size.tex
|
||||
|
@@ -377,18 +377,30 @@ this is not present, but required, the application name will be used instead.}
|
||||
|
||||
\docparam{style}{Can be one of wxCONFIG\_USE\_LOCAL\_FILE and
|
||||
wxCONFIG\_USE\_GLOBAL\_FILE. The style interpretation depends on the config
|
||||
class and is ignored by some. For wxFileConfig, these styles determine whether
|
||||
a local or global config file is created or used. If the flag is present but
|
||||
the parameter is empty, the parameter will be set to a default. If the
|
||||
parameter is present but the style flag not, the relevant flag will be added
|
||||
to the style. For wxFileConfig you can also add wxCONFIG\_USE\_RELATIVE\_PATH
|
||||
by logically or'ing it to either of the \_FILE options to tell wxFileConfig to
|
||||
use relative instead of absolute paths. For wxFileConfig, you can also
|
||||
add wxCONFIG\_USE\_NO\_ESCAPE\_CHARACTERS which will turn off character
|
||||
escaping for the values of entries stored in the config file: for example
|
||||
a {\it foo} key with some backslash characters will be stored as {\tt foo=C:$\backslash$mydir} instead
|
||||
of the usual storage of {\tt foo=C:$\backslash\backslash$mydir}.
|
||||
For wxRegConfig, this flag refers to HKLM, and provides read-only access.
|
||||
class and is ignored by some implementations. For wxFileConfig, these styles
|
||||
determine whether a local or global config file is created or used. If the
|
||||
flag is present but the parameter is empty, the parameter will be set to a
|
||||
default. If the parameter is present but the style flag not, the relevant flag
|
||||
will be added to the style. For wxRegConfig, thie GLOBAL flag refers to HKLM
|
||||
key while LOCAL one is for the usual HKCU one.
|
||||
|
||||
For wxFileConfig you can also add wxCONFIG\_USE\_RELATIVE\_PATH by logically
|
||||
or'ing it to either of the \_FILE options to tell wxFileConfig to use relative
|
||||
instead of absolute paths.
|
||||
|
||||
On non-VMS Unix systems, the default local configuration file is \tt{~/.appname}.
|
||||
However, this path may be also used as user data directory
|
||||
(see \helpref{wxStandardPaths::GetUserDataDir}{wxstandardpathsgetuserdatadir}) if
|
||||
the application has several data files. In this case wxCONFIG\_USE\_SUBDIR
|
||||
flag, which changes the default local configuration file to \tt{~/.appname/appname}
|
||||
should be used. Notice that this flag is ignored on non-Unix system, including
|
||||
VMS, or if a non-default \textit{localFilename} is provided. \newsince{2.8.2}
|
||||
|
||||
For wxFileConfig, you can also add wxCONFIG\_USE\_NO\_ESCAPE\_CHARACTERS which
|
||||
will turn off character escaping for the values of entries stored in the config
|
||||
file: for example a {\it foo} key with some backslash characters will be stored
|
||||
as {\tt foo=C:$\backslash$mydir} instead of the usual storage of {\tt
|
||||
foo=C:$\backslash\backslash$mydir}.
|
||||
|
||||
The wxCONFIG\_USE\_NO\_ESCAPE\_CHARACTERS style can be helpful if your config
|
||||
file must be read or written to by a non-wxWidgets program (which might not
|
||||
|
@@ -32,8 +32,8 @@ default user character set.
|
||||
\func{}{wxCSConv}{\param{wxFontEncoding }{encoding}}
|
||||
|
||||
Constructor. You may specify either the name of the character set you want to
|
||||
convert from/to or an encoding constant. If the character set name is not
|
||||
recognized, ISO 8859-1 is used as fall back.
|
||||
convert from/to or an encoding constant. If the character set name (or the
|
||||
encoding) is not recognized, ISO 8859-1 is used as fall back.
|
||||
|
||||
|
||||
\membersection{wxCSConv::\destruct{wxCSConv}}\label{wxcsconvdtor}
|
||||
@@ -43,12 +43,26 @@ recognized, ISO 8859-1 is used as fall back.
|
||||
Destructor frees any resources needed to perform the conversion.
|
||||
|
||||
|
||||
\membersection{wxCSConv::IsOk}\label{wxcsconvisok}
|
||||
|
||||
\constfunc{bool}{IsOk}{\void}
|
||||
|
||||
Returns \true if the charset (or the encoding) given at constructor is really
|
||||
available to use. Returns \false if ISO 8859-1 will be used instead.
|
||||
|
||||
Note this does \emph{not} mean that a given string will be correctly converted.
|
||||
A malformed string may still make conversion functions return \texttt{wxCONV\_FAILED}.
|
||||
|
||||
\newsince{2.8.2}
|
||||
|
||||
|
||||
\membersection{wxCSConv::MB2WC}\label{wxcsconvmb2wc}
|
||||
|
||||
\constfunc{size\_t}{MB2WC}{\param{wchar\_t* }{buf}, \param{const char* }{psz}, \param{size\_t }{n}}
|
||||
|
||||
Converts from the selected character set to Unicode. Returns length of string written to destination buffer.
|
||||
|
||||
|
||||
\membersection{wxCSConv::WC2MB}\label{wxcsconvwc2mb}
|
||||
|
||||
\constfunc{size\_t}{WC2MB}{\param{char* }{buf}, \param{const wchar\_t* }{psz}, \param{size\_t }{n}}
|
||||
|
@@ -862,6 +862,20 @@ Same as \helpref{Set}{wxdatetimesettm}.
|
||||
Returns {\tt true} if the object represents a valid time moment.
|
||||
|
||||
|
||||
\membersection{wxDateTime::GetDateOnly}\label{wxdatetimegetdateonly}
|
||||
|
||||
\constfunc{wxDateTime}{GetDateOnly}{\void}
|
||||
|
||||
Returns the object having the same date component as this one but time of
|
||||
00:00:00.
|
||||
|
||||
\newsince{2.8.2}
|
||||
|
||||
\wxheading{See also}
|
||||
|
||||
\helpref{ResetTime}{wxdatetimeresettime}
|
||||
|
||||
|
||||
\membersection{wxDateTime::GetTm}\label{wxdatetimegettm}
|
||||
|
||||
\constfunc{Tm}{GetTm}{\param{const TimeZone\& }{tz = Local}}
|
||||
|
@@ -188,3 +188,12 @@ Sets the current filter index (zero-based).
|
||||
|
||||
Sets the current path.
|
||||
|
||||
\membersection{wxGenericDirCtrl::ShowHidden}\label{wxgenericdirctrlShowHidden}
|
||||
|
||||
\func{void}{ShowHidden}{\param{bool }{show}}
|
||||
|
||||
\wxheading{Parameters}
|
||||
|
||||
\docparam{show}{If true, hidden folders and files will be displayed by the
|
||||
control. If false, they will not be displayed.}
|
||||
|
||||
|
@@ -71,6 +71,7 @@ enum wxDirTraverseResult
|
||||
|
||||
\latexignore{\rtfignore{\wxheading{Members}}}
|
||||
|
||||
|
||||
\membersection{wxDirTraverser::OnDir}\label{wxdirtraverserondir}
|
||||
|
||||
\func{virtual wxDirTraverseResult}{OnDir}{\param{const wxString\& }{dirname}}
|
||||
@@ -82,6 +83,7 @@ subdirectories in this directory.
|
||||
|
||||
This is a pure virtual function and must be implemented in the derived class.
|
||||
|
||||
|
||||
\membersection{wxDirTraverser::OnFile}\label{wxdirtraverseronfile}
|
||||
|
||||
\func{virtual wxDirTraverseResult}{OnFile}{\param{const wxString\& }{filename}}
|
||||
@@ -92,9 +94,10 @@ traversing (for example, if the file being searched is found) or
|
||||
|
||||
This is a pure virtual function and must be implemented in the derived class.
|
||||
|
||||
\membersection{wxOpenErrorTraverser::OnOpenError}\label{wxopenerrortraverseronopenerror}
|
||||
|
||||
\func{virtual wxOpenErrorTraverseResult}{OnOpenError}{\param{const wxString\& }{openerrorname}}
|
||||
\membersection{wxDirTraverser::OnOpenError}\label{wxopenerrortraverseronopenerror}
|
||||
|
||||
\func{virtual wxDirTraverseResult}{OnOpenError}{\param{const wxString\& }{openerrorname}}
|
||||
|
||||
This function is called for each directory which we failed to open for
|
||||
enumerating. It may return {\tt wxSIR\_STOP} to abort traversing completely,
|
||||
|
@@ -89,6 +89,13 @@ Appends the files in the history list, to all menus managed by the file history
|
||||
Appends the files in the history list, to the given menu only.
|
||||
|
||||
|
||||
\membersection{wxFileHistory::GetBaseId}\label{wxfilehistorygetbaseid}
|
||||
|
||||
\constfunc{wxWindowID}{GetBaseId}{\void}
|
||||
|
||||
Returns the base identifier for the range used for appending items.
|
||||
|
||||
|
||||
\membersection{wxFileHistory::GetCount}\label{wxfilehistorygetcount}
|
||||
|
||||
\constfunc{size\_t}{GetCount}{\void}
|
||||
@@ -157,6 +164,13 @@ explicitly by the application.
|
||||
\helpref{wxConfig}{wxconfigbase}
|
||||
|
||||
|
||||
\membersection{wxFileHistory::SetBaseId}\label{wxfilehistorysetbaseid}
|
||||
|
||||
\func{void}{SetBaseId}{\param{wxWindowID}{ baseId}}
|
||||
|
||||
Sets the base identifier for the range used for appending items.
|
||||
|
||||
|
||||
\membersection{wxFileHistory::UseMenu}\label{wxfilehistoryusemenu}
|
||||
|
||||
\func{void}{UseMenu}{\param{wxMenu* }{menu}}
|
||||
|
@@ -142,6 +142,8 @@ You can initialize a wxFileName instance using one of the following functions:
|
||||
\helpref{AssignDir}{wxfilenameassigndir}\\
|
||||
\helpref{AssignHomeDir}{wxfilenameassignhomedir}\\
|
||||
\helpref{AssignHomeTempFileName}{wxfilenameassigntempfilename}\\
|
||||
\helpref{DirName}{wxfilenamedirname}\\
|
||||
\helpref{FileName}{wxfilenamefilename}\\
|
||||
\helpref{operator $=$}{wxfilenameoperatorassign}
|
||||
|
||||
|
||||
|
@@ -996,7 +996,8 @@ Returns true if the file exists and is a plain file.
|
||||
|
||||
Returns time of last modification of given file.
|
||||
|
||||
The return value is $0$ if an error occured (e.g. file not found).
|
||||
The function returns \texttt{(time\_t)}$-1$ if an error occurred (e.g. file not
|
||||
found).
|
||||
|
||||
|
||||
\membersection{::wxFileNameFromPath}\label{wxfilenamefrompath}
|
||||
@@ -1273,6 +1274,11 @@ Removes the directory {\it dir}, returning true if successful. Does not work und
|
||||
|
||||
The {\it flags} parameter is reserved for future use.
|
||||
|
||||
Please notice that there is also a wxRmDir() function which simply wraps the
|
||||
standard POSIX rmdir() function and so return an integer error code instead of
|
||||
a boolean value (but otherwise is currently identical to wxRmdir), don't
|
||||
confuse these two functions.
|
||||
|
||||
|
||||
\membersection{::wxSetWorkingDirectory}\label{wxsetworkingdirectory}
|
||||
|
||||
|
@@ -186,17 +186,17 @@ the embedded window to be destroyed independently of the help controller.
|
||||
|
||||
\func{}{wxHtmlHelpWindow}{\param{wxHtmlHelpData* }{data = NULL}}
|
||||
|
||||
\func{}{wxHtmlHelpWindow}{\param{wxWindow* }{parent}, \param{int }{wxWindowID}, \param{int }{style = wxHF\_DEFAULT\_STYLE}, \param{wxHtmlHelpData* }{data = NULL}}
|
||||
\func{}{wxHtmlHelpWindow}{\param{wxWindow* }{parent}, \param{int }{wxWindowID}, \param{const wxPoint\&}{ pos = wxDefaultPosition}, \param{const wxSize\&}{ pos = wxDefaultSize}, \param{int }{style = wxTAB\_TRAVERSAL|wxTAB\_wxNO_BORDER}, \param{int }{helpStyle = wxHF\_DEFAULT\_STYLE}, \param{wxHtmlHelpData* }{data = NULL}}
|
||||
|
||||
Constructor.
|
||||
|
||||
Constructor. For the values of {\it style}, please see the documentation for \helpref{wxHtmlHelpController}{wxhtmlhelpcontroller}.
|
||||
Constructor. For the values of {\it helpStyle}, please see the documentation for \helpref{wxHtmlHelpController}{wxhtmlhelpcontroller}.
|
||||
|
||||
\membersection{wxHtmlHelpWindow::Create}\label{wxhtmlhelpwindowcreate}
|
||||
|
||||
\func{bool}{Create}{\param{wxWindow* }{parent}, \param{wxWindowID }{id}, \param{const wxString\& }{title = wxEmptyString}, \param{int }{style = wxHF\_DEFAULT\_STYLE}}
|
||||
\func{bool}{Create}{\param{wxWindow* }{parent}, \param{wxWindowID }{id}, \param{const wxPoint\&}{ pos = wxDefaultPosition}, \param{const wxSize\&}{ pos = wxDefaultSize}, \param{int }{style = wxTAB\_TRAVERSAL|wxTAB\_wxNO_BORDER}, \param{int }{helpStyle = wxHF\_DEFAULT\_STYLE}, \param{wxHtmlHelpData* }{data = NULL}}
|
||||
|
||||
Creates the frame. See \helpref{the constructor}{wxhtmlhelpwindowwxhtmlhelpwindow}
|
||||
Creates the help window. See \helpref{the constructor}{wxhtmlhelpwindowwxhtmlhelpwindow}
|
||||
for a description of the parameters.
|
||||
|
||||
\membersection{wxHtmlHelpWindow::CreateContents}\label{wxhtmlhelpwindowcreatecontents}
|
||||
|
@@ -40,8 +40,9 @@ in \helpref{wxListEvent}{wxlistevent}.
|
||||
|
||||
{\bf Mac Note:} Starting with 2.8, wxListCtrl uses a native implementation for
|
||||
report mode, and uses a generic implementation for other modes. You can use the
|
||||
generic implementation for report mode as well by setting the
|
||||
mac.listctrl.always_use_generic \helpref{wxSystemOption}{wxsystemoptions} to 1.
|
||||
generic implementation for report mode as well by setting the
|
||||
mac.listctrl.always\_use\_generic \helpref{wxSystemOption}{wxsystemoptions} to
|
||||
1.
|
||||
|
||||
\wxheading{Derived from}
|
||||
|
||||
|
@@ -26,13 +26,13 @@
|
||||
%\special{!/@scaleunit 1 def}
|
||||
\parskip=10pt
|
||||
\parindent=0pt
|
||||
\title{wxWidgets 2.8.0: A portable C++ and Python GUI toolkit}
|
||||
\title{wxWidgets 2.8.1: A portable C++ and Python GUI toolkit}
|
||||
\winhelponly{\author{by Julian Smart et al
|
||||
%\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$}
|
||||
}}
|
||||
\winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin,
|
||||
Robin Dunn, et al}
|
||||
\date{December, 2006}
|
||||
\date{January, 2007}
|
||||
}
|
||||
\makeindex
|
||||
\begin{document}
|
||||
|
@@ -218,20 +218,21 @@ return type (without const).
|
||||
|
||||
\membersection{wxMBConv::FromWChar}\label{wxmbconvfromwchar}
|
||||
|
||||
\constfunc{virtual size\_t}{FromWChar}{\param{wchar\_t *}{dst}, \param{size\_t }{dstLen}, \param{const char *}{src}, \param{size\_t }{srcLen = $-1$}}
|
||||
\constfunc{virtual size\_t}{FromWChar}{\param{wchar\_t *}{dst}, \param{size\_t }{dstLen}, \param{const char *}{src}, \param{size\_t }{srcLen = wxNO\_LEN}}
|
||||
|
||||
The most general function for converting a multibyte string to a wide string.
|
||||
The main case is when \arg{dst} is not \NULL and \arg{srcLen} is not $-1$: then
|
||||
The main case is when \arg{dst} is not \NULL and \arg{srcLen} is not
|
||||
\texttt{wxNO\_LEN} (which is defined as \texttt{(size\_t)$-1$}): then
|
||||
the function converts exactly \arg{srcLen} bytes starting at \arg{src} into
|
||||
wide string which it output to \arg{dst}. If the length of the resulting wide
|
||||
string is greater than \arg{dstLen}, an error is returned. Note that if
|
||||
\arg{srcLen} bytes don't include \NUL characters, the resulting wide string is
|
||||
not \NUL-terminated neither.
|
||||
|
||||
If \arg{srcLen} is $-1$, the function supposes that the string is properly
|
||||
(i.e. as necessary for the encoding handled by this conversion) \NUL-terminated
|
||||
and converts the entire string, including any trailing \NUL bytes. In this case
|
||||
the wide string is also \NUL-terminated.
|
||||
If \arg{srcLen} is \texttt{wxNO\_LEN}, the function supposes that the string is
|
||||
properly (i.e. as necessary for the encoding handled by this conversion)
|
||||
\NUL-terminated and converts the entire string, including any trailing \NUL
|
||||
bytes. In this case the wide string is also \NUL-terminated.
|
||||
|
||||
Finally, if \arg{dst} is \NULL, the function returns the length of the needed
|
||||
buffer.
|
||||
@@ -262,12 +263,13 @@ trailing \NUL characters for any encoding.
|
||||
This function returns $1$ for most of the multibyte encodings in which the
|
||||
string is terminated by a single \NUL, $2$ for UTF-16 and $4$ for UTF-32 for
|
||||
which the string is terminated with $2$ and $4$ \NUL characters respectively.
|
||||
The other cases are not currently supported and $-1$ is returned for them.
|
||||
The other cases are not currently supported and \texttt{wxCONV\_FAILED}
|
||||
(defined as $-1$) is returned for them.
|
||||
|
||||
|
||||
\membersection{wxMBConv::ToWChar}\label{wxmbconvtowchar}
|
||||
|
||||
\constfunc{virtual size\_t}{ToWChar}{\param{char\_t *}{dst}, \param{size\_t }{dstLen}, \param{const wchar\_t *}{src}, \param{size\_t }{srcLen = $-1$}}
|
||||
\constfunc{virtual size\_t}{ToWChar}{\param{char\_t *}{dst}, \param{size\_t }{dstLen}, \param{const wchar\_t *}{src}, \param{size\_t }{srcLen = wxNO\_LEN}}
|
||||
|
||||
This function has the same semantics as \helpref{FromWChar}{wxmbconvfromwchar}
|
||||
except that it converts a wide string to multibyte one.
|
||||
|
@@ -198,9 +198,9 @@ Sets the width.
|
||||
Assignment operator.
|
||||
|
||||
|
||||
\func{bool}{operator $==$}{\param{const wxSize\& }{sz}}
|
||||
\constfunc{bool}{operator $==$}{\param{const wxSize\& }{sz}}
|
||||
|
||||
\func{bool}{operator $!=$}{\param{const wxSize\& }{sz}}
|
||||
\constfunc{bool}{operator $!=$}{\param{const wxSize\& }{sz}}
|
||||
|
||||
\func{wxSize}{operator $+$}{\param{const wxSize\& }{sz}}
|
||||
|
||||
|
@@ -670,6 +670,14 @@ Aligns the object to the left, shortcut for \texttt{Align(wxALIGN\_LEFT)}
|
||||
\helpref{Align}{wxsizerflagsalign}
|
||||
|
||||
|
||||
\membersection{wxSizerFlags::FixedMinSize}\label{wxsizerflagsfixedminsize}
|
||||
|
||||
\func{wxSizerFlags\& }{FixedMinSize}{\void}
|
||||
|
||||
Set the \texttt{wxFIXED\_MINSIZE} flag which indicates that the initial size of
|
||||
the window should be also set as its minimal size.
|
||||
|
||||
|
||||
\membersection{wxSizerFlags::Proportion}\label{wxsizerflagsproportion}
|
||||
|
||||
\func{wxSizerFlags\& }{Proportion}{\param{int }{proportion = 0}}
|
||||
@@ -688,6 +696,14 @@ Aligns the object to the right, shortcut for \texttt{Align(wxALIGN\_RIGHT)}
|
||||
\helpref{Align}{wxsizerflagsalign}
|
||||
|
||||
|
||||
\membersection{wxSizerFlags::Shaped}\label{wxsizerflagsshaped}
|
||||
|
||||
\func{wxSizerFlags\& }{Shaped}{\void}
|
||||
|
||||
Set the \texttt{wx\_SHAPED} flag which indicates that the elements should
|
||||
always keep the fixed width to height ratio equal to its original value.
|
||||
|
||||
|
||||
\membersection{wxSizerFlags::TripleBorder}\label{wxsizerflagstriplebleborder}
|
||||
|
||||
\func{wxSizerFlags\& }{TripleBorder}{\param{int }{direction = wxALL}}
|
||||
|
157
docs/latex/wx/srchctrl.tex
Normal file
157
docs/latex/wx/srchctrl.tex
Normal file
@@ -0,0 +1,157 @@
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%% wxSearchCtrl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
|
||||
\section{\class{wxSearchCtrl}}\label{wxsearchctrl}
|
||||
|
||||
A search control is a composite control with a search button, a text
|
||||
control, and a cancel button.
|
||||
|
||||
\wxheading{Derived from}
|
||||
|
||||
\helpref{wxTextCtrl}{wxtextctrl}\\
|
||||
streambuf\\
|
||||
\helpref{wxControl}{wxcontrol}\\
|
||||
\helpref{wxWindow}{wxwindow}\\
|
||||
\helpref{wxEvtHandler}{wxevthandler}\\
|
||||
\helpref{wxObject}{wxobject}
|
||||
|
||||
\wxheading{Include files}
|
||||
|
||||
<wx/srchctrl.h>
|
||||
|
||||
\wxheading{Window styles}
|
||||
|
||||
\twocolwidtha{5cm}
|
||||
\begin{twocollist}\itemsep=0pt
|
||||
\twocolitem{\windowstyle{wxTE\_PROCESS\_ENTER}}{The control will generate
|
||||
the event wxEVT\_COMMAND\_TEXT\_ENTER (otherwise pressing Enter key
|
||||
is either processed internally by the control or used for navigation between
|
||||
dialog controls).}
|
||||
\twocolitem{\windowstyle{wxTE\_PROCESS\_TAB}}{The control will receive
|
||||
wxEVT\_CHAR events for TAB pressed - normally, TAB is used for passing to the
|
||||
next control in a dialog instead. For the control created with this style,
|
||||
you can still use Ctrl-Enter to pass to the next control from the keyboard.}
|
||||
\twocolitem{\windowstyle{wxTE\_NOHIDESEL}}{By default, the Windows text control
|
||||
doesn't show the selection when it doesn't have focus - use this style to force
|
||||
it to always show it. It doesn't do anything under other platforms.}
|
||||
\twocolitem{\windowstyle{wxTE\_LEFT}}{The text in the control will be left-justified (default).}
|
||||
\twocolitem{\windowstyle{wxTE\_CENTRE}}{The text in the control will be centered (currently wxMSW and wxGTK2 only).}
|
||||
\twocolitem{\windowstyle{wxTE\_RIGHT}}{The text in the control will be right-justified (currently wxMSW and wxGTK2 only).}
|
||||
\twocolitem{\windowstyle{wxTE\_CAPITALIZE}}{On PocketPC and Smartphone, causes the first letter to be capitalized.}
|
||||
\end{twocollist}
|
||||
|
||||
See also \helpref{window styles overview}{windowstyles} and \helpref{wxSearchCtrl::wxSearchCtrl}{wxsearchctrlctor}.
|
||||
|
||||
\wxheading{Event handling}
|
||||
|
||||
To process input from a search control, use these event handler macros to direct input to member
|
||||
functions that take a \helpref{wxCommandEvent}{wxcommandevent} argument. To retrieve actual search
|
||||
queries, use EVT\_TEXT and EVT\_TEXT\_ENTER events, just as you would with \helpref{wxTextCtrl}{wxtextctrl}.
|
||||
|
||||
\twocolwidtha{9cm}%
|
||||
\begin{twocollist}\itemsep=0pt
|
||||
\twocolitem{{\bf EVT\_SEARCHCTRL\_SEARCH\_BTN(id, func)}}{Respond to a wxEVT\_SEARCHCTRL\_SEARCH\_BTN event,
|
||||
generated when the search button is clicked. Note that this does not initiate a search.}
|
||||
\twocolitem{{\bf EVT\_SEARCHCTRL\_CANCEL\_BTN(id, func)}}{Respond to a wxEVT\_SEARCHCTRL\_CANCEL\_BTN event,
|
||||
generated when the cancel button is clicked.}
|
||||
\end{twocollist}%
|
||||
|
||||
|
||||
\latexignore{\rtfignore{\wxheading{Members}}}
|
||||
|
||||
|
||||
\membersection{wxSearchCtrl::wxSearchCtrl}\label{wxsearchctrlctor}
|
||||
|
||||
\func{}{wxSearchCtrl}{\void}
|
||||
|
||||
Default constructor.
|
||||
|
||||
\func{}{wxSearchCtrl}{\param{wxWindow* }{parent}, \param{wxWindowID}{ id},\rtfsp
|
||||
\param{const wxString\& }{value = ``"}, \param{const wxPoint\& }{pos = wxDefaultPosition}, \param{const wxSize\& }{size = wxDefaultSize},\rtfsp
|
||||
\param{long}{ style = 0}, \param{const wxValidator\& }{validator = wxDefaultValidator}, \param{const wxString\& }{name = wxSearchCtrlNameStr}}
|
||||
|
||||
Constructor, creating and showing a text control.
|
||||
|
||||
\wxheading{Parameters}
|
||||
|
||||
\docparam{parent}{Parent window. Should not be NULL.}
|
||||
|
||||
\docparam{id}{Control identifier. A value of -1 denotes a default value.}
|
||||
|
||||
\docparam{value}{Default text value.}
|
||||
|
||||
\docparam{pos}{Text control position.}
|
||||
|
||||
\docparam{size}{Text control size.}
|
||||
|
||||
\docparam{style}{Window style. See \helpref{wxSearchCtrl}{wxsearchctrl}.}
|
||||
|
||||
\docparam{validator}{Window validator.}
|
||||
|
||||
\docparam{name}{Window name.}
|
||||
|
||||
\wxheading{See also}
|
||||
|
||||
\helpref{wxTextCtrl::Create}{wxtextctrlcreate}, \helpref{wxValidator}{wxvalidator}
|
||||
|
||||
|
||||
\membersection{wxSearchCtrl::\destruct{wxSearchCtrl}}\label{wxsearchctrldtor}
|
||||
|
||||
\func{}{\destruct{wxSearchCtrl}}{\void}
|
||||
|
||||
Destructor, destroying the search control.
|
||||
|
||||
|
||||
\membersection{wxSearchCtrl::SetMenu}\label{wxsearchctrlsetmenu}
|
||||
|
||||
\func{virtual void}{SetMenu}{\param{wxMenu* }{ menu}}
|
||||
|
||||
Sets the search control's menu object. If there is already a menu associated with
|
||||
the search control it is deleted.
|
||||
|
||||
|
||||
\wxheading{Parameters}
|
||||
|
||||
\docparam{menu}{Menu to attach to the search control.}
|
||||
|
||||
\membersection{wxSearchCtrl::GetMenu}\label{wxsearchctrlgetmenu}
|
||||
|
||||
\func{virtual wxMenu*}{GetMenu}{\void}
|
||||
|
||||
Returns a pointer to the search control's menu object or NULL if there is no
|
||||
menu attached.
|
||||
|
||||
|
||||
\membersection{wxSearchCtrl::ShowSearchButton}\label{wxsearchctrlshowsearchbutton}
|
||||
|
||||
\func{virtual void}{ShowSearchButton}{\param{bool }{ show}}
|
||||
|
||||
Sets the search button visibility value on the search control.
|
||||
If there is a menu attached, the search button will be visible regardless of the search
|
||||
button visibility value.
|
||||
|
||||
This has no effect in Mac OS X v10.3
|
||||
|
||||
|
||||
\membersection{wxSearchCtrl::IsSearchButtonVisible}\label{wxsearchctrlissearchbuttonvisible}
|
||||
|
||||
\func{virtual bool}{IsSearchButtonVisible}{\void}
|
||||
|
||||
Returns the search button visibility value.
|
||||
If there is a menu attached, the search button will be visible regardless of the search
|
||||
button visibility value.
|
||||
|
||||
This always returns false in Mac OS X v10.3
|
||||
|
||||
|
||||
\membersection{wxSearchCtrl::ShowCancelButton}\label{wxsearchctrlshowcancelbutton}
|
||||
|
||||
\func{virtual void}{ShowCancelButton}{\param{bool }{ show}}
|
||||
|
||||
Shows or hides the cancel button.
|
||||
|
||||
|
||||
\membersection{wxSearchCtrl::IsCancelButtonVisible}\label{wxsearchctrliscancelbuttonvisible}
|
||||
|
||||
\func{virtual bool}{IsCancelButtonVisible}{\void}
|
||||
|
||||
Indicates whether the cancel button is visible.
|
@@ -176,9 +176,9 @@ Return the directory where the loadable modules (plugins) live.
|
||||
|
||||
Example return values:
|
||||
\begin{itemize}
|
||||
\item Unix: \texttt{\textit{prefix}/share/\textit{appname}}
|
||||
\item Windows: the directory where the executable file is located
|
||||
\item Mac: \texttt{\textit{appname}.app/Contents/Resources} bundle subdirectory
|
||||
\item Unix: \texttt{\textit{prefix}/lib/\textit{appname}}
|
||||
\item Windows: the directory of the executable file
|
||||
\item Mac: \texttt{\textit{appname}.app/Contents/PlugIns} bundle subdirectory
|
||||
\end{itemize}
|
||||
|
||||
\wxheading{See also}
|
||||
@@ -199,9 +199,9 @@ all platforms except Mac OS X.
|
||||
|
||||
Example return values:
|
||||
\begin{itemize}
|
||||
\item Unix: \texttt{\textit{prefix}/lib/\textit{appname}}
|
||||
\item Windows: the directory of the executable file
|
||||
\item Mac: \texttt{\textit{appname}.app/Contents/PlugIns} bundle subdirectory
|
||||
\item Unix: \texttt{\textit{prefix}/share/\textit{appname}}
|
||||
\item Windows: the directory where the executable file is located
|
||||
\item Mac: \texttt{\textit{appname}.app/Contents/Resources} bundle subdirectory
|
||||
\end{itemize}
|
||||
|
||||
\newsince{2.7.0}
|
||||
|
@@ -42,7 +42,7 @@ used.}
|
||||
a window. You can also use the symbol wxMAC\_WINDOW\_PLAIN\_TRANSITION.}
|
||||
\twocolitem{window-default-variant}{The default variant used by windows (cast to integer from the wxWindowVariant enum).
|
||||
Also known as wxWINDOW\_DEFAULT\_VARIANT.}
|
||||
\twocolitem{mac.listctrl.always_use_generic}{Tells wxListCtrl to use the generic
|
||||
\twocolitem{mac.listctrl.always\_use\_generic}{Tells wxListCtrl to use the generic
|
||||
control even when it is capable of using the native control instead.
|
||||
Also knwon as wxMAC\_ALWAYS\_USE\_GENERIC\_LISTCTRL.}
|
||||
\end{twocollist}
|
||||
|
@@ -51,6 +51,10 @@ wxEVT\_TASKBAR\_RIGHT\_UP event.}
|
||||
wxEVT\_TASKBAR\_LEFT\_DCLICK event.}
|
||||
\twocolitem{{\bf EVT\_TASKBAR\_RIGHT\_DCLICK(func)}}{Process a
|
||||
wxEVT\_TASKBAR\_RIGHT\_DCLICK event.}
|
||||
\twocolitem{{\bf EVT\_TASKBAR\_CLICK(func)}}{This is a synonym for either
|
||||
EVT\_TASKBAR\_RIGHT\_DOWN or UP depending on the platform, use this event macro
|
||||
to catch the event which should result in the menu being displayed on the
|
||||
current platform.}
|
||||
\end{twocollist}%
|
||||
|
||||
\latexignore{\rtfignore{\wxheading{Members}}}
|
||||
|
@@ -2,7 +2,7 @@
|
||||
|
||||
Class: \helpref{wxAuiManager}{wxauimanager}, \helpref{wxAuiPaneInfo}{wxauipaneinfo}
|
||||
|
||||
wxAUI stands for Advances User Interface and the wxAUI framework
|
||||
wxAUI stands for Advanced User Interface and the wxAUI framework
|
||||
aims to give its user a cutting edge interface for use with the
|
||||
wxWidgets based applications. The original wxAUI sources have
|
||||
kindly been made available under the wxWindows licence
|
||||
|
@@ -290,6 +290,11 @@ others are not.
|
||||
|
||||
\helpref{wxToolBar::AddTool}{wxtoolbaraddtool}
|
||||
|
||||
\membersection{wxToolBar::ClearTools}\label{wxtoolbarcleartools}
|
||||
|
||||
\func{void}{ClearTools}{\void}
|
||||
|
||||
Deletes all the tools in the toolbar.
|
||||
|
||||
\membersection{wxToolBar::DeleteTool}\label{wxtoolbardeletetool}
|
||||
|
||||
@@ -379,6 +384,13 @@ A pointer to a tool if a tool is found, or \NULL otherwise.
|
||||
Currently not implemented in wxGTK (always returns \NULL there).
|
||||
|
||||
|
||||
\membersection{wxToolBar::GetToolsCount}\label{wxtoolbargettoolscount}
|
||||
|
||||
\constfunc{int}{GetToolsCount}{\void}
|
||||
|
||||
Returns the number of tools in the toolbar.
|
||||
|
||||
|
||||
\membersection{wxToolBar::GetToolSize}\label{wxtoolbargettoolsize}
|
||||
|
||||
\func{wxSize}{GetToolSize}{\void}
|
||||
|
@@ -13,7 +13,7 @@
|
||||
|
||||
A tree control presents information as a hierarchy, with items that may be expanded
|
||||
to show further items. Items in a tree control are referenced by wxTreeItemId handles,
|
||||
which may be tested for validity by calling wxTreeItemId::IsOk.
|
||||
which may be tested for validity by calling \helpref{wxTreeItemId::IsOk}{wxtreeitemidisok}.
|
||||
|
||||
To intercept events from a tree control, use the event table macros described in \helpref{wxTreeEvent}{wxtreeevent}.
|
||||
|
||||
@@ -238,6 +238,28 @@ See also \helpref{SetStateImageList}{wxtreectrlsetstateimagelist}.
|
||||
Collapses the given item.
|
||||
|
||||
|
||||
\membersection{wxTreeCtrl::CollapseAll}\label{wxtreectrlcollapseall}
|
||||
|
||||
\func{void}{CollapseAll}{\void}
|
||||
|
||||
Collapses the root item.
|
||||
|
||||
\wxheading{See also}
|
||||
|
||||
\helpref{ExpandAll}{wxtreectrlexpandall}
|
||||
|
||||
|
||||
\membersection{wxTreeCtrl::CollapseAllChildren}\label{wxtreectrlcollapseallchildren}
|
||||
|
||||
\func{void}{CollapseAllChildren}{\param{const wxTreeItemId\&}{ item}}
|
||||
|
||||
Collapses this item and all of its children, recursively.
|
||||
|
||||
\wxheading{See also}
|
||||
|
||||
\helpref{ExpandAllChildren}{wxtreectrlexpandallchildren}
|
||||
|
||||
|
||||
\membersection{wxTreeCtrl::CollapseAndReset}\label{wxtreectrlcollapseandreset}
|
||||
|
||||
\func{void}{CollapseAndReset}{\param{const wxTreeItemId\&}{ item}}
|
||||
@@ -333,7 +355,7 @@ Expands the given item.
|
||||
|
||||
\membersection{wxTreeCtrl::ExpandAll}\label{wxtreectrlexpandall}
|
||||
|
||||
\func{void}{Expand}{\void}
|
||||
\func{void}{ExpandAll}{\void}
|
||||
|
||||
Expands all items in the tree.
|
||||
|
||||
@@ -728,6 +750,13 @@ Returns {\tt true} if the given item is in bold state.
|
||||
See also: \helpref{SetItemBold}{wxtreectrlsetitembold}
|
||||
|
||||
|
||||
\membersection{wxTreeCtrl::IsEmpty}\label{wxtreectrlisempty}
|
||||
|
||||
\constfunc{bool}{IsEmpty}{}
|
||||
|
||||
Returns \true if the control is empty (i.e. has no items, even no root one).
|
||||
|
||||
|
||||
\membersection{wxTreeCtrl::IsExpanded}\label{wxtreectrlisexpanded}
|
||||
|
||||
\constfunc{bool}{IsExpanded}{\param{const wxTreeItemId\&}{ item}}
|
||||
@@ -1023,3 +1052,59 @@ all items if it does have this style.
|
||||
|
||||
Unselects the given item. This works in multiselection controls only.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
%% the wxTreeItemId opaque class
|
||||
|
||||
|
||||
\section{\class{wxTreeItemId}}\label{wxtreeitemid}
|
||||
|
||||
An opaque reference to a tree item.
|
||||
|
||||
|
||||
\wxheading{Derived from}
|
||||
|
||||
None
|
||||
|
||||
\wxheading{Include files}
|
||||
|
||||
<wx/treebase.h>
|
||||
|
||||
\wxheading{See also}
|
||||
|
||||
\helpref{wxTreeCtrl}{wxtreectrl}, \helpref{wxTreeItemData}{wxtreeitemdata},\\
|
||||
\helpref{wxTreeCtrl overview}{wxtreectrloverview}
|
||||
|
||||
|
||||
\latexignore{\rtfignore{\wxheading{Members}}}
|
||||
|
||||
\membersection{wxTreeItemId::wxTreeItemId}\label{wxtreeitemidconstr}
|
||||
|
||||
\func{}{wxTreeItemId}{\void}
|
||||
|
||||
Default constructor. wxTreemItemIds are not meant to be constructed explicitly by
|
||||
the user; they are returned by the \helpref{wxTreeCtrl}{wxtreectrl} functions instead.
|
||||
|
||||
|
||||
\membersection{wxTreeItemId::IsOk}\label{wxtreeitemidisok}
|
||||
|
||||
\constfunc{bool}{IsOk}{}
|
||||
|
||||
Returns \true if this instance is referencing a valid tree item.
|
||||
|
||||
|
||||
\membersection{Operators}\label{wxtreeitemidoperators}
|
||||
|
||||
\constfunc{void}{operator $!$}{}
|
||||
|
||||
Synonim for \helpref{IsOk}{wxtreeitemidisok}
|
||||
|
||||
|
||||
\constfunc{bool}{operator $==$}{\param{const wxTreeItemId\& }{item}}
|
||||
|
||||
\constfunc{bool}{operator $!=$}{\param{const wxTreeItemId\& }{item}}
|
||||
|
||||
Operators for comparison between \helpref{wxTreeItemId}{wxtreeitemid} objects.
|
||||
|
||||
|
@@ -52,11 +52,13 @@ is being given to the application (call wxTreeEvent::SetToolTip). Windows only.}
|
||||
|
||||
\latexignore{\rtfignore{\wxheading{Members}}}
|
||||
|
||||
|
||||
\membersection{wxTreeEvent::wxTreeEvent}\label{wxtreeeventctor}
|
||||
|
||||
\func{}{wxTreeEvent}{\param{WXTYPE }{commandType = 0}, \param{int }{id = 0}}
|
||||
\func{}{wxTreeEvent}{\param{wxEventType }{commandType}, \param{wxTreeCtrl *}{tree}, \param{const wxTreeItemId\&}{item = wxTreeItemId()}}
|
||||
|
||||
Constructor, used by wxWidgets itself only.
|
||||
|
||||
Constructor.
|
||||
|
||||
\membersection{wxTreeEvent::GetKeyCode}\label{wxtreeeventgetkeycode}
|
||||
|
||||
@@ -66,43 +68,52 @@ Returns the key code if the event is a key event. Use
|
||||
\helpref{GetKeyEvent}{wxtreeeventgetkeyevent} to get the values of the
|
||||
modifier keys for this event (i.e. Shift or Ctrl).
|
||||
|
||||
|
||||
\membersection{wxTreeEvent::GetItem}\label{wxtreeeventgetitem}
|
||||
|
||||
\constfunc{wxTreeItemId}{GetItem}{}
|
||||
|
||||
Returns the item (valid for all events).
|
||||
|
||||
|
||||
\membersection{wxTreeEvent::GetKeyEvent}\label{wxtreeeventgetkeyevent}
|
||||
|
||||
\constfunc{const wxKeyEvent\&}{GetKeyEvent}{}
|
||||
|
||||
Returns the key event for {\tt EVT\_TREE\_KEY\_DOWN} events.
|
||||
|
||||
|
||||
\membersection{wxTreeEvent::GetLabel}\label{wxtreeeventgetlabel}
|
||||
|
||||
\constfunc{const wxString\&}{GetLabel}{}
|
||||
|
||||
Returns the label if the event is a begin or end edit label event.
|
||||
|
||||
|
||||
\membersection{wxTreeEvent::GetOldItem}\label{wxtreeeventgetolditem}
|
||||
|
||||
\constfunc{wxTreeItemId}{GetOldItem}{}
|
||||
|
||||
Returns the old item index (valid for EVT\_TREE\_ITEM\_CHANGING and CHANGED events)
|
||||
|
||||
\membersection{wxTreeEvent::GetPoint()}\label{wxtreeeventgetpoint}
|
||||
|
||||
\membersection{wxTreeEvent::GetPoint}\label{wxtreeeventgetpoint}
|
||||
|
||||
\constfunc{wxPoint}{GetPoint}{}
|
||||
|
||||
Returns the position of the mouse pointer if the event is a drag event.
|
||||
Returns the position of the mouse pointer if the event is a drag or menu-context event.
|
||||
In both cases the position is in client coordinates - i.e. relative to the wxTreeCtrl
|
||||
window (so that you can pass it directly to e.g. \helpref{wxWindow::PopupMenu}{wxwindowpopupmenu}).
|
||||
|
||||
\membersection{wxTreeEvent::IsEditCancelled()}\label{wxtreeeventiseditcancelled}
|
||||
|
||||
\membersection{wxTreeEvent::IsEditCancelled}\label{wxtreeeventiseditcancelled}
|
||||
|
||||
\constfunc{bool}{IsEditCancelled}{}
|
||||
|
||||
Returns true if the label edit was cancelled. This should be
|
||||
called from within an EVT\_TREE\_END\_LABEL\_EDIT handler.
|
||||
|
||||
|
||||
\membersection{wxTreeEvent::SetToolTip}\label{wxtreeeventsettooltip}
|
||||
|
||||
\func{void}{SetToolTip}{\param{const wxString\&}{ tooltip}}
|
||||
|
@@ -64,7 +64,9 @@ and copy constructors since they are reference-counted:
|
||||
\helpref{wxPalette}{wxpalette}\\
|
||||
\helpref{wxPen}{wxpen}\\
|
||||
\helpref{wxRegion}{wxregion}\\
|
||||
\helpref{wxString}{wxstring}
|
||||
\helpref{wxString}{wxstring}\\
|
||||
\helpref{wxVariant}{wxvariant}\\
|
||||
\helpref{wxVariantData}{wxvariantdata}
|
||||
|
||||
Note that the list above reports the objects which are reference-counted in all ports of
|
||||
wxWidgets; some ports may use this tecnique also for other classes.
|
||||
|
@@ -34,12 +34,12 @@ for different data types, or a remote procedure call protocol.
|
||||
An optional name member is associated with a wxVariant. This might be used, for example,
|
||||
in CORBA or OLE automation classes, where named parameters are required.
|
||||
|
||||
Note that as of wxWidgets 2.7.1, wxVariant is reference counted. Additionally, the
|
||||
conveniance macros {\bf DECLARE\_VARIANT\_OBJECT} and {\bf IMPLEMENT\_VARIANT\_OBJECT}
|
||||
were added so that adding (limited) support for conversion to and from wxVariant
|
||||
can be very easily implemented without modifiying either wxVariant or the class
|
||||
to be stored by wxVariant. Since assignement operators cannot be declared outside
|
||||
the class, the shift left operators are used like this:
|
||||
Note that as of wxWidgets 2.7.1, wxVariant is \helpref{reference counted}{trefcount}.
|
||||
Additionally, the convenience macros {\bf DECLARE\_VARIANT\_OBJECT} and
|
||||
{\bf IMPLEMENT\_VARIANT\_OBJECT} were added so that adding (limited) support
|
||||
for conversion to and from wxVariant can be very easily implemented without modifying
|
||||
either wxVariant or the class to be stored by wxVariant. Since assignment operators
|
||||
cannot be declared outside the class, the shift left operators are used like this:
|
||||
|
||||
\begin{verbatim}
|
||||
// in the header file
|
||||
@@ -94,7 +94,7 @@ Default constructor.
|
||||
|
||||
\func{}{wxVariant}{\param{const wxVariant\& }{variant}}
|
||||
|
||||
Copy constructor.
|
||||
Copy constructor, uses \helpref{reference counting}{trefcount}.
|
||||
|
||||
\func{}{wxVariant}{\param{const wxChar*}{ value}, \param{const wxString\& }{name = ``"}}
|
||||
|
||||
@@ -165,6 +165,7 @@ Destructor.
|
||||
|
||||
Note that destructor is protected, so wxVariantData cannot usually
|
||||
be deleted. Instead, \helpref{DecRef}{wxvariantdatadecref} should be called.
|
||||
See \helpref{reference-counted object destruction}{refcountdestruct} for more info.
|
||||
|
||||
|
||||
\membersection{wxVariant::Append}\label{wxvariantappend}
|
||||
@@ -382,7 +383,7 @@ Sets the internal variant data, deleting the existing data if there is any.
|
||||
|
||||
\func{void}{operator $=$}{\param{const TIMESTAMP\_STRUCT* }{value}}
|
||||
|
||||
Assignment operators.
|
||||
Assignment operators, using \helpref{reference counting}{trefcount} when possible.
|
||||
|
||||
\membersection{wxVariant::operator $==$}\label{wxvarianteq}
|
||||
|
||||
@@ -485,13 +486,18 @@ Operator for implicit conversion to a pointer to a void, using \helpref{wxVarian
|
||||
|
||||
Operator for implicit conversion to a pointer to a \helpref{wxDateTime}{wxdatetime}, using \helpref{wxVariant::GetDateTime}{wxvariantgetdatetime}.
|
||||
|
||||
|
||||
|
||||
%% wxVariantData
|
||||
|
||||
|
||||
\section{\class{wxVariantData}}\label{wxvariantdata}
|
||||
|
||||
The {\bf wxVariantData} is used to implement a new type for wxVariant. Derive from wxVariantData,
|
||||
and override the pure virtual functions.
|
||||
The {\bf wxVariantData} class is used to implement a new type for \helpref{wxVariant}{wxvariant}.
|
||||
Derive from wxVariantData, and override the pure virtual functions.
|
||||
|
||||
wxVariantData is reference counted, but you don't normally have to care about this, as
|
||||
wxVariant manages the count automatically. However, incase your application needs to take
|
||||
wxVariantData is \helpref{reference counted}{refcount}, but you don't normally have to care about this,
|
||||
as wxVariant manages the count automatically. However, in case your application needs to take
|
||||
ownership of wxVariantData, be aware that the object is created with reference count of 1,
|
||||
and passing it to wxVariant will not increase this. In other words, \helpref{IncRef}{wxvariantdataincref}
|
||||
needs to be called only if you both take ownership of wxVariantData and pass it to a wxVariant.
|
||||
@@ -527,7 +533,9 @@ Decreases reference count. If the count reaches zero, the object is
|
||||
automatically deleted.
|
||||
|
||||
Note that destructor of wxVariantData is protected, so delete
|
||||
cannot be used as normal. Instead, DecRef should be called.
|
||||
cannot be used as normal. Instead, \helpref{DecRef}{wxvariantdatadecref} should be called.
|
||||
|
||||
|
||||
|
||||
\membersection{wxVariantData::Eq}\label{wxvariantdataeq}
|
||||
|
||||
|
@@ -1,5 +1,5 @@
|
||||
wxWidgets 2.8.0 for Mac installation
|
||||
------------------------------------
|
||||
wxWidgets for Mac installation
|
||||
------------------------------
|
||||
|
||||
On MacOS X, you can download Apple's free developer tools (gcc
|
||||
and associated headers and libraries, such as the Carbon API).
|
||||
|
@@ -1,4 +1,4 @@
|
||||
Welcome to wxWidgets/Mac 2.8.2
|
||||
Welcome to wxWidgets/Mac
|
||||
|
||||
More Information is available from the wxWidgets project home page at
|
||||
|
||||
|
@@ -1,10 +1,10 @@
|
||||
|
||||
Welcome to wxWidgets/MGL 2.8.0
|
||||
Welcome to wxWidgets/MGL
|
||||
|
||||
You have downloaded version 2.8.0 of the MGL port of
|
||||
the wxWidgets GUI library. This runs on top of SciTech MGL library
|
||||
(http://www.scitechsoft.com/) that is available for variety of
|
||||
operating systems and comes with support for embedded devices.
|
||||
You have downloaded the MGL port of the wxWidgets GUI library.
|
||||
This runs on top of SciTech MGL library (http://www.scitechsoft.com/)
|
||||
that is available for variety of operating systems and comes with support
|
||||
for embedded devices.
|
||||
|
||||
More information about the wxWidgets project as a whole
|
||||
can be found at:
|
||||
|
@@ -1,5 +1,5 @@
|
||||
wxWidgets 2.8.0 for Motif installation
|
||||
------------------------------------
|
||||
wxWidgets for Motif installation
|
||||
--------------------------------
|
||||
|
||||
IMPORTANT NOTE:
|
||||
|
||||
@@ -11,7 +11,7 @@ IMPORTANT NOTE:
|
||||
|
||||
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.0, gcc 2.95.4, Redhat 6.1
|
||||
example: wxMotif 2.8.1, gcc 2.95.4, Redhat 6.1
|
||||
|
||||
First steps
|
||||
-----------
|
||||
|
@@ -1,8 +1,7 @@
|
||||
|
||||
Welcome to wxWidgets/Motif 2.8.0
|
||||
Welcome to wxWidgets/Motif
|
||||
|
||||
You have downloaded version 2.8.0 of the Motif port of
|
||||
the wxWidgets GUI library.
|
||||
You have downloaded the Motif port of the wxWidgets GUI library.
|
||||
|
||||
More information about the wxWidgets project as a whole
|
||||
can be found at:
|
||||
|
@@ -1,7 +1,7 @@
|
||||
Installing wxWidgets 2.8.0
|
||||
Installing wxWidgets for Windows
|
||||
-----------------------------------------------------------
|
||||
|
||||
This is wxWidgets 2.8.0 for Microsoft Windows 9x/ME, Windows NT,
|
||||
This is wxWidgets for Microsoft Windows 9x/ME, Windows NT,
|
||||
Windows 2000, Windows XP and Windows CE.
|
||||
|
||||
These installation notes can be found in docs/msw/install.txt
|
||||
@@ -79,21 +79,21 @@ build ('d'). Last component of them name is name of wxWidgets component
|
||||
"Configuring the build" below). This is a typical set of release ANSI build
|
||||
libraries (release versions on left, debug on right side):
|
||||
|
||||
wxbase25.lib wxbase25d.lib
|
||||
wxbase25_net.lib wxbase25d_net.lib
|
||||
wxbase25_xml.lib wxbase25d_xml.lib
|
||||
wxmsw25_core.lib wxmsw25d_core.lib
|
||||
wxmsw25_html.lib wxmsw25d_html.lib
|
||||
wxmsw25_adv.lib wxmsw25d_adv.lib
|
||||
wxbase28.lib wxbase28d.lib
|
||||
wxbase28_net.lib wxbase28d_net.lib
|
||||
wxbase28_xml.lib wxbase28d_xml.lib
|
||||
wxmsw28_core.lib wxmsw28d_core.lib
|
||||
wxmsw28_html.lib wxmsw28d_html.lib
|
||||
wxmsw28_adv.lib wxmsw28d_adv.lib
|
||||
|
||||
Their Unicode debug counterparts in wxUniversal build would be
|
||||
|
||||
wxbase25ud.lib
|
||||
wxbase25ud_net.lib
|
||||
wxbase25ud_xml.lib (notice these libs are same for wxUniv and wxMSW)
|
||||
wxmswuniv25ud_core.lib
|
||||
wxmswuniv25ud_html.lib
|
||||
wxmswuniv25ud_adv.lib
|
||||
wxbase28ud.lib
|
||||
wxbase28ud_net.lib
|
||||
wxbase28ud_xml.lib (notice these libs are same for wxUniv and wxMSW)
|
||||
wxmswuniv28ud_core.lib
|
||||
wxmswuniv28ud_html.lib
|
||||
wxmswuniv28ud_adv.lib
|
||||
|
||||
These directories also contain subdirectory with wx/setup.h header. This
|
||||
subdirectory is named after port, Unicode, wxUniv and debug settings and
|
||||
@@ -368,7 +368,7 @@ Metrowerks CodeWarrior compilation
|
||||
** The authoritative list of files is in build/bakefiles/files.bkl
|
||||
|
||||
1. CodeWarrior Pro 7 project files in XML format are already
|
||||
included in wxMSW-2.8.0.zip and the setup version.
|
||||
included in wxMSW-2.8.x.zip and the setup version.
|
||||
|
||||
2. Review the file include\wx\msw\setup.h (or include\wx\msw\setup0.h if
|
||||
you are working from the CVS version) to make sure the settings reflect
|
||||
@@ -714,7 +714,7 @@ USE_GUI=0
|
||||
you should set wxUSE_GUI to 1 in setup.h.
|
||||
|
||||
USE_OPENGL=1
|
||||
Build wxmsw25_gl.lib library with OpenGL integration class wxGLCanvas.
|
||||
Build wxmsw28_gl.lib library with OpenGL integration class wxGLCanvas.
|
||||
You must also modify your setup.h to #define wxUSE_GLCANVAS 1. Note that
|
||||
OpenGL library is always built as additional library, even in monolithic
|
||||
build!
|
||||
@@ -766,9 +766,9 @@ VENDOR=<your company name>
|
||||
distribute wxWidgets DLLs with your application. Default value is 'custom'.
|
||||
This string is included as part of DLL name. wxWidgets DLLs contain compiler
|
||||
name, version information and vendor name in them. For example
|
||||
wxmsw250_core_bcc_custom.dll is one of DLLs build using Borland C++ with
|
||||
wxmsw280_core_bcc_custom.dll is one of DLLs build using Borland C++ with
|
||||
default settings. If you set VENDOR=mycorp, the name will change to
|
||||
wxmsw250_core_bcc_mycorp.dll.
|
||||
wxmsw280_core_bcc_mycorp.dll.
|
||||
|
||||
CFG=<configuration name>
|
||||
Sets configuration name so that you can have multiple wxWidgets builds with
|
||||
|
@@ -1,11 +1,11 @@
|
||||
|
||||
=================================================
|
||||
Welcome to wxWidgets/CE 2.8.0
|
||||
Welcome to wxWidgets/CE
|
||||
=================================================
|
||||
|
||||
You have downloaded version 2.8.0 of the Windows CE port of
|
||||
the wxWidgets GUI library. This runs on Pocket PC 2002/2003,
|
||||
Smartphone 2002/2003, Windows CE .NET 4.x, and Windows Mobile 5.
|
||||
You have downloaded the Windows CE port of the wxWidgets GUI library.
|
||||
This runs on Pocket PC 2002/2003, Smartphone 2002/2003,
|
||||
Windows CE .NET 4.x, and Windows Mobile 5.
|
||||
|
||||
More information about the wxWidgets project as a whole
|
||||
can be found at:
|
||||
|
@@ -1,7 +1,7 @@
|
||||
Installing wxWidgets 2.8.0
|
||||
--------------------------
|
||||
Installing wxWidgets
|
||||
--------------------
|
||||
|
||||
This is wxWidgets 2.8.0 for IBM OS/2 Warp3 and Warp4. This is an unstable
|
||||
This is wxWidgets for IBM OS/2 Warp3 and Warp4. This is an unstable
|
||||
development release and OS/2 is considered to be in beta.
|
||||
|
||||
IMPORTANT NOTE: If you experience problems installing, please
|
||||
|
@@ -1,4 +1,4 @@
|
||||
wxWidgets 2.8.0
|
||||
wxWidgets 2.8.1
|
||||
---------------------------------------------------------
|
||||
|
||||
Welcome to wxWidgets, a sophisticated cross-platform C++
|
||||
@@ -153,5 +153,5 @@ web site.
|
||||
|
||||
Have fun!
|
||||
|
||||
The wxWidgets Team, December 2006
|
||||
The wxWidgets Team, January 2007
|
||||
|
||||
|
@@ -12,12 +12,15 @@
|
||||
{wx}/include/wx/version.h
|
||||
{wx}/include/msvc/wx/setup.h
|
||||
{wx}/src/wxvc_dll.dsp
|
||||
{wx}/docs/latex/wx/manual.tex
|
||||
{wx}/docs/changes.txt
|
||||
{wx}/docs/gtk/changes.txt
|
||||
{wx}/build/bakefiles/wxpresets/presets/wx_win32.bkl
|
||||
{wx}/build/script/win_docs.bat {windows doc and setup file}
|
||||
{wx}/distrib/scripts/build-environ.cfg {cvs tar and zip files}
|
||||
|
||||
|
||||
The script misc/scripts/inc_release can be used for incrementing
|
||||
the release field of the version, i.e. changing 2.8.x to 2.8.x+1.
|
||||
|
||||
2. When to update the version numbers:
|
||||
|
||||
@@ -31,6 +34,12 @@
|
||||
Version: $Id$
|
||||
|
||||
$Log$
|
||||
Revision 1.10 2007/01/07 22:28:07 VZ
|
||||
also update manual.tex
|
||||
|
||||
Revision 1.9 2007/01/07 21:34:40 VZ
|
||||
added a script to update release version field
|
||||
|
||||
Revision 1.8 2006/11/12 20:13:09 VZ
|
||||
removed obsolete src/make*.env files
|
||||
|
||||
|
@@ -1,9 +1,9 @@
|
||||
Binary Compatability and wxWidgets
|
||||
Binary Compatibility and wxWidgets
|
||||
==================================
|
||||
0. Purpose
|
||||
----------
|
||||
|
||||
This is broad technote covering all aspects of binary compatability with
|
||||
This is broad technote covering all aspects of binary compatibility with
|
||||
wxWidgets.
|
||||
|
||||
1. Releases
|
||||
@@ -21,38 +21,70 @@ Major Minor Release
|
||||
|
||||
(I.E. Major.Minor.Release).
|
||||
|
||||
All Release versions where the Minor is EVEN (2.4.x,2.6.x
|
||||
etc. ODD minors are development versions) are expected to be binary
|
||||
compatable. Note that this means FORWARD binary compatability only -
|
||||
new methods to classes are ok as long as they arn't virtual, etc.
|
||||
All versions with EVEN minor version component (e.g. 2.4.x, 2.6.x etc.)
|
||||
are expected to be binary compatible (ODD minors are development versions
|
||||
and the compatibility constraints don't apply to them). Note that by
|
||||
preserving binary compatibility we mean BACKWARDS compatibility only,
|
||||
meaning that applications built with old wxWidgets headers should continue
|
||||
to work with new wxWidgets (shared/dynamic) libraries without the need to
|
||||
rebuild. There is no requirement to preserve compatibility in the other
|
||||
direction (i.e. make new headers compatible with old libraries) as this
|
||||
would preclude any additions whatsoever to the stable branch. But see
|
||||
also section (4).
|
||||
|
||||
2. What kind of changes are NOT binary compatable
|
||||
|
||||
2. What kind of changes are NOT binary compatible
|
||||
-------------------------------------------------
|
||||
|
||||
If its still up, the KDE guide is a good reference:
|
||||
http://developer.kde.org/documentation/other/binarycompatibility.html
|
||||
|
||||
The changes that are NOT binary compatable:
|
||||
The changes that are NOT binary compatible:
|
||||
- Adding a virtual function
|
||||
- Changing the name of a any function or variable
|
||||
- Changing the signature of a virtual function (adding a parameter,
|
||||
even a default one)
|
||||
- Changing the order of the virtual functions in a class
|
||||
["switching" them, etc.]
|
||||
- Changing access privalages to a function (protected to private etc.)
|
||||
[unlike KDE we need to support windows so this is not allowed]
|
||||
- Changing access privileges of a function: some compilers (among which MSVC)
|
||||
use the function access specifier in its mangled name. Moreover, while
|
||||
changing a private function to public should be compatible (as the old
|
||||
symbol can't be referenced from outside the library anyhow), changing a
|
||||
virtual private function to public is NOT compatible because the old symbol
|
||||
is referenced by the virtual tables in the executable code and so an old
|
||||
program compiled with MSVC wouldn't start up with a new DLL even if it
|
||||
doesn't use the affected symbol at all!
|
||||
- Adding a member variable
|
||||
- Changing the order of non-static member variables
|
||||
|
||||
|
||||
3. wxABI_VERSION and BACKWARD binary compatability
|
||||
3. Changes which are compatible
|
||||
-------------------------------
|
||||
|
||||
- Adding a new class
|
||||
- Adding a new non-virtual method to an existing class
|
||||
- Overriding the implementation of an existing virtual function
|
||||
[this is considered to be backwards binary compatible until we find a
|
||||
counter example; currently it's known to work with Apple gcc at least]
|
||||
- Anything which doesn't result in ABI change at all, e.g. adding new
|
||||
macros, constants and, of course, private changes in the implementation
|
||||
|
||||
|
||||
4. wxABI_VERSION and "forward" binary compatibility
|
||||
--------------------------------------------------
|
||||
|
||||
As mentioned we do not support BACKWARD binary compatability.
|
||||
As mentioned we do not support "forward" binary compatibility, that is the
|
||||
ability to run applications compiled with new wxWidgets headers on systems
|
||||
with old wxWidgets libraries.
|
||||
|
||||
However, for this purpose we have the macro wxABI_VERSION. All
|
||||
new symbols added to binary compatable releases are to be ifed
|
||||
with wxABI_VERSION.
|
||||
However, for the developers who want to ensure that their application works
|
||||
with some fixed old wxWidgets version and doesn't (inadvertently) require
|
||||
features added in later releases, we provide the macro wxABI_VERSION which
|
||||
can be defined to restrict the API exported by wxWidgets headers to that of
|
||||
a fixed old release.
|
||||
|
||||
For this to work, all new symbols added to binary compatible releases must
|
||||
be #if'ed with wxABI_VERSION.
|
||||
|
||||
The layout of wxABI_VERSION is as follows:
|
||||
|
||||
@@ -63,7 +95,7 @@ where
|
||||
2 06 02
|
||||
Major Minor Release
|
||||
|
||||
I.E. it corresponds to the wxWidgets release in {1}.
|
||||
I.E. it corresponds to the wxWidgets release in (1).
|
||||
|
||||
An example of using wxABI_VERSION is as follows for symbols
|
||||
only in a 2.6.2 release:
|
||||
@@ -86,10 +118,10 @@ bool LoadURIWithProxy(const wxString& fileName, const wxString& proxy)
|
||||
#endif
|
||||
|
||||
|
||||
4. Workarounds for adding virtual functions
|
||||
5. Workarounds for adding virtual functions
|
||||
-------------------------------------------
|
||||
|
||||
Originally the idea for adding virtual functions to binary compatable
|
||||
Originally the idea for adding virtual functions to binary compatible
|
||||
releases was to pad out some empty "reserved" functions and then
|
||||
rename those later when someone needed to add a virtual function.
|
||||
|
||||
@@ -115,7 +147,7 @@ is a wxShadowObjectMethod which is a typedef:
|
||||
typedef int (*wxShadowObjectMethod)(void*, void*);
|
||||
|
||||
After you add a field, you can set it via SetField with the same
|
||||
params as AddField, the second param being the value to set
|
||||
parameters as AddField, the second parameter being the value to set
|
||||
the field to. You can get the field after you call AddField
|
||||
via GetField, with the parameters as the other two field functions,
|
||||
only in the case the second parameter is the fallback
|
||||
@@ -130,11 +162,11 @@ parameter passed to the wxShadowObjectMethod, the third is the
|
||||
second parameter passed to that wxShadowObjectMethod, and the
|
||||
fourth is the return value of the wxShadowObjectMethod.
|
||||
|
||||
5. version-script.in
|
||||
6. version-script.in
|
||||
--------------------
|
||||
|
||||
For ld/libtool we use sun-style version scripts. Basically
|
||||
anything which fits the conditions of being ifed via wxABI_VERSION
|
||||
anything which fits the conditions of being #if'ed via wxABI_VERSION
|
||||
needs to go here also.
|
||||
|
||||
See 'info ld scripts version' on a GNU system, it's online here:
|
||||
@@ -175,8 +207,8 @@ For example for wxLogBuffer a line like this:
|
||||
*wxLogBuffer*;
|
||||
|
||||
|
||||
5.5. Checking the version information in libraries and programs
|
||||
---------------------------------------------------------------
|
||||
7. Checking the version information in libraries and programs
|
||||
-------------------------------------------------------------
|
||||
|
||||
On Sun there is a tool for this, see pvs(1). On GNU you can use objdump, below
|
||||
are some examples.
|
||||
@@ -226,18 +258,18 @@ $ objdump -T libwx_based-2.6.so | grep 'WXD_2\.6\.2' | grep -v 'UND\|ABS'
|
||||
00000000000abe10 g DF .text 0000000000000088 WXD_2.6.2 _ZN14wxZipFSHandler7CleanupEv
|
||||
|
||||
|
||||
6. Testing binary compatability between releases
|
||||
8. Testing binary compatibility between releases
|
||||
------------------------------------------------
|
||||
|
||||
An easy way of testing binary compatability is just to build wxWidgets
|
||||
An easy way of testing binary compatibility is just to build wxWidgets
|
||||
in dll/dynamic library mode and then switch out the current library
|
||||
in question with an earlier stable version of the library, then running
|
||||
the application in question again. If it runs OK then there is usually
|
||||
binary compatability between those releases.
|
||||
binary compatibility between those releases.
|
||||
|
||||
You can also break into your debugger or whatever program you want
|
||||
to use and check the memory layout of the class. If it is the same
|
||||
then it is binary compatable.
|
||||
then it is binary compatible.
|
||||
|
||||
Also remember to look at http://www.wxwidgets.org/bincompat.html page which
|
||||
summarizes the results of testing of all the samples built against old
|
||||
|
@@ -1,8 +1,7 @@
|
||||
|
||||
Welcome to wxWidgets/Wine 2.8.0
|
||||
Welcome to wxWidgets/Wine
|
||||
|
||||
You have downloaded version 2.8.0 of the WINE port of
|
||||
the wxWidgets GUI library.
|
||||
You have downloaded the WINE port of the wxWidgets GUI library.
|
||||
|
||||
Information on how to install can be found in the file
|
||||
install.txt.
|
||||
|
@@ -1,5 +1,5 @@
|
||||
wxWidgets 2.8.0 for X11 installation
|
||||
------------------------------------
|
||||
wxWidgets for X11 installation
|
||||
------------------------------
|
||||
|
||||
IMPORTANT NOTE:
|
||||
|
||||
|
@@ -1,11 +1,10 @@
|
||||
|
||||
Welcome to wxWidgets/X11 2.8.0
|
||||
Welcome to wxWidgets/X11
|
||||
|
||||
You have downloaded version 2.8.0 of the X11 port of
|
||||
the wxWidgets GUI library. This runs on X11 with no
|
||||
Motif, Xt, GTK+ or any other standard widget set --
|
||||
instead it uses the wxUniversal widgets. The intention
|
||||
is to have it run on NanoX as well as desktop X11.
|
||||
You have downloaded the X11 port of the wxWidgets GUI library.
|
||||
This runs on X11 with no Motif, Xt, GTK+ or any other standard
|
||||
widget set -- instead it uses the wxUniversal widgets. The
|
||||
intention is to have it run on NanoX as well as desktop X11.
|
||||
|
||||
More information about the wxWidgets project as a whole
|
||||
can be found at:
|
||||
|
@@ -530,7 +530,11 @@ public:
|
||||
int GetSelection() const;
|
||||
|
||||
virtual void Split(size_t page, int direction);
|
||||
|
||||
|
||||
#if wxABI_VERSION >= 20801
|
||||
const wxAuiManager& GetAuiManager() const { return m_mgr; }
|
||||
#endif
|
||||
|
||||
protected:
|
||||
|
||||
// these can be overridden
|
||||
|
@@ -74,7 +74,7 @@ public:
|
||||
virtual bool ProcessEvent(wxEvent& event);
|
||||
|
||||
wxAuiMDIChildFrame *GetActiveChild() const;
|
||||
inline void SetActiveChild(wxAuiMDIChildFrame* pChildFrame);
|
||||
void SetActiveChild(wxAuiMDIChildFrame* pChildFrame);
|
||||
|
||||
wxAuiMDIClientWindow *GetClientWindow() const;
|
||||
virtual wxAuiMDIClientWindow *OnCreateClient();
|
||||
|
@@ -1274,8 +1274,20 @@
|
||||
#define wxUSE_BOOKCTRL (wxUSE_NOTEBOOK || \
|
||||
wxUSE_LISTBOOK || \
|
||||
wxUSE_CHOICEBOOK || \
|
||||
wxUSE_TOOLBOOK || \
|
||||
wxUSE_TREEBOOK)
|
||||
|
||||
#if wxUSE_COLLPANE
|
||||
# if !wxUSE_BUTTON || !wxUSE_STATLINE
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
# error "wxUSE_COLLPANE requires wxUSE_BUTTON and wxUSE_STATLINE"
|
||||
# else
|
||||
# undef wxUSE_COLLPANE
|
||||
# define wxUSE_COLLPANE 0
|
||||
# endif
|
||||
# endif
|
||||
#endif /* wxUSE_COLLPANE */
|
||||
|
||||
#if wxUSE_LISTBOOK
|
||||
# if !wxUSE_LISTCTRL
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
@@ -1298,6 +1310,17 @@
|
||||
# endif
|
||||
#endif /* wxUSE_CHOICEBOOK */
|
||||
|
||||
#if wxUSE_TOOLBOOK
|
||||
# if !wxUSE_TOOLBAR
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
# error "wxToolbook requires wxToolBar"
|
||||
# else
|
||||
# undef wxUSE_TOOLBAR
|
||||
# define wxUSE_TOOLBAR 1
|
||||
# endif
|
||||
# endif
|
||||
#endif /* wxUSE_TOOLBOOK */
|
||||
|
||||
#if !wxUSE_ODCOMBOBOX
|
||||
# if wxUSE_BITMAPCOMBOBOX
|
||||
# error "wxBitmapComboBox requires wxOwnerDrawnComboBox"
|
||||
|
@@ -56,7 +56,8 @@ enum
|
||||
wxCONFIG_USE_LOCAL_FILE = 1,
|
||||
wxCONFIG_USE_GLOBAL_FILE = 2,
|
||||
wxCONFIG_USE_RELATIVE_PATH = 4,
|
||||
wxCONFIG_USE_NO_ESCAPE_CHARACTERS = 8
|
||||
wxCONFIG_USE_NO_ESCAPE_CHARACTERS = 8,
|
||||
wxCONFIG_USE_SUBDIR = 16
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -225,7 +226,7 @@ public:
|
||||
// delete the group (with all subgroups)
|
||||
virtual bool DeleteGroup(const wxString& key) = 0;
|
||||
// delete the whole underlying object (disk file, registry key, ...)
|
||||
// primarly for use by desinstallation routine.
|
||||
// primarily for use by uninstallation routine.
|
||||
virtual bool DeleteAll() = 0;
|
||||
|
||||
// options
|
||||
@@ -254,6 +255,13 @@ protected:
|
||||
static bool IsImmutable(const wxString& key)
|
||||
{ return !key.IsEmpty() && key[0] == wxCONFIG_IMMUTABLE_PREFIX; }
|
||||
|
||||
// return the path without trailing separator, if any: this should be called
|
||||
// to sanitize paths referring to the group names before passing them to
|
||||
// wxConfigPathChanger as "/foo/bar/" should be the same as "/foo/bar" and it
|
||||
// isn't interpreted in the same way by it (and this can't be changed there
|
||||
// as it's not the same for the entries names)
|
||||
static wxString RemoveTrailingSeparator(const wxString& key);
|
||||
|
||||
// do read/write the values of different types
|
||||
virtual bool DoReadString(const wxString& key, wxString *pStr) const = 0;
|
||||
virtual bool DoReadLong(const wxString& key, long *pl) const = 0;
|
||||
|
@@ -639,6 +639,12 @@ public:
|
||||
// resets time to 00:00:00, doesn't change the date
|
||||
wxDateTime& ResetTime();
|
||||
|
||||
#if wxABI_VERSION >= 20802
|
||||
// get the date part of this object only, i.e. the object which has the
|
||||
// same date as this one but time of 00:00:00
|
||||
wxDateTime GetDateOnly() const;
|
||||
#endif // wxABI 2.8.1+
|
||||
|
||||
// the following functions don't change the values of the other
|
||||
// fields, i.e. SetMinute() won't change either hour or seconds value
|
||||
|
||||
@@ -1928,7 +1934,9 @@ inline wxLongLong wxTimeSpan::GetSeconds() const
|
||||
|
||||
inline int wxTimeSpan::GetMinutes() const
|
||||
{
|
||||
return (GetSeconds() / 60l).GetLo();
|
||||
// explicit cast to int suppresses a warning with CodeWarrior and possibly
|
||||
// others (changing the return type to long from int is impossible in 2.8)
|
||||
return (int)((GetSeconds() / 60l).GetLo());
|
||||
}
|
||||
|
||||
inline int wxTimeSpan::GetHours() const
|
||||
|
@@ -31,6 +31,10 @@ public:
|
||||
// returns DirectFB event buffer used by wx
|
||||
static wxIDirectFBEventBufferPtr GetDirectFBEventBuffer();
|
||||
|
||||
// wxYield implementation: iterate the loop as long as there are any
|
||||
// pending events
|
||||
void Yield();
|
||||
|
||||
protected:
|
||||
virtual void WakeUp();
|
||||
virtual void OnNextIteration();
|
||||
|
@@ -73,6 +73,12 @@ public:
|
||||
return true;
|
||||
}
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_6
|
||||
|
||||
wxDEPRECATED( long GetStyle() const );
|
||||
wxDEPRECATED( void SetStyle(long style) );
|
||||
|
||||
#endif // WXWIN_COMPATIBILITY_2_6
|
||||
|
||||
virtual void SetMessage(const wxString& message) { m_message = message; }
|
||||
virtual void SetPath(const wxString& path) { m_path = path; }
|
||||
|
@@ -594,6 +594,12 @@ public:
|
||||
|
||||
const wxList& GetMenus() const { return m_fileMenus; }
|
||||
|
||||
#if wxABI_VERSION >= 20802
|
||||
// Set/get base id
|
||||
void SetBaseId(wxWindowID baseId) { m_idBase = baseId; }
|
||||
wxWindowID GetBaseId() const { return m_idBase; }
|
||||
#endif // wxABI 2.8.2+
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_6
|
||||
// deprecated, use GetCount() instead
|
||||
wxDEPRECATED( size_t GetNoHistoryFiles() const );
|
||||
|
@@ -129,6 +129,14 @@ public:
|
||||
wxArrayString& filters) );
|
||||
#endif // WXWIN_COMPATIBILITY_2_4
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_6
|
||||
|
||||
wxDEPRECATED( long GetStyle() const );
|
||||
wxDEPRECATED( void SetStyle(long style) );
|
||||
|
||||
#endif // WXWIN_COMPATIBILITY_2_6
|
||||
|
||||
|
||||
// Append first extension to filePath from a ';' separated extensionList
|
||||
// if filePath = "path/foo.bar" just return it as is
|
||||
// if filePath = "foo[.]" and extensionList = "*.jpg;*.png" return "foo.jpg"
|
||||
|
@@ -295,8 +295,8 @@ enum wxFileKind
|
||||
#define wxOpen _wopen
|
||||
#endif
|
||||
#define wxAccess _waccess
|
||||
#define wxMkDir _mkdir
|
||||
#define wxRmDir _rmdir
|
||||
#define wxMkDir _wmkdir
|
||||
#define wxRmDir _wrmdir
|
||||
#ifdef wxHAS_HUGE_FILES
|
||||
#define wxStat _wstati64
|
||||
#else
|
||||
|
@@ -157,6 +157,9 @@ enum wxStockCursor
|
||||
#elif defined(__WXMGL__)
|
||||
// Initialize from an included XPM
|
||||
#define wxICON(X) wxIcon( (const char**) X##_xpm )
|
||||
#elif defined(__WXDFB__)
|
||||
// Initialize from an included XPM
|
||||
#define wxICON(X) wxIcon( (const char**) X##_xpm )
|
||||
#elif defined(__WXGTK__)
|
||||
// Initialize from an included XPM
|
||||
#define wxICON(X) wxIcon( (const char**) X##_xpm )
|
||||
@@ -185,6 +188,7 @@ enum wxStockCursor
|
||||
defined(__WXX11__) || \
|
||||
defined(__WXMAC__) || \
|
||||
defined(__WXMGL__) || \
|
||||
defined(__WXDFB__) || \
|
||||
defined(__WXCOCOA__)
|
||||
// Initialize from an included XPM
|
||||
#define wxBITMAP(name) wxBitmap( (const char**) name##_xpm )
|
||||
@@ -483,7 +487,7 @@ public:
|
||||
};
|
||||
|
||||
#if WXWIN_COMPATIBILITY_2_6
|
||||
inline bool wxRect::Inside(int x, int y) const { return Contains(x, y); }
|
||||
inline bool wxRect::Inside(int cx, int cy) const { return Contains(cx, cy); }
|
||||
inline bool wxRect::Inside(const wxPoint& pt) const { return Contains(pt); }
|
||||
inline bool wxRect::Inside(const wxRect& rect) const { return Contains(rect); }
|
||||
#endif // WXWIN_COMPATIBILITY_2_6
|
||||
|
@@ -12,8 +12,6 @@
|
||||
#ifndef _WX_COLLAPSABLE_PANE_H_GENERIC_
|
||||
#define _WX_COLLAPSABLE_PANE_H_GENERIC_
|
||||
|
||||
#if wxUSE_BUTTON && wxUSE_STATLINE
|
||||
|
||||
// forward declared
|
||||
class WXDLLEXPORT wxButton;
|
||||
class WXDLLEXPORT wxStaticLine;
|
||||
@@ -104,5 +102,4 @@ private:
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
#endif // wxUSE_BUTTON && wxUSE_STATLINE
|
||||
#endif // _WX_COLLAPSABLE_PANE_H_GENERIC_
|
||||
|
@@ -9,8 +9,8 @@
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef __SPLITTERH_G__
|
||||
#define __SPLITTERH_G__
|
||||
#ifndef _WX_GENERIC_SPLITTER_H_
|
||||
#define _WX_GENERIC_SPLITTER_H_
|
||||
|
||||
#include "wx/window.h" // base class declaration
|
||||
#include "wx/containr.h" // wxControlContainer
|
||||
@@ -226,7 +226,7 @@ protected:
|
||||
|
||||
// send the given event, return false if the event was processed and vetoed
|
||||
// by the user code
|
||||
inline bool DoSendEvent(wxSplitterEvent& event);
|
||||
bool DoSendEvent(wxSplitterEvent& event);
|
||||
|
||||
// common part of all ctors
|
||||
void Init();
|
||||
@@ -403,4 +403,4 @@ typedef void (wxEvtHandler::*wxSplitterEventFunction)(wxSplitterEvent&);
|
||||
#define EVT_SPLITTER_UNSPLIT(id, fn) \
|
||||
wx__DECLARE_SPLITTEREVT(UNSPLIT, id, fn)
|
||||
|
||||
#endif // __SPLITTERH_G__
|
||||
#endif // _WX_GENERIC_SPLITTER_H_
|
||||
|
@@ -2,9 +2,8 @@
|
||||
// Name: wx/generic/srchctlg.h
|
||||
// Purpose: generic wxSearchCtrl class
|
||||
// Author: Vince Harron
|
||||
// Modified by:
|
||||
// Created: 2006-02-19
|
||||
// RCS-ID:
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: Vince Harron
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@@ -14,37 +13,11 @@
|
||||
|
||||
#if wxUSE_SEARCHCTRL
|
||||
|
||||
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
|
||||
#pragma interface "srchctlg.h"
|
||||
#endif
|
||||
|
||||
#include "wx/bitmap.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxSearchButton;
|
||||
class WXDLLEXPORT wxSearchTextCtrl;
|
||||
|
||||
class WXDLLEXPORT wxSearchCtrlBase : public wxTextCtrlBase
|
||||
{
|
||||
public:
|
||||
wxSearchCtrlBase() {}
|
||||
virtual ~wxSearchCtrlBase() {}
|
||||
|
||||
// search control
|
||||
virtual void SetMenu( wxMenu* menu ) = 0;
|
||||
virtual wxMenu* GetMenu() = 0;
|
||||
|
||||
|
||||
// get/set options
|
||||
virtual void SetSearchButtonVisible( bool show ) = 0;
|
||||
virtual bool GetSearchButtonVisible() const = 0;
|
||||
|
||||
virtual void SetCancelButtonVisible( bool show ) = 0;
|
||||
virtual bool GetCancelButtonVisible() const = 0;
|
||||
protected:
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxSearchCtrl is a combination of wxTextCtrl and wxSearchButton
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -64,7 +37,7 @@ public:
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxSearchCtrlNameStr);
|
||||
|
||||
~wxSearchCtrl();
|
||||
virtual ~wxSearchCtrl();
|
||||
|
||||
bool Create(wxWindow *parent, wxWindowID id,
|
||||
const wxString& value = wxEmptyString,
|
||||
@@ -78,14 +51,20 @@ public:
|
||||
// --------------------------
|
||||
virtual void SetMenu( wxMenu* menu );
|
||||
virtual wxMenu* GetMenu();
|
||||
|
||||
|
||||
// get/set search options
|
||||
// ----------------------
|
||||
virtual void SetSearchButtonVisible( bool show );
|
||||
virtual bool GetSearchButtonVisible() const;
|
||||
virtual void ShowSearchButton( bool show );
|
||||
virtual bool IsSearchButtonVisible() const;
|
||||
|
||||
virtual void SetCancelButtonVisible( bool show );
|
||||
virtual bool GetCancelButtonVisible() const;
|
||||
virtual void ShowCancelButton( bool show );
|
||||
virtual bool IsCancelButtonVisible() const;
|
||||
|
||||
#if wxABI_VERSION >= 20802
|
||||
// TODO: In 2.9 these should probably be virtual, and declared in the base class...
|
||||
void SetDescriptiveText(const wxString& text);
|
||||
wxString GetDescriptiveText() const;
|
||||
#endif
|
||||
|
||||
// accessors
|
||||
// ---------
|
||||
@@ -239,7 +218,8 @@ protected:
|
||||
virtual void OnSearchButton( wxCommandEvent& event );
|
||||
|
||||
void OnSetFocus( wxFocusEvent& event );
|
||||
|
||||
void OnSize( wxSizeEvent& event );
|
||||
|
||||
private:
|
||||
friend class wxSearchButton;
|
||||
|
||||
|
@@ -181,16 +181,18 @@ private:
|
||||
static BaseListType EmptyList; \
|
||||
\
|
||||
bool m_destroy; \
|
||||
\
|
||||
public: \
|
||||
decl compatibility_iterator \
|
||||
{ \
|
||||
private: \
|
||||
/* Workaround for broken VC6 nested class name resolution */ \
|
||||
typedef std::list<elT>::iterator iterator; \
|
||||
friend class liT; \
|
||||
private: \
|
||||
/* Workaround for broken VC6 nested class name resolution */ \
|
||||
typedef std::list<elT>::iterator iterator; \
|
||||
friend class liT; \
|
||||
\
|
||||
iterator m_iter; \
|
||||
liT * m_list; \
|
||||
\
|
||||
public: \
|
||||
compatibility_iterator() \
|
||||
: m_iter(EmptyList.end()), m_list( NULL ) {} \
|
||||
@@ -338,6 +340,9 @@ private:
|
||||
void Sort( wxSortCompareFunction compfunc ) \
|
||||
{ sort( WX_LIST_SORTFUNCTION( elT, compfunc ) ); } \
|
||||
~liT() { Clear(); } \
|
||||
\
|
||||
/* It needs access to our EmptyList */ \
|
||||
friend decl compatibility_iterator; \
|
||||
}
|
||||
|
||||
#define WX_DECLARE_LIST(elementtype, listname) \
|
||||
|
@@ -65,6 +65,7 @@ public:
|
||||
const wxString& name = wxEmptyString);
|
||||
|
||||
|
||||
// overridden base class methods
|
||||
virtual int GetSelection() const;
|
||||
virtual bool SetPageText(size_t n, const wxString& strText);
|
||||
virtual wxString GetPageText(size_t n) const;
|
||||
@@ -78,6 +79,7 @@ public:
|
||||
int imageId = -1);
|
||||
virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); }
|
||||
virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }
|
||||
virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
|
||||
virtual void SetImageList(wxImageList *imageList);
|
||||
|
||||
virtual bool DeleteAllPages();
|
||||
@@ -90,9 +92,6 @@ protected:
|
||||
// get the size which the list control should have
|
||||
virtual wxSize GetControllerSize() const;
|
||||
|
||||
// return the page corresponding to the tab at the specified position
|
||||
virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
|
||||
|
||||
void UpdateSelectedPage(size_t newsel);
|
||||
|
||||
wxBookCtrlBaseEvent* CreatePageChangingEvent() const;
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user