ATTENTION DEVS: Branches merged

[mandrav]

I 've merged VERSION_1_0 and HEAD branches to HEAD.
VERSION_1_0 is stlll there, but don't use it anymore. I will only merge updates to it when they 're considered stable and tested in HEAD.
That's the way it should 've been since when we branched in the first place...

Update your local sources to work on HEAD.

If any of you has commited anything on VERSION_1_0 in the last 2-3 hours, please check that it made it to HEAD (else contact me).
Although most things should be working, some Makefiles might be out of sync. We 'll fix them, don't panic
Notice that I 'm still working on the merge, at a logic level. For example, when auto-hide is enabled for the messages, it might crash. I 'm working on it and it will be fixed soon.

On a final note, I haven't merged the help_plugin and wxSmith because I 'm not really sure on which branch their active development takes place. So I ask their devs to contact me and resolve this.

Yiannis.

[grv575]

I know you said the cbp and makefiles might not work yet but just a checklist
- remove STC linking (lwxmsw26_stc)
- replace "\msw\" "\msw$(WX_CFG)\" (otherwise it's linking against both lib\gcc_dll\msw _and_ lib\gcc_dllNonUnicode\msw)
- heh...merge back the unicode stuff or I'm not really sure what the consensus is about these changes...meantime I'll recompile wx for nonunicode against version_1_0 and see if the exit crash I was getting is not present w/o unicode or if it's a wx26 issue.  also try head w/ a nonunicode build.  but as of now I don't think there were many issues with even wx2.6 and unicode enabled.

and btw, people who are testing unicode and getting _imp___ZNxxx errors should check:
http://forums.next.codeblocks.org/index.php/topic,673.msg4851.html#msg4851
for the solution (wx setup.h problem).

[rickg22]

Just to get things straight... you've got what was in VERSION_1_0 and put it in HEAD, right?

[mandrav]

Just to get things straight... you've got what was in VERSION_1_0 and put it in HEAD, right?

Right.

[byo]

On a final note, I haven't merged the help_plugin and wxSmith because I 'm not really sure on which branch their active development takes place. So I ask their devs to contact me and resolve this.

wxSmith has always been developed under HEAD, so there's no need to change anything 

[rickg22]

I compiled (rebuilt actually) and codeblocks starts ok... but then it hides the window (i think) and the only way to restore it is to maximize it from the task bar. There must be some freezing in there because the hiding of the window isn't done cleanly. It overwrites the desktop and i have to clean it

Any idea of what's going on?

[mandrav]

Yes, it was a merge-error on my part.
Fixed now

Yiannis.

[mandrav]

I'm getting display error with the latest CVS HEAD.  Compiled against wx2.4.2 NonUnicode and wx2.6 NonUnicode.

Please, this thread is to alert developers for a major change in CVS. If you 're experiencing problems with C::B, please create a new thread for them...
For what it's worth, this has been fixed but anonymous CVS lags behind a few (4-6) hours on sf.net so you 'll have to wait a bit to get the updates...

Yiannis.

[Ceniza]

The help_plugin, just like you told me, was developed under HEAD. I'll update the project file to use the wxscintilla now included in Code::Blocks CVS and commit it.

[mandrav]

The help_plugin, just like you told me, was developed under HEAD. I'll update the project file to use the wxscintilla now included in Code::Blocks CVS and commit it.

Nice!