rpms/codeblocks/devel codeblocks-wx28-wxsmith.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 codeblocks.spec, 1.11, 1.12 sources, 1.12, 1.13

[Dan Horak (sharkcz)]

Author: sharkcz

Update of /cvs/extras/rpms/codeblocks/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22305

Modified Files:
	.cvsignore codeblocks.spec sources 
Added Files:
	codeblocks-wx28-wxsmith.patch 
Log Message:
 - update to revision 3540

codeblocks-wx28-wxsmith.patch:

--- NEW FILE codeblocks-wx28-wxsmith.patch ---
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)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	18 Jan 2007 08:47:36 -0000	1.12
+++ .cvsignore	26 Jan 2007 13:25:09 -0000	1.13
@@ -1 +1 @@
-codeblocks-svn3500.tar.bz2
+codeblocks-svn3540.tar.bz2


Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/codeblocks.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- codeblocks.spec	18 Jan 2007 08:47:36 -0000	1.11
+++ codeblocks.spec	26 Jan 2007 13:25:09 -0000	1.12
@@ -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 @@
 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 @@
 %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 @@
 
 
 %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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	18 Jan 2007 08:47:36 -0000	1.12
+++ sources	26 Jan 2007 13:25:09 -0000	1.13
@@ -1 +1 @@
-d23206fc37ef5c8d8aff2fb024d6a535  codeblocks-svn3500.tar.bz2
+cd2382b6c0f932f5d46f03c935979504  codeblocks-svn3540.tar.bz2