Author: dejan
Date: 2007-11-14 08:49:25 -0800 (Wed, 14 Nov 2007)
New Revision: 5972
Log:
ShapedWindow now implicitly sets border to false. Clock demo
which utilizes this class does not use deprecated clear_border(),
or border(false)...
Modified:
trunk/fltk/ShapedWindow.h
trunk/test/clock.cxx
Modified: trunk/fltk/ShapedWindow.h
===================================================================
--- trunk/fltk/ShapedWindow.h 2007-11-14 01:49:47 UTC (rev 5971)
+++ trunk/fltk/ShapedWindow.h 2007-11-14 16:49:25 UTC (rev 5972)
@@ -31,8 +31,14 @@
class FL_API ShapedWindow : public Window {
void init() { shape_ = 0; lw = lh = 0; changed = 0; }
public:
- ShapedWindow(int W, int H, const char *l = 0) : Window(W,H,l) { init();}
- ShapedWindow(int X, int Y, int W, int H, const char *l = 0):
Window(X,Y,W,H,l) { init();}
+ ShapedWindow(int W, int H, const char *l = 0) : Window(W,H,l) {
+ border(false);
+ init();
+ }
+ ShapedWindow(int X, int Y, int W, int H, const char *l = 0):
Window(X,Y,W,H,l) {
+ border(false);
+ init();
+ }
void shape(xbmImage* b) { shape_ = b; changed = 1; }
void shape(xbmImage& b) { shape_ =&b; changed = 1; }
Modified: trunk/test/clock.cxx
===================================================================
--- trunk/test/clock.cxx 2007-11-14 01:49:47 UTC (rev 5971)
+++ trunk/test/clock.cxx 2007-11-14 16:49:25 UTC (rev 5972)
@@ -70,7 +70,8 @@
window.begin();
// don't show window manager border-- some window managers do this for you
// if an arbitrary shape is assigned to the window.
- //window.clear_border();
+ // previously windows.clear_border();
+ // window.border(false); // not needed now because now ShapedWindow
implicitly sets border to false.
#ifdef WIN32
Clock clock(0,0,220,220);
#else
_______________________________________________
fltk-commit mailing list
fltk-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/fltk-commit
