diff options
author | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
---|---|---|
committer | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
commit | 839ea523164caecd8c779e60539b78c2a748a81f (patch) | |
tree | 0019d04f27a1a258bc7a900e3cf77b916dca6493 /src/FbTk/FbWindow.cc | |
parent | 4d3aa646c1d1d1de4fdb31f938f6ea62fd5dd21e (diff) | |
parent | 8def80cec337a986b762cdbb5e2555c6da809353 (diff) | |
download | fluxbox_lack-839ea523164caecd8c779e60539b78c2a748a81f.zip fluxbox_lack-839ea523164caecd8c779e60539b78c2a748a81f.tar.bz2 |
Merge branch 'master' into argbtesting/argbargb
Conflicts:
src/FbTk/FbWindow.cc
Diffstat (limited to 'src/FbTk/FbWindow.cc')
-rw-r--r-- | src/FbTk/FbWindow.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc index 18cec3f..e2dcf70 100644 --- a/src/FbTk/FbWindow.cc +++ b/src/FbTk/FbWindow.cc | |||
@@ -93,7 +93,7 @@ FbWindow::FbWindow(int screen_num, | |||
93 | create(RootWindow(display(), screen_num), | 93 | create(RootWindow(display(), screen_num), |
94 | x, y, width, height, eventmask, | 94 | x, y, width, height, eventmask, |
95 | override_redirect, save_unders, depth, class_type, visual, cmap); | 95 | override_redirect, save_unders, depth, class_type, visual, cmap); |
96 | }; | 96 | } |
97 | 97 | ||
98 | FbWindow::FbWindow(const FbWindow &parent, | 98 | FbWindow::FbWindow(const FbWindow &parent, |
99 | int x, int y, unsigned int width, unsigned int height, | 99 | int x, int y, unsigned int width, unsigned int height, |
@@ -122,7 +122,7 @@ FbWindow::FbWindow(const FbWindow &parent, | |||
122 | override_redirect, save_unders, depth, class_type, visual, cmap); | 122 | override_redirect, save_unders, depth, class_type, visual, cmap); |
123 | 123 | ||
124 | 124 | ||
125 | }; | 125 | } |
126 | 126 | ||
127 | FbWindow::FbWindow(Window client): | 127 | FbWindow::FbWindow(Window client): |
128 | FbDrawable(), | 128 | FbDrawable(), |
@@ -733,4 +733,4 @@ bool operator == (Window win, const FbWindow &fbwin) { | |||
733 | return win == fbwin.window(); | 733 | return win == fbwin.window(); |
734 | } | 734 | } |
735 | 735 | ||
736 | }; | 736 | } |