diff options
author | fluxgen <fluxgen> | 2003-02-16 00:36:17 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-02-16 00:36:17 (GMT) |
commit | 9fed36293eff773a1ddde687649af3bd71e869e8 (patch) | |
tree | 7d4544caf4500ae1a925ae4dd0d87bfe3cf7adf9 /src/Screen.hh | |
parent | 82c251779b8aa4ed45d8424807321284785d5877 (diff) | |
download | fluxbox-9fed36293eff773a1ddde687649af3bd71e869e8.zip fluxbox-9fed36293eff773a1ddde687649af3bd71e869e8.tar.bz2 |
using FbWindow for geom_window
Diffstat (limited to 'src/Screen.hh')
-rw-r--r-- | src/Screen.hh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/Screen.hh b/src/Screen.hh index d26b340..a68bd32 100644 --- a/src/Screen.hh +++ b/src/Screen.hh | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Screen.hh,v 1.66 2003/02/09 14:11:12 rathnor Exp $ | 25 | // $Id: Screen.hh,v 1.67 2003/02/16 00:36:17 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef SCREEN_HH | 27 | #ifndef SCREEN_HH |
28 | #define SCREEN_HH | 28 | #define SCREEN_HH |
@@ -297,7 +297,10 @@ public: | |||
297 | enum { ROWSMARTPLACEMENT = 1, COLSMARTPLACEMENT, CASCADEPLACEMENT, LEFTRIGHT, | 297 | enum { ROWSMARTPLACEMENT = 1, COLSMARTPLACEMENT, CASCADEPLACEMENT, LEFTRIGHT, |
298 | RIGHTLEFT, TOPBOTTOM, BOTTOMTOP }; | 298 | RIGHTLEFT, TOPBOTTOM, BOTTOMTOP }; |
299 | enum { LEFTJUSTIFY = 1, RIGHTJUSTIFY, CENTERJUSTIFY }; | 299 | enum { LEFTJUSTIFY = 1, RIGHTJUSTIFY, CENTERJUSTIFY }; |
300 | |||
301 | /// obsolete | ||
300 | enum { ROUNDBULLET = 1, TRIANGELBULLET, SQUAERBULLET, NOBULLET }; | 302 | enum { ROUNDBULLET = 1, TRIANGELBULLET, SQUAERBULLET, NOBULLET }; |
303 | /// obsolete | ||
301 | enum { RESTART = 1, RESTARTOTHER, EXIT, SHUTDOWN, EXECUTE, RECONFIGURE, | 304 | enum { RESTART = 1, RESTARTOTHER, EXIT, SHUTDOWN, EXECUTE, RECONFIGURE, |
302 | WINDOWSHADE, WINDOWICONIFY, WINDOWMAXIMIZE, WINDOWCLOSE, WINDOWRAISE, | 305 | WINDOWSHADE, WINDOWICONIFY, WINDOWMAXIMIZE, WINDOWCLOSE, WINDOWRAISE, |
303 | WINDOWLOWER, WINDOWSTICK, WINDOWKILL, SETSTYLE, WINDOWTAB}; | 306 | WINDOWLOWER, WINDOWSTICK, WINDOWKILL, SETSTYLE, WINDOWTAB}; |
@@ -337,7 +340,7 @@ private: | |||
337 | Bool root_colormap_installed, managed, geom_visible; | 340 | Bool root_colormap_installed, managed, geom_visible; |
338 | GC opGC; | 341 | GC opGC; |
339 | Pixmap geom_pixmap; | 342 | Pixmap geom_pixmap; |
340 | Window geom_window; | 343 | FbTk::FbWindow geom_window; |
341 | 344 | ||
342 | FbTk::ImageControl *image_control; | 345 | FbTk::ImageControl *image_control; |
343 | std::auto_ptr<FbTk::Menu> m_configmenu; | 346 | std::auto_ptr<FbTk::Menu> m_configmenu; |