Skip to content

Commit d895424

Browse files
ywxywx
committed
support both wxToolBar and wxAuiToolBar for wx2.8 on windows
support wxAuiToolBar for wx2.8 on gtk2 support wxToolBar for wx3.0 on gtk2 fix assert item failed in wxMenu::Destroy()
1 parent 24b54c0 commit d895424

7 files changed

+327
-354
lines changed

‎cbDiff-src.cbp

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
2+
<CodeBlocks_project_file>
3+
<FileVersion major="1" minor="6" />
4+
<Project>
5+
<Option title="cbDiff src release" />
6+
<Option pch_mode="2" />
7+
<Option compiler="gcc" />
8+
<Build>
9+
<Target title="src-release">
10+
<Option output="cbDiff" prefix_auto="1" extension_auto="1" />
11+
<Option type="0" />
12+
<Option compiler="gcc" />
13+
<ExtraCommands>
14+
<Add after="zip -r9 cbDiff_1.01.1-src.zip src/*" />
15+
<Add after="zip -r9 cbDiff_1.01.1-src.zip wxsmith/*" />
16+
<Add after="zip -r9 cbDiff_1.01.1-src.zip dtl-1.12/*" />
17+
<Add after="zip -r9 cbDiff_1.01.1-src.zip images/*" />
18+
<Add after="zip -j9 cbDiff_1.01.1-src.zip cbDiff.cbp" />
19+
<Add after="zip -j9 cbDiff_1.01.1-src.zip cbDiff-unix.cbp" />
20+
<Add after="zip -j9 cbDiff_1.01.1-src.zip cbDiff-src.cbp" />
21+
<Add after="zip -j9 cbDiff_1.01.1-src.zip COPYING" />
22+
<Add after="zip -j9 cbDiff_1.01.1-src.zip manifest.xml" />
23+
<Add after="zip -j9 cbDiff_1.01.1-src.zip README" />
24+
<Mode after="always" />
25+
</ExtraCommands>
26+
</Target>
27+
</Build>
28+
</Project>
29+
</CodeBlocks_project_file>

‎cbDiff-unix.cbp

+82-140
Original file line numberDiff line numberDiff line change
@@ -57,152 +57,94 @@
5757
<Mode after="always" />
5858
</ExtraCommands>
5959
</Target>
60-
<Target title="src-release">
61-
<Option output="cbDiff" prefix_auto="1" extension_auto="1" />
62-
<Option type="0" />
60+
<Target title="Unix-release-auiToolBar">
61+
<Option output="bin/unix/release-auiToolBar/cbDiff" prefix_auto="0" extension_auto="1" />
62+
<Option object_output=".objs/unix/release-auiToolBar" />
63+
<Option type="3" />
6364
<Option compiler="gcc" />
65+
<Option host_application="codeblocks" />
66+
<Compiler>
67+
<Add option="-std=c++11" />
68+
<Add option="-Wall" />
69+
<Add option="-O2" />
70+
<Add option="`pkg-config --cflags codeblocks`" />
71+
<Add option="`wx-config --cflags`" />
72+
<Add option="-fPIC" />
73+
<Add option="-DEXPORT_FUNC" />
74+
<Add option="-DUseWxAuiToolbar" />
75+
</Compiler>
76+
<Linker>
77+
<Add option="-s" />
78+
<Add option="`pkg-config --libs codeblocks`" />
79+
<Add option="`wx-config --libs`" />
80+
<Add option="`wx-config --optional-libs aui`" />
81+
</Linker>
6482
<ExtraCommands>
65-
<Add after="zip -j9 cbDiff_1.01.1-src.zip src/*" />
66-
<Add after="zip -j9 cbDiff_1.01.1-src.zip wxsmith/*" />
67-
<Add after="zip -j9 cbDiff_1.01.1-src.zip dtl-1.12/*" />
68-
<Add after="zip -j9 cbDiff_1.01.1-src.zip images/*" />
69-
<Add after="zip -j9 cbDiff_1.01.1-src.zip cbDiff.cbp" />
70-
<Add after="zip -j9 cbDiff_1.01.1-src.zip cbDiff-unix.cbp" />
71-
<Add after="zip -j9 cbDiff_1.01.1-src.zip COPYING" />
72-
<Add after="zip -j9 cbDiff_1.01.1-src.zip manifest.xml" />
73-
<Add after="zip -j9 cbDiff_1.01.1-src.zip README" />
83+
<Add after="zip -j9 $(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).zip manifest.xml" />
84+
<Add after="zip -j9 $(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).cbplugin $(TARGET_OUTPUT_FILE) $(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).zip" />
85+
<Mode after="always" />
86+
</ExtraCommands>
87+
</Target>
88+
<Target title="Unix-release-wxToolBar">
89+
<Option output="bin/unix/release-wxToolBar/cbDiff" prefix_auto="0" extension_auto="1" />
90+
<Option object_output=".objs/unix/release-wxToolBar" />
91+
<Option type="3" />
92+
<Option compiler="gcc" />
93+
<Option host_application="codeblocks" />
94+
<Compiler>
95+
<Add option="-std=c++11" />
96+
<Add option="-Wall" />
97+
<Add option="-O2" />
98+
<Add option="`pkg-config --cflags codeblocks`" />
99+
<Add option="`wx-config --cflags`" />
100+
<Add option="-fPIC" />
101+
<Add option="-DEXPORT_FUNC" />
102+
<Add option="-DUseWxToolbar" />
103+
</Compiler>
104+
<Linker>
105+
<Add option="-s" />
106+
<Add option="`pkg-config --libs codeblocks`" />
107+
<Add option="`wx-config --libs`" />
108+
</Linker>
109+
<ExtraCommands>
110+
<Add after="zip -j9 $(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).zip manifest.xml" />
111+
<Add after="zip -j9 $(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).cbplugin $(TARGET_OUTPUT_FILE) $(TARGET_OUTPUT_DIR)$(TARGET_OUTPUT_BASENAME).zip" />
74112
<Mode after="always" />
75113
</ExtraCommands>
76114
</Target>
77115
</Build>
78-
<Unit filename="images/reload.h">
79-
<Option target="Unix" />
80-
<Option target="Unix-release" />
81-
</Unit>
82-
<Unit filename="images/sidebyside.h">
83-
<Option target="Unix" />
84-
<Option target="Unix-release" />
85-
</Unit>
86-
<Unit filename="images/swap.h">
87-
<Option target="Unix" />
88-
<Option target="Unix-release" />
89-
</Unit>
90-
<Unit filename="images/table.h">
91-
<Option target="Unix" />
92-
<Option target="Unix-release" />
93-
</Unit>
94-
<Unit filename="images/unified.h">
95-
<Option target="Unix" />
96-
<Option target="Unix-release" />
97-
</Unit>
98-
<Unit filename="manifest.xml">
99-
<Option target="Unix" />
100-
<Option target="Unix-release" />
101-
</Unit>
102-
<Unit filename="src/cbDiff.cpp">
103-
<Option target="Unix" />
104-
<Option target="Unix-release" />
105-
</Unit>
106-
<Unit filename="src/cbDiff.h">
107-
<Option target="Unix" />
108-
<Option target="Unix-release" />
109-
</Unit>
110-
<Unit filename="src/cbDiffConfigPanel.cpp">
111-
<Option target="Unix" />
112-
<Option target="Unix-release" />
113-
</Unit>
114-
<Unit filename="src/cbDiffConfigPanel.h">
115-
<Option target="Unix" />
116-
<Option target="Unix-release" />
117-
</Unit>
118-
<Unit filename="src/cbDiffCtrl.cpp">
119-
<Option target="Unix" />
120-
<Option target="Unix-release" />
121-
</Unit>
122-
<Unit filename="src/cbDiffCtrl.h">
123-
<Option target="Unix" />
124-
<Option target="Unix-release" />
125-
</Unit>
126-
<Unit filename="src/cbDiffEditor.cpp">
127-
<Option target="Unix" />
128-
<Option target="Unix-release" />
129-
</Unit>
130-
<Unit filename="src/cbDiffEditor.h">
131-
<Option target="Unix" />
132-
<Option target="Unix-release" />
133-
</Unit>
134-
<Unit filename="src/cbDiffMenu.cpp">
135-
<Option target="Unix" />
136-
<Option target="Unix-release" />
137-
</Unit>
138-
<Unit filename="src/cbDiffMenu.h">
139-
<Option target="Unix" />
140-
<Option target="Unix-release" />
141-
</Unit>
142-
<Unit filename="src/cbDiffSelectFiles.cpp">
143-
<Option target="Unix" />
144-
<Option target="Unix-release" />
145-
</Unit>
146-
<Unit filename="src/cbDiffSelectFiles.h">
147-
<Option target="Unix" />
148-
<Option target="Unix-release" />
149-
</Unit>
150-
<Unit filename="src/cbDiffToolbar.cpp">
151-
<Option target="Unix" />
152-
<Option target="Unix-release" />
153-
</Unit>
154-
<Unit filename="src/cbDiffToolbar.h">
155-
<Option target="Unix" />
156-
<Option target="Unix-release" />
157-
</Unit>
158-
<Unit filename="src/cbDiffUtils.cpp">
159-
<Option target="Unix" />
160-
<Option target="Unix-release" />
161-
</Unit>
162-
<Unit filename="src/cbDiffUtils.h">
163-
<Option target="Unix" />
164-
<Option target="Unix-release" />
165-
</Unit>
166-
<Unit filename="src/cbSideBySideCtrl.cpp">
167-
<Option target="Unix" />
168-
<Option target="Unix-release" />
169-
</Unit>
170-
<Unit filename="src/cbSideBySideCtrl.h">
171-
<Option target="Unix" />
172-
<Option target="Unix-release" />
173-
</Unit>
174-
<Unit filename="src/cbTableCtrl.cpp">
175-
<Option target="Unix" />
176-
<Option target="Unix-release" />
177-
</Unit>
178-
<Unit filename="src/cbTableCtrl.h">
179-
<Option target="Unix" />
180-
<Option target="Unix-release" />
181-
</Unit>
182-
<Unit filename="src/cbUnifiedCtrl.cpp">
183-
<Option target="Unix" />
184-
<Option target="Unix-release" />
185-
</Unit>
186-
<Unit filename="src/cbUnifiedCtrl.h">
187-
<Option target="Unix" />
188-
<Option target="Unix-release" />
189-
</Unit>
190-
<Unit filename="src/wxDiff.cpp">
191-
<Option target="Unix" />
192-
<Option target="Unix-release" />
193-
</Unit>
194-
<Unit filename="src/wxDiff.h">
195-
<Option target="Unix" />
196-
<Option target="Unix-release" />
197-
</Unit>
198-
<Unit filename="wxsmith/cbDiffConfigPanel.wxs">
199-
<Option target="Unix" />
200-
<Option target="Unix-release" />
201-
</Unit>
202-
<Unit filename="wxsmith/cbDiffSelectFiles.wxs">
203-
<Option target="Unix" />
204-
<Option target="Unix-release" />
205-
</Unit>
116+
<Unit filename="images/reload.h" />
117+
<Unit filename="images/sidebyside.h" />
118+
<Unit filename="images/swap.h" />
119+
<Unit filename="images/table.h" />
120+
<Unit filename="images/unified.h" />
121+
<Unit filename="manifest.xml" />
122+
<Unit filename="src/cbDiff.cpp" />
123+
<Unit filename="src/cbDiff.h" />
124+
<Unit filename="src/cbDiffConfigPanel.cpp" />
125+
<Unit filename="src/cbDiffConfigPanel.h" />
126+
<Unit filename="src/cbDiffCtrl.cpp" />
127+
<Unit filename="src/cbDiffCtrl.h" />
128+
<Unit filename="src/cbDiffEditor.cpp" />
129+
<Unit filename="src/cbDiffEditor.h" />
130+
<Unit filename="src/cbDiffMenu.cpp" />
131+
<Unit filename="src/cbDiffMenu.h" />
132+
<Unit filename="src/cbDiffSelectFiles.cpp" />
133+
<Unit filename="src/cbDiffSelectFiles.h" />
134+
<Unit filename="src/cbDiffToolbar.cpp" />
135+
<Unit filename="src/cbDiffToolbar.h" />
136+
<Unit filename="src/cbDiffUtils.cpp" />
137+
<Unit filename="src/cbDiffUtils.h" />
138+
<Unit filename="src/cbSideBySideCtrl.cpp" />
139+
<Unit filename="src/cbSideBySideCtrl.h" />
140+
<Unit filename="src/cbTableCtrl.cpp" />
141+
<Unit filename="src/cbTableCtrl.h" />
142+
<Unit filename="src/cbUnifiedCtrl.cpp" />
143+
<Unit filename="src/cbUnifiedCtrl.h" />
144+
<Unit filename="src/wxDiff.cpp" />
145+
<Unit filename="src/wxDiff.h" />
146+
<Unit filename="wxsmith/cbDiffConfigPanel.wxs" />
147+
<Unit filename="wxsmith/cbDiffSelectFiles.wxs" />
206148
<Extensions>
207149
<envvars />
208150
<code_completion />

0 commit comments

Comments
 (0)