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

Keep gtk out of includes, if possible

Browse Source 
svn: r18302
This commit is contained in:
Doug Blank 2011-10-12 20:18:48 +00:00
parent c40c604da8
commit 9cd2754e19
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/docgen/GtkPrint.py
View File

@ -45,7 +45,6 @@ from math import radians
from gen.plug.docgen import PAPER_PORTRAIT from gen.plug.docgen import PAPER_PORTRAIT
import libcairodoc import libcairodoc
import Errors import Errors
from glade import Glade
#import constfunc #import constfunc
#------------------------------------------------------------------------ #------------------------------------------------------------------------
@ -203,7 +202,7 @@ class PrintPreview(object):
def __build_window(self): def __build_window(self):
"""Build the window from Glade. """Build the window from Glade.
""" """
from glade import Glade
glade_xml = Glade() glade_xml = Glade()
self._window = glade_xml.toplevel self._window = glade_xml.toplevel
#self._window.set_transient_for(parent) #self._window.set_transient_for(parent)

4
src/plugins/lib/libcairodoc.py
View File

@ -61,9 +61,7 @@ log = logging.getLogger(".libcairodoc")
# GTK modules # GTK modules
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import gtk
import pango import pango
import pangocairo
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# #
@ -102,6 +100,7 @@ font_families = _GNOME_FONT
# FIXME debug logging does not work here. # FIXME debug logging does not work here.
def set_font_families(): def set_font_families():
import pangocairo
##def set_font_families(pango_context): ##def set_font_families(pango_context):
"""Set the used font families depending on availability. """Set the used font families depending on availability.
""" """
@ -914,6 +913,7 @@ class GtkDocPicture(GtkDocBaseElement):
return (None, self), 0 return (None, self), 0
def draw(self, cr, layout, width, dpi_x, dpi_y): def draw(self, cr, layout, width, dpi_x, dpi_y):
import gtk
img_width = self._width * dpi_x / 2.54 img_width = self._width * dpi_x / 2.54
img_height = self._height * dpi_y / 2.54 img_height = self._height * dpi_y / 2.54