Code::Blocks Forums

Developer forums (C::B DEVELOPMENT STRICTLY!) => Development => Topic started by: frithjofh on April 12, 2012, 05:13:19 pm

Title: inconsistency between wxs and cpp/h files in code::blocks itself
Post by: frithjofh on April 12, 2012, 05:13:19 pm

Hi everybody,

I just found that somebody has changed code in wxssettings.h and .cpp without going through wxSmith. As a result the files do not concur anymore. Opening the wxs file in wxSmith changes the source files and results in a non compiling scenario. In this particular case it is a checkbox someone added to allow for unique IDs only.

I found half a dozen of wxs files out of sync with the respective source files.

Regards

frithjofh

Title: Re: inconsistency between wxs and cpp/h files in code::blocks itself
Post by: oBFusCATed on April 12, 2012, 05:47:10 pm

Patches welcome :)

Title: Re: inconsistency between wxs and cpp/h files in code::blocks itself
Post by: frithjofh on April 12, 2012, 06:04:00 pm

woa, I figure I do a patch now and tomorrow somebody does some changes again manually. So my question is: what is the policy to follow here? Is it worth while or is wxSmith dead for use inside code::blocks?

regards

Title: Re: inconsistency between wxs and cpp/h files in code::blocks itself
Post by: MortenMacFly on April 12, 2012, 06:06:13 pm

Quote from: nausea on April 12, 2012, 06:04:00 pm

or is wxSmith dead for use inside code::blocks?

Of course not. What's designed with wxSmith (inside C::B) has to be modified using wxSmith. If this got out of sync its a bug, maybe due to the merge of the wxSmith branch.

Title: Re: inconsistency between wxs and cpp/h files in code::blocks itself
Post by: frithjofh on April 12, 2012, 06:08:57 pm

OK. I'll make some patches then...

regards

PS: should I post the patches here as attachment, once I'm done?

Title: Re: inconsistency between wxs and cpp/h files in code::blocks itself
Post by: MortenMacFly on April 12, 2012, 06:27:19 pm

Quote from: nausea on April 12, 2012, 06:08:57 pm

PS: should I post the patches here as attachment, once I'm done?

Yes, if you get no response, put it in the patch tracker and post a link.

Title: Re: inconsistency between wxs and cpp/h files in code::blocks itself
Post by: frithjofh on April 12, 2012, 06:58:33 pm

patch for according files attached. These were all I found to be faulty. The others are checked to be alright, that is, they compile alright. Checked only contrib workspace.

And: the ConfigPanel in the DoxyBlocks plugin has a minor quirk: everytime the wxs file is opened it makes changes to the sources that conflict with cbStyleTextCtrl. wxSmith seems to not be able to figure out the correct number of parameters for the widget, see comment on line 42 in ConfigPanel.wxs

Please tell me if they worked and were alright.

Title: Re: inconsistency between wxs and cpp/h files in code::blocks itself
Post by: MortenMacFly on April 13, 2012, 12:58:54 pm

Quote from: frithjofh on April 12, 2012, 06:58:33 pm

Please tell me if they worked and were alright.

They do not work, what patch format did you choose?

Please do as following:
In your C::B SVN source tree, apply the patch, then type in the root of C::B's SVN folder:
svn diff > my.patch
(...assuming you have the subversion command line tool installed.)

There are many diff format flavours around - we need the one compatible to SVN which is produced that way.

Title: Re: inconsistency between wxs and cpp/h files in code::blocks itself
Post by: frithjofh on April 13, 2012, 01:13:01 pm

OK. next try. as attached...

hope this one works

Title: Re: inconsistency between wxs and cpp/h files in code::blocks itself
Post by: MortenMacFly on April 13, 2012, 04:27:55 pm

Quote from: frithjofh on April 13, 2012, 01:13:01 pm

hope this one works

Yes, and applied in trunk. Thank you!