If so, please respond to this post and I will work on posting the patches in this thread....BerliOS / here? Your decision. Go ahead! :-)
Index: src/sdk/configmanager.cpp
===================================================================
--- src/sdk/configmanager.cpp (revision 5206)
+++ src/sdk/configmanager.cpp (working copy)
@@ -281,9 +281,9 @@
{
size_t size = is->GetSize();
wxString str;
- wxChar* c = str.GetWriteBuf(size);
- is->Read(c, size);
- str.UngetWriteBuf(size);
+ // wxChar* c = str.GetWriteBuf(size);
+ is->Read(wxStringBuffer(str, size), size);
+ // str.UngetWriteBuf(size);
doc = new TiXmlDocument();
Index: src/sdk/projectfile.cpp
===================================================================
--- src/sdk/projectfile.cpp (revision 5206)
+++ src/sdk/projectfile.cpp (working copy)
@@ -56,7 +56,10 @@
file.Assign(path + new_name);
relativeFilename = relativeFilename.BeforeLast(wxFILE_SEP_PATH);
- relativeFilename.IsEmpty() || relativeFilename.Append(wxFILE_SEP_PATH);
+ if (!relativeFilename.IsEmpty())
+ {
+ relativeFilename.Append(wxFILE_SEP_PATH);
+ }
relativeFilename.Append(new_name);
if (project)
Index: src/sdk/crc32.cpp
===================================================================
--- src/sdk/crc32.cpp (revision 5206)
+++ src/sdk/crc32.cpp (working copy)
@@ -67,7 +67,7 @@
wxUint32 crc = 0;
unsigned int i = 0;
- if (text)
+ if (!text.IsEmpty())
{
// Get the crc table, on first call, generate, otherwise do nothing
crc_table = GetCRC32Table( crc_table ) ;
Index: src/plugins/contrib/devpak_plugin/mytar.cpp
===================================================================
--- src/plugins/contrib/devpak_plugin/mytar.cpp (revision 5206)
+++ src/plugins/contrib/devpak_plugin/mytar.cpp (working copy)
@@ -19,7 +19,7 @@
m_SkipBytes(0),
m_Size(0)
{
- if (filename)
+ if (!filename.IsEmpty())
Open(filename);
}
Index: src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp
===================================================================
--- src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp (revision 5206)
+++ src/plugins/contrib/codesnippets/codesnippetstreectrl.cpp (working copy)
@@ -1846,7 +1846,7 @@
#endif
delete filetype;
- if ( open )
+ if ( !open.IsEmpty() )
::wxExecute( open, wxEXEC_ASYNC);
}
}
Index: src/src/app.cpp
===================================================================
--- src/src/app.cpp (revision 5206)
+++ src/src/app.cpp (working copy)
@@ -379,7 +379,7 @@
const wxLanguageInfo *info;
- if(lang)
+ if(!lang.IsEmpty())
info = wxLocale::FindLanguageInfo(lang);
else
info = wxLocale::GetLanguageInfo(wxLANGUAGE_DEFAULT);
#define wxUSE_STC 0
mingw32-make -f makefile.gcc USE_PROPGRID=1 USE_STC=0 USE_XRC=1 USE_OPENGL=0 BUILD=release MONOLITHIC=1 SHARED=1
Patch to enable wxPropertyGrid 1.2.10 to link against wx2.9Notice 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.
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;
[ Patch #1907 ] Patch XRC files for wxW28 with disable_compat26I have closed them all. Thanks!
[ Patch #2043 ] Patch CB Core files for wxW28 with disable_compat26
[ Patch #2565 ] Patch to remove wxADJUST_MINSIZE for wxW28 with disable_compat26
[ Patch #1907 ] Patch XRC files for wxW28 with disable_compat26OK - so this remains closed.
[ Patch #2043 ] Patch CB Core files for wxW28 with disable_compat26All this wxFD_XXX stuff I did in commit #5125.
[ Patch #2565 ] Patch to remove wxADJUST_MINSIZE for wxW28 with disable_compat26I have re-opened this one... Although I believe it is applied, too...?! I'll double-check...
[ Patch #1907 ] Patch XRC files for wxW28 with disable_compat26OK - so this remains closed.
[ Patch #2043 ] Patch CB Core files for wxW28 with disable_compat26All 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?
[ Patch #2565 ] Patch to remove wxADJUST_MINSIZE for wxW28 with disable_compat26I have re-opened this one... Although I believe it is applied, too...?! I'll double-check...