rpms/openoffice.org/devel workspace.gtk3.patch,1.7,1.8

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32518

Modified Files:
	workspace.gtk3.patch 
Log Message:
fix ^CkRegion -> cairo_region_t

workspace.gtk3.patch:
 configure.in                          |    6 
 source/appl/makefile.mk               |    2 
 source/appl/shutdowniconunx.cxx       |   22 
 source/eggtrayicon-impl.h             |    2 
 source/eggtrayicon.c                  |   57 
 source/makefile.mk                    |    2 
 source/nsplugin/source/makefile.mk    |    2 
 source/ooo/makefile.mk                |    4 
 source/plugin/unx/npnapi.cxx          |    5 
 source/plugin/util/makefile.pmk       |    2 
 source/unx/gnome/SalGtkFilePicker.cxx |    6 
 source/unx/gnome/SalGtkPicker.cxx     |    4 
 source/unx/gnome/makefile.mk          |    6 
 unx/gtk/a11y/makefile.mk              |    2 
 unx/gtk/app/gtkdata.cxx               |   32 
 unx/gtk/app/makefile.mk               |    2 
 unx/gtk/gdi/makefile.mk               |    4 
 unx/gtk/gdi/salnativewidgets-gtk.cxx  | 2316 +++++++++++++++++-----------------
 unx/gtk/window/gtkframe.cxx           |  109 -
 unx/gtk/window/gtkobject.cxx          |   17 
 unx/gtk/window/makefile.mk            |    2 
 unx/inc/plugins/gtk/gtkdata.hxx       |   35 
 unx/inc/plugins/gtk/gtkframe.hxx      |    2 
 unx/inc/plugins/gtk/gtkgdi.hxx        |   16 
 unx/inc/plugins/gtk/gtkobject.hxx     |    2 
 unx/inc/saldisp.hxx                   |    4 
 unx/source/app/saldisp.cxx            |   21 
 unx/source/app/salsys.cxx             |    2 
 util/makefile.mk                      |    4 
 29 files changed, 1471 insertions(+), 1219 deletions(-)

Index: workspace.gtk3.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.gtk3.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- workspace.gtk3.patch	13 Jul 2010 15:19:52 -0000	1.7
+++ workspace.gtk3.patch	13 Jul 2010 15:55:00 -0000	1.8
@@ -4438,7 +4438,7 @@
 @@ -58,7 +59,7 @@
          SalDisplay* pDisp = GetX11SalData()->GetDisplay();
          m_aSystemData.nSize 		= sizeof( SystemChildData );
-         im_aSystemData.pDisplay		= pDisp->GetDisplay();
+         m_aSystemData.pDisplay		= pDisp->GetDisplay();
 -        m_aSystemData.aWindow		= GDK_WINDOW_XWINDOW(m_pSocket->window);
 +        m_aSystemData.aWindow		= GDK_WINDOW_XWINDOW(widget_get_window(m_pSocket));
          m_aSystemData.pSalFrame		= NULL;
@@ -4579,18 +4579,18 @@
                                             GdkEvent* event,
                                             gpointer data );
 --- vcl.orig/unx/inc/plugins/gtk/gtkframe.hxx	2010-07-13 16:17:08.000000000 +0100
-+++ vcl/unx/inc/plugins/gtk/gtkframe.hxx.foo	2010-07-13 16:16:56.000000000 +0100
++++ vcl/unx/inc/plugins/gtk/gtkframe.hxx	2010-07-13 16:16:56.000000000 +0100
 @@ -195,7 +195,7 @@
      Size                            m_aMinSize;
      Rectangle                       m_aRestorePosSize;    
      
--    GdkRegion*			    m_pRegion;
-+    cairo_region_t*		    m_pRegion;
+-    GdkRegion*			            m_pRegion;
++    cairo_region_t*	            m_pRegion;
  
      void Init( SalFrame* pParent, ULONG nStyle );
      void Init( SystemParentData* pSysData );
 --- vcl.orig/unx/inc/plugins/gtk/gtkobject.hxx	2010-07-13 16:18:03.000000000 +0100
-+++ vcl/unx/inc/plugins/gtk/gtkobject.hxx.foo	2010-07-13 16:17:47.000000000 +0100
++++ vcl/unx/inc/plugins/gtk/gtkobject.hxx	2010-07-13 16:17:47.000000000 +0100
 @@ -37,7 +37,7 @@
  {
  	SystemChildData		m_aSystemData;