merge the formfield patch from ooo-build
[ooovba.git] / applied_patches / 0377-gstreamer-vcl.diff
blob28e7ae6921517ca7d67652444ca4801d4540ad3b
1 Index: vcl/inc/salobj.hxx
2 ===================================================================
3 RCS file: /cvs/gsl/vcl/inc/salobj.hxx,v
4 retrieving revision 1.5
5 diff -u -p -r1.5 salobj.hxx
6 --- vcl/inc/vcl/salobj.hxx 2 Nov 2005 13:28:47 -0000 1.5
7 +++ vcl/inc/vcl/salobj.hxx 5 Jan 2007 15:00:36 -0000
8 @@ -88,6 +88,8 @@ public:
9 virtual void SetBackground() = 0;
10 virtual void SetBackground( SalColor nSalColor ) = 0;
12 + virtual void SetForwardKey( BOOL bEnable ) {}
14 virtual const SystemEnvData* GetSystemData() const = 0;
16 void SetCallback( void* pInst, SALOBJECTPROC pProc )
17 Index: vcl/inc/syschild.hxx
18 ===================================================================
19 RCS file: /cvs/gsl/vcl/inc/syschild.hxx,v
20 retrieving revision 1.5
21 diff -u -p -r1.5 syschild.hxx
22 --- vcl/inc/vcl/syschild.hxx 19 Jun 2006 19:10:32 -0000 1.5
23 +++ vcl/inc/vcl/syschild.hxx 5 Jan 2007 15:00:36 -0000
24 @@ -77,6 +77,7 @@ public:
25 // however, this might not always be required
26 void EnableEraseBackground( BOOL bEnable = TRUE );
27 BOOL IsEraseBackgroundEnabled();
28 + void SetForwardKey( BOOL bEnable );
31 #endif // _SV_SYSCHILD_HXX
32 Index: vcl/source/window/syschild.cxx
33 ===================================================================
34 RCS file: /cvs/gsl/vcl/source/window/syschild.cxx,v
35 retrieving revision 1.8
36 diff -u -p -r1.8 syschild.cxx
37 --- vcl/source/window/syschild.cxx 10 Jul 2006 16:36:07 -0000 1.8
38 +++ vcl/source/window/syschild.cxx 5 Jan 2007 15:00:49 -0000
39 @@ -207,3 +211,9 @@ BOOL SystemChildWindow::IsEraseBackgroun
40 else
41 return FALSE;
44 +void SystemChildWindow::SetForwardKey( BOOL bEnable )
46 + if ( mpWindowImpl->mpSysObj )
47 + mpWindowImpl->mpSysObj->SetForwardKey( bEnable );
49 Index: vcl/unx/gtk/window/gtkobject.cxx
50 ===================================================================
51 RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkobject.cxx,v
52 retrieving revision 1.8.90.1
53 diff -u -p -r1.8.90.1 gtkobject.cxx
54 --- vcl/unx/gtk/window/gtkobject.cxx 10 Aug 2006 14:54:05 -0000 1.8.90.1
55 +++ vcl/unx/gtk/window/gtkobject.cxx 5 Jan 2007 15:00:54 -0000
56 @@ -211,3 +242,12 @@ void GtkSalObject::signalDestroy( GtkObj
57 pThis->m_pSocket = NULL;
61 +void GtkSalObject::SetForwardKey( BOOL bEnable )
63 + printf ("GtkSalObject::SetForwardKey\n");
64 + if( bEnable )
65 + gtk_widget_add_events( GTK_WIDGET( m_pSocket ), GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE );
66 + else
67 + gtk_widget_set_events( GTK_WIDGET( m_pSocket ), ~(GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE) & gtk_widget_get_events( GTK_WIDGET( m_pSocket ) ) );
69 Index: vcl/unx/inc/plugins/gtk/gtkobject.hxx
70 ===================================================================
71 RCS file: /cvs/gsl/vcl/unx/inc/plugins/gtk/gtkobject.hxx,v
72 retrieving revision 1.4
73 diff -u -p -r1.4 gtkobject.hxx
74 --- vcl/unx/inc/plugins/gtk/gtkobject.hxx 9 Sep 2005 12:52:22 -0000 1.4
75 +++ vcl/unx/inc/plugins/gtk/gtkobject.hxx 5 Jan 2007 15:00:54 -0000
76 @@ -78,6 +79,8 @@ public:
77 virtual void SetBackground();
78 virtual void SetBackground( SalColor nSalColor );
80 + virtual void SetForwardKey( BOOL bEnable );
82 virtual const SystemEnvData* GetSystemData() const;