M src/ArrowButton.cc → src/ArrowButton.cc

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ArrowButton.cc,v 1.3 2003/05/17 11:30:59 fluxgen Exp $
+// $Id: ArrowButton.cc,v 1.4 2003/08/13 09:38:09 fluxgen Exp $
 
 #include "ArrowButton.hh"
 
@@ -31,8 +31,8 @@ FbTk::Button(parent, x, y, width, height),
     m_arrow_type(arrow_type),
     m_mouse_handler(0) {
 
-    window().setEventMask(ExposureMask | ButtonPressMask | ButtonReleaseMask |
-                          EnterWindowMask | LeaveWindowMask);
+    setEventMask(ExposureMask | ButtonPressMask | ButtonReleaseMask |
+                 EnterWindowMask | LeaveWindowMask);
 }
 
 ArrowButton::ArrowButton(ArrowButton::Type arrow_type,
@@ -43,8 +43,8 @@ FbTk::Button(screen_num, x, y, width, height),
     m_arrow_type(arrow_type),
     m_mouse_handler(0) {
 
-    window().setEventMask(ExposureMask | ButtonPressMask | ButtonReleaseMask |
-                          EnterWindowMask | LeaveWindowMask);
+    setEventMask(ExposureMask | ButtonPressMask | ButtonReleaseMask |
+                 EnterWindowMask | LeaveWindowMask);
 }
 
 void ArrowButton::clear() {
@@ -102,9 +102,9 @@ break;
     }
 
     if (gc() != 0) {
-        window().fillPolygon(gc(),
-                             pts, 3, 
-                             Convex, CoordModePrevious);
+        fillPolygon(gc(),
+                    pts, 3, 
+                    Convex, CoordModePrevious);
     }
 }
 

M src/Window.cc → src/Window.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Window.cc,v 1.216 2003/08/11 17:04:32 fluxgen Exp $
+// $Id: Window.cc,v 1.217 2003/08/13 09:42:22 fluxgen Exp $
 
 #include "Window.hh"
 
@@ -381,8 +381,8 @@ frame().setLabelButtonFocus(*btn);
     btn->show();    
     FbTk::EventManager &evm = *FbTk::EventManager::instance();
     // we need motion notify so we mask it
-    btn->window().setEventMask(ExposureMask | ButtonPressMask | ButtonReleaseMask | 
-                               ButtonMotionMask | EnterWindowMask);
+    btn->setEventMask(ExposureMask | ButtonPressMask | ButtonReleaseMask | 
+                      ButtonMotionMask | EnterWindowMask);
 
     FbTk::RefCount<FbTk::Command> set_client_cmd(new SetClientCmd(*m_client));
     btn->setOnClick(set_client_cmd);
@@ -619,9 +619,9 @@ m_labelbuttons[(*client_it)] = btn;
             frame().addLabelButton(*btn);
             btn->show();
             // we need motion notify so we mask it
-            btn->window().setEventMask(ExposureMask | ButtonPressMask | 
-                                       ButtonReleaseMask | ButtonMotionMask | 
-                                       EnterWindowMask);
+            btn->setEventMask(ExposureMask | ButtonPressMask | 
+                              ButtonReleaseMask | ButtonMotionMask | 
+                              EnterWindowMask);
 
 
             FbTk::RefCount<FbTk::Command> 
@@ -650,9 +650,9 @@ frame().addLabelButton(*btn);
         btn->show();
         FbTk::EventManager &evm = *FbTk::EventManager::instance();
         // we need motion notify so we mask it
-        btn->window().setEventMask(ExposureMask | ButtonPressMask | 
-                                   ButtonReleaseMask | ButtonMotionMask | 
-                                   EnterWindowMask);
+        btn->setEventMask(ExposureMask | ButtonPressMask | 
+                          ButtonReleaseMask | ButtonMotionMask | 
+                          EnterWindowMask);
 
 
         FbTk::RefCount<FbTk::Command> set_client_cmd(new SetClientCmd(client));