Developer forums (C::B DEVELOPMENT STRICTLY!) > Development
Compiler settings issue
Jenna:
--- Quote from: MortenMacFly on October 22, 2009, 01:56:49 pm ---
--- Quote from: jens on October 22, 2009, 01:36:23 pm ---I just committed the changes to debugger/propgrid-
--- End quote ---
This does not work (so far). As you also changed wxPropGrid which is built as a library you'll need to include the sources for wxScrollingDialog, too. Otherwise the linker complains. I wonder how you managed to compile this...?!
--- End quote ---
Maybe some linux magic, I compiled from inside C::B and with automake, both works without problems.
--- Quote from: MortenMacFly on October 22, 2009, 01:56:49 pm ---I am not sure what is better:
Compiling wxScrollingDialog into wxPropGrid (and loosing sync with wxPropGrid sources therefore :-() or removing it from this component. Why did you modify this library?
--- End quote ---
I think it's better to remove wxScrollingdialog from wxPropGrid, we do not really need it here.
Maybe we should build wxScrollingdialog as library, to make it usable in any of our sources, without problems.
Moving the include-statements out of the wxSmith-controlled area is not really necessary in my opinion, because we have to edit the files manually in any case after changing dialogs with wxSmith, unless it knows wxScrollingDialog.
I will test the sources on also windows next time (before comitting them, I normally do so, just not today) ,to avoid such problems.
MortenMacFly:
--- Quote from: jens on October 22, 2009, 02:34:16 pm ---Moving the include-statements out of the wxSmith-controlled area is not really necessary in my opinion, because we have to edit the files manually in any case after changing dialogs with wxSmith, unless it knows wxScrollingDialog.
--- End quote ---
True, but it's a little easier then. As the portions are being auto-generated you can safely leave the include statement wxSmith created and would only need to modify the base classes name. This is a temporary work-around until wxSmith supports wScrollingDialog natively. At that time we (obviously) need to modify the wxSmith resources and remove the include statement which would appear twice otherwise.
stahta01:
Patch to scintilla branch needed for building under Windows without Precompilied Headers.
Note: the [#include "wxscintilla/include/wx/wxscintilla.h"] was commented out because it could not be found. And, it worked without it.
Tim S.
--- Code: ---Index: src/plugins/contrib/codesnippets/editor/editproperties.h
===================================================================
--- src/plugins/contrib/codesnippets/editor/editproperties.h (revision 5883)
+++ src/plugins/contrib/codesnippets/editor/editproperties.h (working copy)
@@ -1,6 +1,7 @@
#ifndef EDITPROPERTIES_H
#define EDITPROPERTIES_H
+#include <scrollingdialog.h>
class ScbEditor;
//----------------------------------------------------------------------------
Index: src/plugins/contrib/codesnippets/codesnippetswindow.cpp
===================================================================
--- src/plugins/contrib/codesnippets/codesnippetswindow.cpp (revision 5883)
+++ src/plugins/contrib/codesnippets/codesnippetswindow.cpp (working copy)
@@ -51,7 +51,7 @@
#include "macrosmanager.h"
#include "configmanager.h"
#include "editormanager.h"
- #include "wxscintilla/include/wx/wxscintilla.h"
+// #include "wxscintilla/include/wx/wxscintilla.h"
#include "cbeditor.h"
#include "globals.h"
#endif
Index: src/plugins/debuggergdb/editbreakpointdlg.h
===================================================================
--- src/plugins/debuggergdb/editbreakpointdlg.h (revision 5883)
+++ src/plugins/debuggergdb/editbreakpointdlg.h (working copy)
@@ -6,9 +6,11 @@
#ifndef EDITBREAKPOINT_H
#define EDITBREAKPOINT_H
-#include <wx/dialog.h>
+#include <scrollingdialog.h>
+
#include "debugger_defs.h"
+
class EditBreakpointDlg : public wxScrollingDialog
{
public:
Index: src/src/main.h
===================================================================
--- src/src/main.h (revision 5883)
+++ src/src/main.h (working copy)
@@ -19,6 +19,7 @@
#include "cbplugin.h"
#include "sdk_events.h"
#include "scripting/bindings/sc_base_types.h"
+#include <scrollingdialog.h>
WX_DECLARE_HASH_MAP(int, wxString, wxIntegerHash, wxIntegerEqual, PluginIDsMap);
WX_DECLARE_HASH_MAP(cbPlugin*, wxToolBar*, wxPointerHash, wxPointerEqual, PluginToolbarsMap);
--- End code ---
Jenna:
I just committed a bunch of changed files to debugger-branch:
wxSmith now supports wxScrollingDialog natively,
an xrc-handler exists, so it can also be use in xrc-files directly,
changed the appropriate wxs, xrc, header, source and projectfiles accordingly.
Today I stumbled over an error described here: http://forums.codeblocks.org/index.php/topic,11024.msg75279.html#msg75279, C::B crashes on saving xrc- or wxs-files, after removing tinyxml from wxSmith's link libraries, the error disappears.
I hope I did not break anything this time, I tested it on linux (project/workspace-files and automake) and vista.
stahta01:
--- Quote from: jens on October 31, 2009, 06:54:08 pm ---I just committed a bunch of changed files to debugger-branch:
--- End quote ---
Minimum Patch needed for Windows XP compile without PCH.
Patch to Code::Blocks Core Project Files
--- Code: ---Index: src/sdk/xtra_res.cpp
===================================================================
--- src/sdk/xtra_res.cpp (revision 5893)
+++ src/sdk/xtra_res.cpp (working copy)
@@ -10,6 +10,7 @@
#include "sdk_precomp.h"
#ifndef CB_PRECOMP
+ #include "scrollingdialog.h"
#include "xtra_res.h"
#include <wx/wx.h>
#endif
Index: src/plugins/debuggergdb/debuggergdb.cpp
===================================================================
--- src/plugins/debuggergdb/debuggergdb.cpp (revision 5893)
+++ src/plugins/debuggergdb/debuggergdb.cpp (working copy)
@@ -9,6 +9,7 @@
#include <sdk.h>
+#include <algorithm> // std::remove_if
#include <wx/tokenzr.h>
#include "editarraystringdlg.h"
#include "projectloader_hooks.h"
@@ -55,7 +56,7 @@
#include "cbeditor.h"
#include "projectbuildtarget.h"
#include "sdk_events.h"
- #include "compilerfactory.h
+ #include "compilerfactory.h"
#include "xtra_res.h"
#include "scrollingdialog.h"
--- End code ---
Contrib Files
--- Code: ---Index: src/plugins/contrib/codesnippets/editor/editproperties.h
===================================================================
--- src/plugins/contrib/codesnippets/editor/editproperties.h (revision 5893)
+++ src/plugins/contrib/codesnippets/editor/editproperties.h (working copy)
@@ -1,6 +1,7 @@
#ifndef EDITPROPERTIES_H
#define EDITPROPERTIES_H
+#include <scrollingdialog.h>
class ScbEditor;
//----------------------------------------------------------------------------
--- End code ---
Navigation
[0] Message Index
[#] Next page
[*] Previous page
Go to full version