Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix up mac integration for introspection

Browse Source 
Requires not-yet-released gtk-mac-integration 1.1.0



svn: r20033
This commit is contained in:
John Ralls 2012-07-19 23:55:35 +00:00
parent ec2367cb66
commit cf6b91ffe9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gen/constfunc.py
View File

@ -94,7 +94,7 @@ def is_quartz():
from gi.repository import Gdk from gi.repository import Gdk
except: except:
return False return False
return Gdk.Display.get_default().__class__.__name__.endswith("quartzDisplay") return Gdk.Display.get_default().__class__.__name__.endswith("QuartzDisplay")
return False return False
def has_display(): def has_display():

5
src/gui/viewmanager.py
View File

@ -108,9 +108,10 @@ from gen.utils.configmanager import safe_eval
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
if is_quartz(): if is_quartz():
try: try:
import gtk_osxapplication as QuartzApp from gi.repository import GtkosxApplication as QuartzApp
_GTKOSXAPPLICATION = True _GTKOSXAPPLICATION = True
except: except:
print ("Failed to import gtk_osxapplication")
_GTKOSXAPPLICATION = False _GTKOSXAPPLICATION = False
else: else:
_GTKOSXAPPLICATION = False _GTKOSXAPPLICATION = False
@ -305,7 +306,7 @@ class ViewManager(CLIManager):
""" """
CLIManager.__init__(self, dbstate, False) CLIManager.__init__(self, dbstate, False)
if _GTKOSXAPPLICATION: if _GTKOSXAPPLICATION:
self.macapp = QuartzApp.OSXApplication() self.macapp = QuartzApp.Application()
self.view_category_order = view_category_order self.view_category_order = view_category_order