Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make gfx on unix be an xpcom component

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@69882 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pavlov%netscape.com
2000-05-15 21:58:46 +00:00
parent f751dedb80
commit f018b53ec5
3 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mozilla/gfx/src/gtk/Makefile.in
View File

@@ -28,6 +28,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = raptor
LIBRARY_NAME = gfx_gtk
IS_COMPONENT = 1
REQUIRES = util img xpcom raptor netlib ps

35
mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp
View File

@@ -114,19 +114,23 @@ static nsModuleComponentInfo components[] =
{
{ "Gtk Font Metrics",
NS_FONT_METRICS_CID,
"mozilla.gfx.font_metrics.gtk.1",
// "mozilla.gfx.font_metrics.gtk.1",
"component://netscape/gfx/fontmetrics",
nsFontMetricsGTKConstructor },
{ "Gtk Device Context",
NS_DEVICE_CONTEXT_CID,
"mozilla.gfx.device_context.gtk.1",
// "mozilla.gfx.device_context.gtk.1",
"component://netscape/gfx/devicecontext",
nsDeviceContextGTKConstructor },
{ "Gtk Rendering Context",
NS_RENDERING_CONTEXT_CID,
"mozilla.gfx.rendering_context.gtk.1",
// "mozilla.gfx.rendering_context.gtk.1",
"component://netscape/gfx/renderingcontext",
nsRenderingContextGTKConstructor },
{ "Gtk Image",
NS_IMAGE_CID,
"mozilla.gfx.image.gtk.1",
// "mozilla.gfx.image.gtk.1",
"component://netscape/gfx/image",
nsImageGTKConstructor },
{ "Gtk Region",
NS_REGION_CID,
@@ -134,31 +138,38 @@ static nsModuleComponentInfo components[] =
nsRegionGTKConstructor },
{ "Scriptable Region",
NS_SCRIPTABLE_REGION_CID,
"mozilla.gfx.scriptable_region.1",
// "mozilla.gfx.scriptable_region.1",
"component://netscape/gfx/region",
nsScriptableRegionConstructor },
{ "Blender",
NS_BLENDER_CID,
"mozilla.gfx.blender.1",
// "mozilla.gfx.blender.1",
"component://netscape/gfx/blender",
nsBlenderConstructor },
{ "Gtk Device Context Spec",
NS_DEVICE_CONTEXT_SPEC_CID,
"mozilla.gfx.device_context_spec.gtk.1",
// "mozilla.gfx.device_context_spec.gtk.1",
"component://netscape/gfx/devicecontextspec",
nsDeviceContextSpecGTKConstructor },
{ "Gtk Device Context Spec Factory",
NS_DEVICE_CONTEXT_SPEC_FACTORY_CID,
"mozilla.gfx.device_context_spec_factory.gtk.1",
// "mozilla.gfx.device_context_spec_factory.gtk.1",
"component://netscape/gfx/devicecontextspecfactory",
nsDeviceContextSpecFactoryGTKConstructor },
{ "Image Manager",
NS_IMAGEMANAGER_CID,
"mozilla.gfx.image_manager.1",
// "mozilla.gfx.image_manager.1",
"component://netscape/gfx/imagemanager",
nsImageManagerConstructor },
{ "GTK Font Enumerator",
{ "GTK Font Enumerator",
NS_FONT_ENUMERATOR_CID,
"mozilla.gfx.font_enumerator.gtk.1",
// "mozilla.gfx.font_enumerator.gtk.1",
"component://netscape/gfx/fontenumerator",
nsFontEnumeratorGTKConstructor },
{ "Gtk Screen Manager",
NS_SCREENMANAGER_CID,
"mozilla.gfx.screenmanager.gtk.1",
// "mozilla.gfx.screenmanager.gtk.1",
"component://netscape/gfx/screenmanager",
nsScreenManagerGtkConstructor }
};

1
mozilla/gfx/src/gtk/nsRegionGTK.cpp
View File

@@ -270,7 +270,6 @@ NS_IMETHODIMP nsRegionGTK::GetRects(nsRegionRectSet **aRects)
if (!mRegion)
return NS_OK;
nsRegionRectSet *rects = nsnull;
GdkRegionPrivate *priv = nsnull;
Region pRegion;