diff options
author | Oliver Bolte <obo@openoffice.org> | 2004-11-22 09:13:44 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2004-11-22 09:13:44 +0000 |
commit | 8e15d6973730965181708af8018498a7c651b6be (patch) | |
tree | 5bd090554b12c1b465f59ce9d3f77de4dea416b4 /vcl | |
parent | bf13280c74e59a45e8f38a1a3707f6405c00f60f (diff) |
#i10000# merge problem, missing members
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/unx/inc/plugins/gtk/gtkframe.hxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vcl/unx/inc/plugins/gtk/gtkframe.hxx b/vcl/unx/inc/plugins/gtk/gtkframe.hxx index 7dcf0d5bf565..efaf2ce37ed6 100644 --- a/vcl/unx/inc/plugins/gtk/gtkframe.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkframe.hxx @@ -2,9 +2,9 @@ * * $RCSfile: gtkframe.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obo $ $Date: 2004-11-16 15:28:41 $ + * last change: $Author: obo $ $Date: 2004-11-22 10:13:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -151,7 +151,9 @@ class GtkSalFrame : public SalFrame GtkWindow* m_pWindow; GdkWindow* m_pForeignParent; + GdkNativeWindow m_aForeignParentWindow; GdkWindow* m_pForeignTopLevel; + GdkNativeWindow m_aForeignTopLevelWindow; ULONG m_nStyle; GtkFixed* m_pFixedContainer; GtkSalFrame* m_pParent; |