Developer forums (C::B DEVELOPMENT STRICTLY!) > Plugins development

Added new image tools to wxSmith

<< < (3/3)

Cryogen:
I have added the remainder of the wxSmithImage tools to wxSmith. We now have editors for combo box items and tree control items. I've applied them to wxBitmapComboBox and wxTreeCtrl, so you can now add and edit tree items within wxSmith for the first time. wxImageButton and wxImagePanel are now available in wxSmithContribItems.
These additions include many improvements and fixes.

The attached patch includes Windows and linux build files, both project and make files, tested on Win7 and Ubuntu Karmic.
The images are attached separately and you should copy the contents to your contrib directory. This will put the images in the right places in wxSmithContribItems.

If desired, you can delete wxseditenumproperty.cpp and wxseditenumproperty.h from wxSmith/wxwidgets/properties as they have been moved to wxSmith/properties, or you can wait until they arrive in trunk and let SVN sort it out.

Don't forget to thank Ron Collins for his great work on wxSmithImage.

Cheers.

MortenMacFly:
Unfortunately I get:
[...]
patching file "src/plugins/contrib/wxSmith/wxwidgets/defitems/wxstreectrl.cpp"                                   
Hunk #2 FAILED at 16.                                                                                             
1 out of 2 hunks FAILED -- saving rejects to file "src/plugins/contrib/wxSmith/wxwidgets/defitems/wxstreectrl.cpp.
rej"                                                                                                             
patching file "src/plugins/contrib/wxSmith/wxwidgets/defitems/wxstreectrl.h"                                     
[...]
...when I try to apply to trunk...?!

Cryogen:

--- Quote from: MortenMacFly on October 12, 2010, 07:05:30 am ---Unfortunately I get:
[...]
patching file "src/plugins/contrib/wxSmith/wxwidgets/defitems/wxstreectrl.cpp"                                    
Hunk #2 FAILED at 16.                                                                                            
1 out of 2 hunks FAILED -- saving rejects to file "src/plugins/contrib/wxSmith/wxwidgets/defitems/wxstreectrl.cpp.
rej"                                                                                                              
patching file "src/plugins/contrib/wxSmith/wxwidgets/defitems/wxstreectrl.h"                                      
[...]
...when I try to apply to trunk...?!

--- End quote ---


[sigh] Well, I've not seen that error before and I created it from clean SVN copy. I guess I can recreate it in case there was some sort of problem but nothing was reported.

Stand by...



...OK, done. I found that I'd missed some parts, too, wouldn't you know. Hopefully this one will work.

Ciao.

MortenMacFly:

--- Quote from: Cryogen on October 13, 2010, 01:59:44 am ---...OK, done. I found that I'd missed some parts, too, wouldn't you know. Hopefully this one will work.

--- End quote ---
Sorry, but that didn't change anything unfortunately. Can you do the following:
...in your svn controlled folder of C::B...
- remove (save) all wxSmith plugin related folders, including the .svn subfolders
- do a clean checkout of these folders (use svn update in the root of trunk)
- re-apply the modifications
- in the root of trunk issue a svn diff > wxsmith.patch
- post the output here...

Cryogen:

 OK, take 3. Looking for good news, this time.

Navigation

[0] Message Index

[*] Previous page

Go to full version