Developer forums (C::B DEVELOPMENT STRICTLY!) > Development

Regarding HEAD and VERSION_1_0

(1/2) > >>

mandrav:
The two branches are only different in the use of wxDockit (HEAD uses it, VERSION_1_0 doesn't).
This difference makes our job a lot harder to keep them synchronized with the latest changes. I personally think we should merge these two branches. wxDockit has proved stable for the job and I see no other reason for having two different branches.
We will make a new branch when 1.0 is out.

So what do you, the other devs, think?

Yiannis.

tiwag:
i think so too

even when it will need some effort to make it compiling in unicode-builds too,
as VERSION_1_0 branch currently does.
but all these unicode changes don't harm in ansi-builds...

rickg22:
Yes, that's why wxWidgets has all those macros. So they'll work in both unicode an ansi.

So yes, I vote for the merging of the two builds. Now the question is: HOW?

I think we should have a #define somewhere that tells us whether to use wxDockit or not.

mandrav:

--- Quote from: rickg22 on August 20, 2005, 07:01:25 pm ---I think we should have a #define somewhere that tells us whether to use wxDockit or not.

--- End quote ---

I mean use wxDockit as standard interface. That's why I 'm not seeing the need for two branches. They differ nowhere else...

Yiannis.

rickg22:
Oh, so that means we're moving to wx2.6.

In that case please fix the transparent icons, they look UGLY! in 2.6 :)

Navigation

[0] Message Index

[#] Next page