Patched Code::Blocks works with wxWidgets trunk 2.9

User forums > General (but related to Code::Blocks)

<< < (2/3) > >>

MortenMacFly:

--- Quote from: stahta01 on September 21, 2008, 01:58:49 am ---Patch to enable wxPropertyGrid 1.2.10 to link against wx2.9

--- End quote ---
Notice that I have wxPropertyGrid already updated to 1.2.12 in my local copy. This update is pending until I get the OK from Byo.

For the rest:
I have applied quite some of your fixes concerning wx26 already into SVN. Probably it's time for an update...!?

In addition: I have also applied some wx26 fixes for the resource files you were proposing. But I forgot where you did that... wasn't this also a patch at BerliOS? Mind ponting me to it?

stahta01:
This message is where the patches to get codesnippets plug-in to compile against wxWidgets 2.9 will be posted. Note, I have stopped updating this patch; no plans to update it till after 2.9.0 is released.

My File name is wx290_codesnippets-unix.patch

--- Code: ---Index: src/plugins/contrib/codesnippets/editor/seditorcolourset.cpp
===================================================================
--- src/plugins/contrib/codesnippets/editor/seditorcolourset.cpp (revision 5270)
+++ src/plugins/contrib/codesnippets/editor/seditorcolourset.cpp (working copy)
@@ -112,7 +112,7 @@
wxString path = ConfigManager::GetFolder(sdDataUser) + _T("/lexers/");
if (dir.Open(path))
{
- Manager::Get()->GetLogManager()->Log(F(_("Scanning for lexers in %s..."), path.c_str()));
+ Manager::Get()->GetLogManager()->Log(F(_("Scanning for lexers in %s..."), path.wx_str()));
bool ok = dir.GetFirst(&filename, _T("lexer_*.xml"), wxDIR_FILES);
while(ok)
{
@@ -128,7 +128,7 @@
path = ConfigManager::GetFolder(sdDataGlobal) + _T("/lexers/");
if (dir.Open(path))
{
- Manager::Get()->GetLogManager()->Log(F(_("Scanning for lexers in %s..."), path.c_str()));
+ Manager::Get()->GetLogManager()->Log(F(_("Scanning for lexers in %s..."), path.wx_str()));
bool ok = dir.GetFirst(&filename, _T("lexer_*.xml"), wxDIR_FILES);
while(ok)
{
Index: src/plugins/contrib/codesnippets/codesnippetsapp.cpp
===================================================================
--- src/plugins/contrib/codesnippets/codesnippetsapp.cpp (revision 5207)
+++ src/plugins/contrib/codesnippets/codesnippetsapp.cpp (working copy)
@@ -58,6 +58,12 @@

//#include "../Utils/ToolBox/ToolBox.h" //debugging

+#if wxCHECK_VERSION(2,9,0)
+ #define CMDLINE_WXT(str) str
+#else
+ #define CMDLINE_WXT(str) wxT(str)
+#endif
+
#ifndef APP_PREFIX
#define APP_PREFIX ""
#endif
@@ -1396,11 +1402,11 @@
#if wxUSE_CMDLINE_PARSER
const wxCmdLineEntryDesc cmdLineDesc[] =
{
- { wxCMD_LINE_SWITCH, _T("h"), _T("help"), _T("show this help message"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
- { wxCMD_LINE_OPTION, _T(""), _T("prefix"), _T("the shared data dir prefix"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_NEEDS_SEPARATOR },
- { wxCMD_LINE_OPTION, _T("p"), _T("personality"), _T("the personality to use: \"ask\" or <personality-name>"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_NEEDS_SEPARATOR },
- { wxCMD_LINE_OPTION, _T(""), _T("profile"), _T("synonym to personality"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_NEEDS_SEPARATOR },
- { wxCMD_LINE_OPTION, _T(""), _T("KeepAlivePid"), _T("launchers pid"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_NEEDS_SEPARATOR },
+ { wxCMD_LINE_SWITCH, CMDLINE_WXT("h"), CMDLINE_WXT("help"), CMDLINE_WXT("show this help message"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
+ { wxCMD_LINE_OPTION, CMDLINE_WXT(""), CMDLINE_WXT("prefix"), CMDLINE_WXT("the shared data dir prefix"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_NEEDS_SEPARATOR },
+ { wxCMD_LINE_OPTION, CMDLINE_WXT("p"), CMDLINE_WXT("personality"), CMDLINE_WXT("the personality to use: \"ask\" or <personality-name>"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_NEEDS_SEPARATOR },
+ { wxCMD_LINE_OPTION, CMDLINE_WXT(""), CMDLINE_WXT("profile"), CMDLINE_WXT("synonym to personality"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_NEEDS_SEPARATOR },
+ { wxCMD_LINE_OPTION, CMDLINE_WXT(""), CMDLINE_WXT("KeepAlivePid"), CMDLINE_WXT("launchers pid"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_NEEDS_SEPARATOR },
{ wxCMD_LINE_NONE }
};
#endif // wxUSE_CMDLINE_PARSER
Index: src/plugins/contrib/codesnippets/snippetsconfig.cpp
===================================================================
--- src/plugins/contrib/codesnippets/snippetsconfig.cpp (revision 5211)
+++ src/plugins/contrib/codesnippets/snippetsconfig.cpp (working copy)
@@ -232,7 +232,7 @@
cfgFile.Write( wxT("SnippetFolder"), SettingsSnippetsFolder ) ;
cfgFile.Write( wxT("ViewSearchBox"), SettingsSearchBox ) ;
cfgFile.Write( wxT("casesensitive"), m_SearchConfig.caseSensitive ) ;
- cfgFile.Write( wxT("scope"), m_SearchConfig.scope );
+ cfgFile.Write( wxT("scope"), int(m_SearchConfig.scope) );
cfgFile.Write( wxT("EditorsStayOnTop"),SettingsEditorsStayOnTop );
if ( IsPlugin() )
{ // Write ExternalPersistent for plugin use only
Index: src/plugins/contrib/codesnippets/editor/seditorcolourset.cpp
===================================================================
--- src/plugins/contrib/codesnippets/editor/seditorcolourset.cpp (revision 5211)
+++ src/plugins/contrib/codesnippets/editor/seditorcolourset.cpp (working copy)
@@ -724,7 +724,7 @@
wxString tmp(_T(' '), keywords.length()); // faster than using Alloc()

const wxChar *src = keywords.c_str();
- wxChar *dst = (wxChar *) tmp.c_str();
+ wxChar *dst = (wxChar *)(const wxChar *) tmp.c_str(); //FIXME
wxChar c;
size_t len = 0;

--- End code ---

MortenMacFly:

--- Quote from: stahta01 on September 24, 2008, 03:42:08 pm ---[ Patch #1907 ] Patch XRC files for wxW28 with disable_compat26
[ Patch #2043 ] Patch CB Core files for wxW28 with disable_compat26
[ Patch #2565 ] Patch to remove wxADJUST_MINSIZE for wxW28 with disable_compat26

--- End quote ---
I have closed them all. Thanks!

Hopefully I didn't miss anything. Any chance you verify this, please?!

stahta01:
Deleted Message to save space and readers time. Tim S

MortenMacFly:

--- Quote from: stahta01 on September 24, 2008, 04:10:03 pm ---[ Patch #1907 ] Patch XRC files for wxW28 with disable_compat26

--- End quote ---
OK - so this remains closed.

--- Quote from: stahta01 on September 24, 2008, 04:10:03 pm ---[ Patch #2043 ] Patch CB Core files for wxW28 with disable_compat26

--- End quote ---
All this wxFD_XXX stuff I did in commit #5125.
(To be honest: I did it myself, not knowing there is a patch for it. ;-))
Could you verify again and tell me if I really missed anything?

Edit: Ah! You did this with a #define hack! OK so this is obsolete than. I did it the "right" way by renaming all the wx thingies accross the sources. We are already non wx26 conform anyways... so we should do all wx28 stuff "properly".

--- Quote from: stahta01 on September 24, 2008, 04:10:03 pm ---[ Patch #2565 ] Patch to remove wxADJUST_MINSIZE for wxW28 with disable_compat26

--- End quote ---
I have re-opened this one... Although I believe it is applied, too...?! I'll double-check...

Edit: OK - I don't get this: I have compiled wx 2.8.9 with:
#define WXWIN_COMPATIBILITY_2_6 0
But the compiler does not complain about wxADJUST_MINSIZE???

Navigation

[0] Message Index

[#] Next page

[*] Previous page

Go to full version