toolbar changes

2 files changed, 5 insertions, 5 deletions

diff --git a/src/Screen.cc b/src/Screen.cc
index 1d885be..b3925c9 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Screen.cc,v 1.84 2002/11/25 14:07:21 fluxgen Exp $
+// $Id: Screen.cc,v 1.85 2002/11/27 13:01:28 fluxgen Exp $
 
 
 #include "Screen.hh"
@@ -986,13 +986,13 @@ void BScreen::raiseWindows(const Workspace::Stack &workspace_stack) {
 #endif // SLIT
 
         session_stack[i++] =
-                m_toolbar->getMenu()->getPlacementmenu()->windowID();
+                m_toolbar->menu().placementmenu()->windowID();
 #ifdef XINERAMA
         if (hasXinerama()) {
                 session_stack[i++] = m_toolbar->getMenu()->getHeadmenu()->windowID();
         }
 #endif // XINERAMA
-        session_stack[i++] = m_toolbar->getMenu()->windowID();
+        session_stack[i++] = m_toolbar->menu().windowID();
 
         Rootmenus::iterator rit = rootmenuList.begin();
         Rootmenus::iterator rit_end = rootmenuList.end();
diff --git a/src/Tab.cc b/src/Tab.cc
index b2c0a3a..d8ebcfb 100644
--- a/src/Tab.cc
+++ b/src/Tab.cc
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Tab.cc,v 1.43 2002/11/26 16:40:57 fluxgen Exp $
+// $Id: Tab.cc,v 1.44 2002/11/27 13:03:04 fluxgen Exp $
 
 #include "Tab.hh"
 
@@ -842,7 +842,7 @@ void Tab::motionNotifyEvent(XMotionEvent *me) {
                                 case Toolbar::TOPLEFT:
                                 case Toolbar::TOPCENTER:
                                 case Toolbar::TOPRIGHT:
-                                        dtty = m_win->getScreen()->getToolbar()->getExposedHeight() +
+                                        dtty = m_win->getScreen()->getToolbar()->exposedHeight() +
                                                         m_win->getScreen()->getBorderWidth();
                                         dbby = m_win->getScreen()->getHeight();
                                         break;