diff --git a/.cvsignore b/.cvsignore
index e3b0fd2..214e067 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-codeblocks-svn3500.tar.bz2
+codeblocks-svn3540.tar.bz2
diff --git a/codeblocks-wx28-wxsmith.patch b/codeblocks-wx28-wxsmith.patch
new file mode 100644
index 0000000..4825ea2
--- /dev/null
+++ b/codeblocks-wx28-wxsmith.patch
@@ -0,0 +1,126 @@
+Index: src/plugins/contrib/wxSmith/wxwidgets/wxwidgetsguiconfigpanel.cpp
+===================================================================
+--- src/plugins/contrib/wxSmith/wxwidgets/wxwidgetsguiconfigpanel.cpp	(revision 3526)
++++ src/plugins/contrib/wxSmith/wxwidgets/wxwidgetsguiconfigpanel.cpp	(working copy)
+@@ -128,7 +128,11 @@
+         _("XRC files (*.xrc)|*.xrc|"
+           "Zipped files (*.zip)|*.zip|"
+           "All files (*)|*"),
+-        wxOPEN|wxFILE_MUST_EXIST|wxHIDE_READONLY);
++        wxOPEN|wxFILE_MUST_EXIST
++#if (WXWIN_COMPATIBILITY_2_4)
++        |wxHIDE_READONLY
++#endif
++        );
+ 
+     if ( !FileName.empty() )
+     {
+Index: src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsnotebook.cpp
+===================================================================
+--- src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsnotebook.cpp	(revision 3526)
++++ src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsnotebook.cpp	(working copy)
+@@ -21,6 +21,8 @@
+ * $HeadURL$
+ */
+ 
++#include <wx/notebook.h>
++
+ #include "wxsnotebook.h"
+ #include "../../wxsadvqppchild.h"
+ 
+Index: src/plugins/contrib/wxSmith/wxwidgets/wxsevents.h
+===================================================================
+--- src/plugins/contrib/wxSmith/wxwidgets/wxsevents.h	(revision 3526)
++++ src/plugins/contrib/wxSmith/wxwidgets/wxsevents.h	(working copy)
+@@ -1,6 +1,10 @@
+ #ifndef WXSEVENTS_H
+ #define WXSEVENTS_H
+ 
++#ifndef WX_PRECOMP
++    #include <wx/arrstr.h>
++#endif
++
+ #include <tinyxml/tinyxml.h>
+ 
+ #include "../wxscodinglang.h"
+Index: src/plugins/contrib/wxSmith/wxwidgets/wxsstyle.h
+===================================================================
+--- src/plugins/contrib/wxSmith/wxwidgets/wxsstyle.h	(revision 3526)
++++ src/plugins/contrib/wxSmith/wxwidgets/wxsstyle.h	(working copy)
+@@ -1,6 +1,10 @@
+ #ifndef __WXSSTYLE_H
+ #define __WXSSTYLE_H
+ 
++#ifndef WX_PRECOMP
++    #include <wx/arrstr.h>
++#endif
++
+ #include "../wxscodinglang.h"
+ #include <wx/dynarray.h>
+ 
+Index: src/plugins/contrib/wxSmith/wxwidgets/properties/wxsfontproperty.cpp
+===================================================================
+--- src/plugins/contrib/wxSmith/wxwidgets/properties/wxsfontproperty.cpp	(revision 3526)
++++ src/plugins/contrib/wxSmith/wxwidgets/properties/wxsfontproperty.cpp	(working copy)
+@@ -39,10 +39,15 @@
+     wxString Face;
+     wxFontEnumerator Enumer;
+     Enumer.EnumerateFacenames();
++#if wxCHECK_VERSION(2, 8, 0)
++        wxArrayString faceNames = Enumer.GetFacenames();
++#else
++        wxArrayString& faceNames = *Enumer.GetFacenames();
++#endif
+     size_t Count = Faces.Count();
+     for ( size_t i = 0; i<Count; i++ )
+     {
+-        if ( Enumer.GetFacenames()->Index(Faces[i]) != wxNOT_FOUND )
++        if ( faceNames.Index(Faces[i]) != wxNOT_FOUND )
+         {
+             Face = Faces[i];
+             break;
+Index: src/plugins/contrib/wxSmith/wxwidgets/properties/wxsarraystringcheckproperty.h
+===================================================================
+--- src/plugins/contrib/wxSmith/wxwidgets/properties/wxsarraystringcheckproperty.h	(revision 3526)
++++ src/plugins/contrib/wxSmith/wxwidgets/properties/wxsarraystringcheckproperty.h	(working copy)
+@@ -3,7 +3,11 @@
+ 
+ #include "../../properties/wxsproperties.h"
+ 
+-WX_DEFINE_ARRAY(bool,wxArrayBool);
++#if wxCHECK_VERSION(2, 8, 0)
++    WX_DEFINE_ARRAY_INT(bool,wxArrayBool);
++#else
++    WX_DEFINE_ARRAY(bool,wxArrayBool);
++#endif
+ 
+ /** \brief Property for editing arrays of strings with checked option
+  *
+Index: src/plugins/contrib/wxSmith/properties/wxsarraystringeditordlg.cpp
+===================================================================
+--- src/plugins/contrib/wxSmith/properties/wxsarraystringeditordlg.cpp	(revision 3526)
++++ src/plugins/contrib/wxSmith/properties/wxsarraystringeditordlg.cpp	(working copy)
+@@ -88,3 +88,9 @@
+ 
+     EndModal(wxID_OK);
+ }
++#if wxCHECK_VERSION(2, 8, 0)
++void wxsArrayStringEditorDlg::OnCancel(wxCommandEvent& event)
++{
++    EndModal(wxID_CANCEL);
++}
++#endif
+Index: src/plugins/contrib/wxSmith/properties/wxsarraystringeditordlg.h
+===================================================================
+--- src/plugins/contrib/wxSmith/properties/wxsarraystringeditordlg.h	(revision 3526)
++++ src/plugins/contrib/wxSmith/properties/wxsarraystringeditordlg.h	(working copy)
+@@ -27,6 +27,9 @@
+ 
+ 		//(*Handlers(wxsArrayStringEditorDlg)
+ 		void OnOK(wxCommandEvent& event);
++#if wxCHECK_VERSION(2, 8, 0)
++        void OnCancel(wxCommandEvent& event);
++#endif
+ 		//*)
+ 
+ 		//(*Declarations(wxsArrayStringEditorDlg)
diff --git a/codeblocks.spec b/codeblocks.spec
index a44e87f..72260db 100644
--- a/codeblocks.spec
+++ b/codeblocks.spec
@@ -1,9 +1,9 @@
-%define		rev	3500
-%define		date	20070117
+%define		rev	3540
+%define		date	20070125
 
 Name:		codeblocks
 Version:	1.0
-Release:	0.19.%{date}svn%{rev}%{?dist}
+Release:	0.20.%{date}svn%{rev}%{?dist}
 Summary:	An open source, cross platform, free C++ IDE
 Group:		Development/Tools
 License:	GPL
@@ -20,6 +20,7 @@ Patch1:		codeblocks-plugins.patch
 Patch2:		codeblocks-desktop.patch
 Patch3:		codeblocks-autorev.patch
 Patch100:	codeblocks-wx28-listbook.patch
+Patch101:	codeblocks-wx28-wxsmith.patch
 Source100:	codeblocks-getsvn
 
 %description
@@ -58,6 +59,7 @@ Additional Code::Blocks plugins.
 %patch2 -p1
 %patch3
 %patch100
+%patch101
 
 %build
 find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix &> /dev/null
@@ -232,6 +234,9 @@ update-mime-database /usr/share/mime &> /dev/null || :
 
 
 %changelog
+* Fri Jan 26 2007 Dan Horak <dan[at]danny.cz> 1.0-0.20.20070125svn3540
+- update to revision 3540
+
 * Thu Jan 18 2007 Dan Horak <dan[at]danny.cz> 1.0-0.19.20070117svn3500
 - update to revision 3500
 - added patch for compiling with wxGTK 2.8
diff --git a/sources b/sources
index f1d7f20..f918d3e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d23206fc37ef5c8d8aff2fb024d6a535  codeblocks-svn3500.tar.bz2
+cd2382b6c0f932f5d46f03c935979504  codeblocks-svn3540.tar.bz2