summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSam Spilsbury <smspillaz@gmail.com>2011-01-20 14:34:27 +0800
committerSam Spilsbury <smspillaz@gmail.com>2011-01-20 14:34:27 +0800
commit793479d466f8dc8f7a52c008386c35ecf4d27ee9 (patch)
treeb317193ed5953a6fa844282b0fd99519784db1d9 /include
parenteef7eabda20d058e1e8fb9ef9d51720c7b237aaf (diff)
parent7ce34eabf766f9983b5fddda0e1f5e72b6dac330 (diff)
downloadmobileperf-793479d466f8dc8f7a52c008386c35ecf4d27ee9.tar.gz
mobileperf-793479d466f8dc8f7a52c008386c35ecf4d27ee9.tar.bz2
Merge branch 'master' of git://git.compiz.org/compiz/core
Diffstat (limited to 'include')
-rw-r--r--include/core/screen.h1
-rw-r--r--include/core/window.h6
2 files changed, 5 insertions, 2 deletions
diff --git a/include/core/screen.h b/include/core/screen.h
index d645f42..cd8c86d 100644
--- a/include/core/screen.h
+++ b/include/core/screen.h
@@ -400,6 +400,7 @@ class CompScreen :
friend class CompTimer;
friend class CompWindow;
friend class PrivateWindow;
+ friend class CoreWindow;
friend class ModifierHandler;
friend class CompEventSource;
friend class CompTimeoutSource;
diff --git a/include/core/window.h b/include/core/window.h
index 6b07a56..08b6e68 100644
--- a/include/core/window.h
+++ b/include/core/window.h
@@ -294,8 +294,6 @@ class CompWindow :
CompWindow *prev;
public:
- CompWindow (Window id,
- Window aboveId);
~CompWindow ();
/**
@@ -552,8 +550,12 @@ class CompWindow :
friend class CompScreen;
friend class PrivateScreen;
friend class ModifierHandler;
+ friend class CoreWindow;
private:
+ CompWindow (Window aboveId,
+ PrivateWindow *priv);
+
PrivateWindow *priv;
};