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

Rev 6104 breaks build with wx-2.9

(1/3) > >>

Biplab:
As the title suggests, due to revision 6104 trunk can't be built with wx-2.9. Reason is the inclusion of following two files in trunk - include\scrollingdialog.h and sdk\scrollingdialog.cpp

These files are part of wx-2.9 and should not be used in C::B code just by copying it (even with modified code) from wx source to C::B trunk.

As a solution, please subclass it, if it's really necessary to use it, so that there is no conflict in class names and file name used. Otherwise please revert the portion of patch that uses wxScrollingDialog class.

Regards,

Biplab

Jenna:
The sources are not copied from wxWidgets, they are taken from this site: http://www.anthemion.co.uk/code.htm.

Use of the classes has been discussed in some(?) threads, and it was added to the scintilla (and debugger) test-branch for quite a long time.

The best way to fix the conflicts should be discussed, because just renaming and subclassing would most likely also break the wxSmith (and xrc) support for wxscrollingdialog.

I start downloading wx2.9 to see what can be done, will take some time due to ISDN.
I hope I find the time this weekend to work on this issue.

MortenMacFly:

--- Quote from: Biplab on January 29, 2010, 05:20:40 pm ---As the title suggests, due to revision 6104 trunk can't be built with wx-2.9. Reason is the inclusion of following two files in trunk - include\scrollingdialog.h and sdk\scrollingdialog.cpp

These files are part of wx-2.9 [...]

--- End quote ---
I don't see them in the SVN tree of wx 2.9???

Jenna:

--- Quote from: MortenMacFly on January 29, 2010, 09:11:40 pm ---
--- Quote from: Biplab on January 29, 2010, 05:20:40 pm ---As the title suggests, due to revision 6104 trunk can't be built with wx-2.9. Reason is the inclusion of following two files in trunk - include\scrollingdialog.h and sdk\scrollingdialog.cpp

These files are part of wx-2.9 [...]

--- End quote ---
I don't see them in the SVN tree of wx 2.9???

--- End quote ---
I just downloaded the 2.9 tarball and did not find wxScrollingDialog either, it's also not in actual trunk ( http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk ).

stahta01:
IIRC, it is wxDialogLayoutAdapter that is the problem.

See wx/dialog.h and src/common/dlgcmn.cpp and for possible name clash with the name wxDialogLayoutAdapter used in C::B scrollingdialog.h.

I tried to create a patch but was not able to because of wx2.9.x changes to wxDialog made the fix to complex for me to do. The problem was class inheritance was changed too much for me to fix; I do NOT know C++ well enough to fix the issue.

IIRC, The below code was a problem, both wxDialogHelper and wxDialog had a common base class; where the right method was hard to determine which should be done.


--- Code: ---wxScrollingDialog: public wxDialog, public wxDialogHelper

--- End code ---

Tim S.

Navigation

[0] Message Index

[#] Next page