7 files changed, 86 insertions, 3 deletions

diff --git a/devel/boaconstructor/Makefile b/devel/boaconstructor/Makefile
index 4a365c906ca0..bd6d3c9ba6ce 100644
--- a/devel/boaconstructor/Makefile
+++ b/devel/boaconstructor/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	boaconstructor
 PORTVERSION=	0.6.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel python
 #MASTER_SITES=	SF/boa-constructor/Boa-Constructor/${PORTVERSION}-alpha
 MASTER_SITES=	SF/boa-constructor/Boa-Constructor/${PORTVERSION}-beta
@@ -16,8 +16,7 @@ WRKSRC=		${WRKDIR}/boa-constructor-${PORTVERSION}
 
 USES=		gettext zip
 USE_PYTHON=	yes
-USE_WX=		2.8
-WX_UNICODE=	yes
+USE_WX=		3.0+
 WX_COMPS=	python
 DATADIR=	${PREFIX}/share/Boa
 
diff --git a/devel/boaconstructor/files/patch-Companions__BaseCompanions.py b/devel/boaconstructor/files/patch-Companions__BaseCompanions.py
new file mode 100644
index 000000000000..347332f55f3a
--- /dev/null
+++ b/devel/boaconstructor/files/patch-Companions__BaseCompanions.py
@@ -0,0 +1,11 @@
+--- ./Companions/BaseCompanions.py.orig	2014-07-05 20:19:16.079675572 -0300
++++ ./Companions/BaseCompanions.py	2014-07-05 20:19:24.740675001 -0300
+@@ -851,7 +851,7 @@
+         self.windowStyles = ['wx.CAPTION', 'wx.MINIMIZE_BOX', 'wx.MAXIMIZE_BOX',
+             'wx.THICK_FRAME', 'wx.SIMPLE_BORDER', 'wx.DOUBLE_BORDER',
+             'wx.SUNKEN_BORDER', 'wx.RAISED_BORDER', 'wx.STATIC_BORDER', 
+-            'wx.TRANSPARENT_WINDOW', 'wx.NO_3D', 'wx.TAB_TRAVERSAL', 
++            'wx.TRANSPARENT_WINDOW', 'wx.TAB_TRAVERSAL', 
+             'wx.WANTS_CHARS', 'wx.NO_FULL_REPAINT_ON_RESIZE', 'wx.VSCROLL', 
+             'wx.HSCROLL', 'wx.CLIP_CHILDREN', 'wx.NO_BORDER', 'wx.ALWAYS_SHOW_SB']
+         
diff --git a/devel/boaconstructor/files/patch-Companions__FrameCompanions.py b/devel/boaconstructor/files/patch-Companions__FrameCompanions.py
new file mode 100644
index 000000000000..b7212c1d916a
--- /dev/null
+++ b/devel/boaconstructor/files/patch-Companions__FrameCompanions.py
@@ -0,0 +1,11 @@
+--- ./Companions/FrameCompanions.py.orig	2014-07-05 20:19:37.550674426 -0300
++++ ./Companions/FrameCompanions.py	2014-07-05 20:19:46.427673184 -0300
+@@ -188,7 +188,7 @@
+         BaseFrameDTC.__init__(self, name, designer, frameCtrl)
+         self.windowStyles = ['wx.DIALOG_MODAL', 'wx.DIALOG_MODELESS',
+               'wx.CAPTION', 'wx.DEFAULT_DIALOG_STYLE', 'wx.RESIZE_BORDER',
+-              'wx.THICK_FRAME', 'wx.STAY_ON_TOP', 'wx.NO_3D', 'wx.DIALOG_NO_PARENT',
++              'wx.THICK_FRAME', 'wx.STAY_ON_TOP', 'wx.DIALOG_NO_PARENT',
+               'wx.SYSTEM_MENU', 'wx.CLOSE_BOX']\
+               + self.windowStyles
+ 
diff --git a/devel/boaconstructor/files/patch-Config__prefs.rc.py b/devel/boaconstructor/files/patch-Config__prefs.rc.py
new file mode 100644
index 000000000000..67b968802518
--- /dev/null
+++ b/devel/boaconstructor/files/patch-Config__prefs.rc.py
@@ -0,0 +1,11 @@
+--- ./Config/prefs.rc.py.orig	2014-07-05 20:20:50.061669387 -0300
++++ ./Config/prefs.rc.py	2014-07-05 20:20:59.018078274 -0300
+@@ -23,7 +23,7 @@
+ # Frame test button on the Palette toolbar
+ showFrameTestButton = False
+ # Style flags used by most splitters in the IDE
+-splitterStyle = wx.SP_LIVE_UPDATE | wx.SP_3DSASH | wx.NO_3D
++splitterStyle = wx.SP_LIVE_UPDATE | wx.SP_3DSASH
+ 
+ # Alternating background colours used in ListCtrls (pastel blue and yellow)
+ pastels = True
diff --git a/devel/boaconstructor/files/patch-Inspector.py b/devel/boaconstructor/files/patch-Inspector.py
new file mode 100644
index 000000000000..3ef35b0d00ed
--- /dev/null
+++ b/devel/boaconstructor/files/patch-Inspector.py
@@ -0,0 +1,11 @@
+--- ./Inspector.py.orig	2014-07-05 20:17:27.633683705 -0300
++++ ./Inspector.py	2014-07-05 20:17:36.358682355 -0300
+@@ -871,7 +871,7 @@
+           style = Preferences.splitterStyle)
+ 
+         self.categories = wx.SplitterWindow(self, -1,
+-              style=wx.NO_3D | wx.SP_3D | wx.SP_LIVE_UPDATE)
++              style=wx.SP_3D | wx.SP_LIVE_UPDATE)
+         self.definitions = InspectorEventScrollWin(self, -1,
+               style=wx.SUNKEN_BORDER | wx.TAB_TRAVERSAL)
+ 
diff --git a/devel/boaconstructor/files/patch-Plug-ins__HelpBook.plug-in.py b/devel/boaconstructor/files/patch-Plug-ins__HelpBook.plug-in.py
new file mode 100644
index 000000000000..64da59d03465
--- /dev/null
+++ b/devel/boaconstructor/files/patch-Plug-ins__HelpBook.plug-in.py
@@ -0,0 +1,20 @@
+--- ./Plug-ins/HelpBook.plug-in.py.orig	2014-07-05 20:18:17.816680866 -0300
++++ ./Plug-ins/HelpBook.plug-in.py	2014-07-05 20:19:04.452676278 -0300
+@@ -683,7 +683,7 @@
+     delBmp = 'Images/Shared/DeleteItem.png'
+     def __init__(self, parent, model):
+         wx.SplitterWindow.__init__(self, parent, -1,
+-              style=wx.CLIP_CHILDREN | wx.NO_3D | wx.SP_3DSASH)
++              style=wx.CLIP_CHILDREN | wx.SP_3DSASH)
+ 
+         self.indexes = HelpBookIndexListView(self, model, self)
+         self.files = HelpBookFilesView(self, model, False)
+@@ -854,7 +854,7 @@
+     delBmp = 'Images/Shared/DeleteItem.png'
+     def __init__(self, parent, model):
+         wx.SplitterWindow.__init__(self, parent, -1,
+-              style=wx.CLIP_CHILDREN | wx.NO_3D | wx.SP_3DSASH)
++              style=wx.CLIP_CHILDREN | wx.SP_3DSASH)
+ 
+         self.contents = HelpBookContentsTreeView(self, model, self)
+         self.files = HelpBookFilesView(self, model, False)
diff --git a/devel/boaconstructor/files/patch-PropEdit__Enumerations.py b/devel/boaconstructor/files/patch-PropEdit__Enumerations.py
new file mode 100644
index 000000000000..e6098a916186
--- /dev/null
+++ b/devel/boaconstructor/files/patch-PropEdit__Enumerations.py
@@ -0,0 +1,20 @@
+--- ./PropEdit/Enumerations.py.orig	2014-07-05 20:19:56.166673073 -0300
++++ ./PropEdit/Enumerations.py	2014-07-05 20:20:06.787672066 -0300
+@@ -19,7 +19,7 @@
+ 
+ windowStyles =[wx.CAPTION, wx.MINIMIZE_BOX, wx.MAXIMIZE_BOX, wx.THICK_FRAME,
+ wx.SIMPLE_BORDER, wx.DOUBLE_BORDER, wx.SUNKEN_BORDER, wx.RAISED_BORDER,
+-wx.STATIC_BORDER, wx.TRANSPARENT_WINDOW, wx.NO_3D, wx.TAB_TRAVERSAL, wx.VSCROLL,
++wx.STATIC_BORDER, wx.TRANSPARENT_WINDOW, wx.TAB_TRAVERSAL, wx.VSCROLL,
+ wx.HSCROLL, wx.CLIP_CHILDREN]
+ 
+ windowNameStyles = {'wx.CAPTION':wx.CAPTION, 'wx.MINIMIZE_BOX':wx.MINIMIZE_BOX,
+@@ -27,7 +27,7 @@
+ 'wx.SIMPLE_BORDER':wx.SIMPLE_BORDER, 'wx.DOUBLE_BORDER':wx.DOUBLE_BORDER,
+ 'wx.SUNKEN_BORDER':wx.SUNKEN_BORDER, 'wx.RAISED_BORDER':wx.RAISED_BORDER,
+ 'wx.STATIC_BORDER':wx.STATIC_BORDER, 'wx.TRANSPARENT_WINDOW':wx.TRANSPARENT_WINDOW,
+-'wx.NO_3D':wx.NO_3D, 'wx.TAB_TRAVERSAL':wx.TAB_TRAVERSAL, 'wx.VSCROLL':wx.VSCROLL,
++'wx.TAB_TRAVERSAL':wx.TAB_TRAVERSAL, 'wx.VSCROLL':wx.VSCROLL,
+ 'wx.HSCROLL':wx.HSCROLL, 'wx.CLIP_CHILDREN':wx.CLIP_CHILDREN}
+ 
+ # Fonts