Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-05 03:20:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for building with GTK3

Browse Source
This commit is contained in:
Scott Talbert
2016-02-25 20:53:33 -05:00
parent 4ecd949e32
commit a57bec2e71
17 changed files with 54 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TODO.txt
View File

@@ -171,8 +171,6 @@ other dev stuff
* Check gui_scripts entry points.
* Add build support for gtk3
* wx.Window.DoEraseBackground?
* The sphinxtools are too agressive at ignoring content beyond a #. If the hash

3
build.py
View File

@@ -369,6 +369,7 @@ def makeOptionParser():
("python", ("", "The python executable to build for.")),
("debug", (False, "Build wxPython with debug symbols")),
("keep_hash_lines",(False, "Don't remove the '#line N' lines from the SIP generated code")),
("gtk3", (False, "On Linux build for gtk3 (default gtk2)")),
("osx_cocoa", (True, "Build the OSX Cocoa port on Mac (default)")),
("osx_carbon", (False, "Build the OSX Carbon port on Mac (unsupported)")),
("mac_framework", (False, "Build wxWidgets as a Mac framework.")),
@@ -1272,6 +1273,8 @@ def cmd_build_py(options, args):
build_options.append('--jobs=%s' % options.jobs)
if options.relwithdebug:
build_options.append('--msvc_relwithdebug')
if options.gtk3:
build_options.append('--gtk3')
build_options.append('--python="%s"' % PYTHON)
build_options.append('--out=%s' % wafBuildDir) # this needs to be the last option

10
buildtools/config.py
View File

@@ -56,8 +56,8 @@ class Configuration(object):
WXPORT = 'gtk2'
# On Linux/Unix there are several ports of wxWidgets available.
# Setting this value lets you select which will be used for the
# wxPython build. Possibilites are 'gtk', 'gtk2' and 'x11'.
# Currently only gtk and gtk2 works.
# wxPython build. Possibilities are 'gtk', 'gtk2', 'gtk3' and 'x11'.
# Currently only gtk, gtk2 and gtk3 work.
BUILD_BASE = "build"
# Directory to use for temporary build files.
@@ -280,6 +280,9 @@ class Configuration(object):
elif self.WXPORT == 'gtk2':
self.WXPLAT = '__WXGTK__'
portcfg = os.popen('pkg-config gtk+-2.0 --cflags', 'r').read()[:-1]
elif self.WXPORT == 'gtk3':
self.WXPLAT = '__WXGTK__'
portcfg = os.popen('pkg-config gtk+-3.0 --cflags', 'r').read()[:-1]
elif self.WXPORT == 'x11':
msg("WARNING: The wxX11 port is no supported")
self.WXPLAT = '__WXX11__'
@@ -349,6 +352,9 @@ class Configuration(object):
def parseCmdLine(self):
self.debug = '--debug' in sys.argv or '-g' in sys.argv
if '--gtk3' in sys.argv:
self.WXPORT = 'gtk3'
# the values of the items in the class namespace that start
# with an upper case letter can be overridden on the command
# line

2
demo/AUI_DockingWindowMgr.py
View File

@@ -722,7 +722,7 @@ class PyAUIFrame(wx.Frame):
def CreateHTMLCtrl(self):
ctrl = wx.html.HtmlWindow(self, -1, wx.DefaultPosition, wx.Size(400, 300))
if "gtk2" in wx.PlatformInfo:
if "gtk2" in wx.PlatformInfo or "gtk3" in wx.PlatformInfo:
ctrl.SetStandardFonts()
ctrl.SetPage(self.GetIntroText())
return ctrl

2
demo/About.py
View File

@@ -49,7 +49,7 @@ demo item so you can learn how to use the classes yourself.</p>
def __init__(self, parent):
wx.Dialog.__init__(self, parent, -1, 'About the wxPython demo',)
html = wx.html.HtmlWindow(self, -1, size=(420, -1))
if "gtk2" in wx.PlatformInfo:
if "gtk2" in wx.PlatformInfo or "gtk3" in wx.PlatformInfo:
html.SetStandardFonts()
py_version = sys.version.split()[0]
txt = self.text % (wx.VERSION_STRING,

2
demo/HtmlWindow.py
View File

@@ -17,7 +17,7 @@ class MyHtmlWindow(html.HtmlWindow):
def __init__(self, parent, id, log):
html.HtmlWindow.__init__(self, parent, id, style=wx.NO_FULL_REPAINT_ON_RESIZE)
self.log = log
if "gtk2" in wx.PlatformInfo:
if "gtk2" in wx.PlatformInfo or "gtk3" in wx.PlatformInfo:
self.SetStandardFonts()
def OnLinkClicked(self, linkinfo):

2
demo/Main.py
View File

@@ -1795,7 +1795,7 @@ class wxPythonDemo(wx.Frame):
panel.Bind(wx.EVT_SIZE, OnOvrSize)
panel.Bind(wx.EVT_ERASE_BACKGROUND, EmptyHandler)
if "gtk2" in wx.PlatformInfo:
if "gtk2" in wx.PlatformInfo or "gtk3" in wx.PlatformInfo:
self.ovr.SetStandardFonts()
self.SetOverview(self.overviewText, mainOverview)

3
demo/SystemSettings.py
View File

@@ -124,7 +124,8 @@ class SysColorPanel(SysPanelBase):
self._box = (50, 15) # Color box dimensions
self._maxw = 0
self._vals = [ color for color in dir(wx)
if color.startswith('SYS_COLOUR_') ]
if color.startswith('SYS_COLOUR_') and
color != 'SYS_COLOUR_MAX' ]
def OnPaint(self, evt):
dc = wx.AutoBufferedPaintDCFactory(self)

2
etg/_core.py
View File

@@ -264,6 +264,8 @@ def run():
port = 'gtk'
if 'gtk2' in wx.PlatformInfo:
port = 'gtk2'
elif 'gtk3' in wx.PlatformInfo:
port = 'gtk3'
else:
port = '???'
return "%s %s (phoenix)" % (wx.VERSION_STRING, port)

2
etg/window.py
View File

@@ -162,7 +162,7 @@ def run():
c.find('SetDoubleBuffered').setCppCode("""\
#if defined(__WXGTK20__) || defined(__WXMSW__)
#if defined(__WXGTK20__) || defined(__WXGTK3__) || defined(__WXMSW__)
self->SetDoubleBuffered(on);
#endif
""")

1
src/app_ex.cpp
View File

@@ -2,7 +2,6 @@
#ifdef __WXGTK__
#include <gdk/gdkx.h>
#include <gtk/gtk.h>
#include <wx/gtk/private/win_gtk.h>
#endif
#ifdef __WXMAC__

4
src/core_ex.cpp
View File

@@ -168,7 +168,9 @@ void wxPyCoreModuleInject(PyObject* moduleDict)
_AddInfoString("wxOSX-cocoa");
#endif
#ifdef __WXGTK__
#ifdef __WXGTK20__
#ifdef __WXGTK3__
_AddInfoString("gtk3");
#elif __WXGTK20__
_AddInfoString("gtk2");
#else
_AddInfoString("gtk1");

7
src/window_ex.cpp
View File

@@ -6,11 +6,16 @@
#ifdef __WXGTK__
#include <gdk/gdkx.h>
#include <gtk/gtk.h>
#include <wx/gtk/private/win_gtk.h>
#ifdef __WXGTK3__
#define GetXWindow(wxwin) (wxwin)->m_wxwindow ? \
GDK_WINDOW_XID(gtk_widget_get_window((wxwin)->m_wxwindow)) : \
GDK_WINDOW_XID(gtk_widget_get_window((wxwin)->m_widget))
#else
#define GetXWindow(wxwin) (wxwin)->m_wxwindow ? \
GDK_WINDOW_XWINDOW((wxwin)->m_wxwindow->window) : \
GDK_WINDOW_XWINDOW((wxwin)->m_widget->window)
#endif
#endif

5
wscript
View File

@@ -46,6 +46,8 @@ def options(opt):
help='One or more comma separated architecture names to be used for '
'the Mac builds. Should be at least a subset of the architectures '
'used by wxWidgets and Python')
opt.add_option('--gtk3', dest='gtk3', action='store_true', default=False,
help='On Linux build for gtk3 (default gtk2)')
opt.add_option('--msvc_arch', dest='msvc_arch', default='x86', action='store',
help='The architecture to target for MSVC builds. Supported values '
'are: "x86" or "x64"')
@@ -224,6 +226,9 @@ def configure(conf):
# GTK2 port of wxWidgets. If we ever support other ports then
# this code will need to be adjusted.
if not isDarwin:
if conf.options.gtk3:
gtkflags = os.popen('pkg-config gtk+-3.0 --cflags', 'r').read()[:-1]
else:
gtkflags = os.popen('pkg-config gtk+-2.0 --cflags', 'r').read()[:-1]
conf.env.CFLAGS_WX += gtkflags.split()
conf.env.CXXFLAGS_WX += gtkflags.split()

2
wx/lib/mixins/listctrl.py
View File

@@ -261,7 +261,7 @@ class ListCtrlAutoWidthMixin:
We automatically resize the last column in the list.
"""
if 'gtk2' in wx.PlatformInfo:
if 'gtk2' in wx.PlatformInfo or 'gtk3' in wx.PlatformInfo:
self._doResize()
else:
wx.CallAfter(self._doResize)

13
wx/lib/wxcairo.py
View File

@@ -117,6 +117,13 @@ def ContextFromDC(dc):
elif 'wxGTK' in wx.PlatformInfo:
if 'gtk3' in wx.PlatformInfo:
# With wxGTK3, GetHandle() returns a cairo context directly
ctxptr = voidp( dc.GetHandle() )
# pyCairo will try to destroy it so we need to increase ref count
cairoLib.cairo_reference(ctxptr)
else:
# Get the GdkDrawable from the dc
drawable = voidp( dc.GetHandle() )
@@ -300,7 +307,11 @@ def _findHelper(names, key, msg):
def _findGDKLib():
return _findHelper(['gdk-x11-2.0'], 'gdk',
if 'gtk3' in wx.PlatformInfo:
libname = 'gdk-3'
else:
libname = 'gdk-x11-2.0'
return _findHelper([libname], 'gdk',
"Unable to find the GDK shared library")
def _findPangoCairoLib():

3
wx/py/editwindow.py
View File

@@ -27,7 +27,8 @@ if 'wxMSW' in wx.PlatformInfo:
'calltipfg' : '#404040',
}
elif 'wxGTK' in wx.PlatformInfo and 'gtk2' in wx.PlatformInfo:
elif 'wxGTK' in wx.PlatformInfo and ('gtk2' in wx.PlatformInfo or
'gtk3' in wx.PlatformInfo):
FACES = { 'times' : 'Serif',
'mono' : 'Monospace',
'helv' : 'Sans',