M src/Screen.cc → src/Screen.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: 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 @@ session_stack[i++] = m_slit->menu().windowID();
 #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();

M src/Tab.cc → src/Tab.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: 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 @@ switch (m_win->getScreen()->getToolbarPlacement()) {
 				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;