Index: /FCKeditor/trunk/editor/_source/classes/fcktoolbarfontformatcombo.js
===================================================================
--- /FCKeditor/trunk/editor/_source/classes/fcktoolbarfontformatcombo.js	(revision 858)
+++ /FCKeditor/trunk/editor/_source/classes/fcktoolbarfontformatcombo.js	(revision 859)
@@ -82,5 +82,5 @@
 FCKToolbarFontFormatCombo.prototype.RefreshActiveItems = function( targetSpecialCombo )
 {
-	var startElement = FCKSelection.GetBoundaryParentElement( true ) ;
+	var startElement = FCK.ToolbarSet.CurrentInstance.Selection.GetBoundaryParentElement( true ) ;
 
 	if ( startElement )
@@ -113,5 +113,5 @@
 	targetSpecialCombo.DeselectAll() ;
 
-	var startElement = FCKSelection.GetBoundaryParentElement( true ) ;
+	var startElement = FCK.ToolbarSet.CurrentInstance.Selection.GetBoundaryParentElement( true ) ;
 
 	if ( startElement )
Index: /FCKeditor/trunk/editor/_source/classes/fcktoolbarstylecombo.js
===================================================================
--- /FCKeditor/trunk/editor/_source/classes/fcktoolbarstylecombo.js	(revision 858)
+++ /FCKeditor/trunk/editor/_source/classes/fcktoolbarstylecombo.js	(revision 859)
@@ -92,5 +92,5 @@
 FCKToolbarStyleCombo.prototype.RefreshActiveItems = function( targetSpecialCombo )
 {
-	var startElement = FCKSelection.GetBoundaryParentElement( true ) ;
+	var startElement = FCK.ToolbarSet.CurrentInstance.Selection.GetBoundaryParentElement( true ) ;
 
 	if ( startElement )
@@ -132,12 +132,14 @@
 	var tagName ;
 	
-	if ( FCKSelection.GetType() == 'Control' )
-	{
-		startElement = FCKSelection.GetSelectedElement() ;
+	var selection = FCK.ToolbarSet.CurrentInstance.Selection ;
+	
+	if ( selection.GetType() == 'Control' )
+	{
+		startElement = selection.GetSelectedElement() ;
 		tagName = startElement.nodeName.toLowerCase() ;
 	}
 	else
 	{
-		startElement = FCKSelection.GetBoundaryParentElement( true ) ;
+		startElement = selection.GetBoundaryParentElement( true ) ;
 		path = new FCKElementPath( startElement ) ;
 	}