Index: /FCKeditor/branches/features/div_container/editor/_source/internals/fck_contextmenu.js
===================================================================
--- /FCKeditor/branches/features/div_container/editor/_source/internals/fck_contextmenu.js	(revision 2102)
+++ /FCKeditor/branches/features/div_container/editor/_source/internals/fck_contextmenu.js	(revision 2103)
@@ -293,4 +293,17 @@
 				}
 			}} ;
+
+		case 'DivContainer':
+			return {
+			AddItems : function( menu, tag, tagName )
+			{
+				var path = new FCKElementPath( FCKSelection.GetParentElement() ) ;
+				if ( path.BlockLimit && path.BlockLimit.nodeName.IEquals( 'div' ) )
+				{
+					menu.AddSeparator() ;
+					menu.AddItem( 'EditDiv', FCKLang.EditDiv, 73 ) ;
+				}
+			}} ;
+			
 		// @Packager.Remove.Start
 		default :
Index: /FCKeditor/branches/features/div_container/editor/_source/internals/fckcommands.js
===================================================================
--- /FCKeditor/branches/features/div_container/editor/_source/internals/fckcommands.js	(revision 2102)
+++ /FCKeditor/branches/features/div_container/editor/_source/internals/fckcommands.js	(revision 2103)
@@ -95,6 +95,6 @@
 		case 'Outdent'	: oCommand = new FCKIndentCommand( 'outdent', FCKConfig.IndentLength * -1 ) ; break ;
 		case 'Blockquote'	: oCommand = new FCKBlockContainerCommand( 'blockquote' ) ; break ;
-		case 'CreateDiv'	: oCommand = new FCKDialogCommand( 'CreateDiv', FCKLang.Div, 'dialog/fck_div.html', 380, 210, null, null, true ) ; break ;
-		case 'EditDiv'		: oCommand = new FCKDialogCommand( 'EditDiv', FCKLang.Div, 'dialog/fck_div.html', 380, 210, null, null, false ) ; break ;
+		case 'CreateDiv'	: oCommand = new FCKDialogCommand( 'CreateDiv', FCKLang.CreateDiv, 'dialog/fck_div.html', 380, 210, null, null, true ) ; break ;
+		case 'EditDiv'		: oCommand = new FCKDialogCommand( 'EditDiv', FCKLang.EditDiv, 'dialog/fck_div.html', 380, 210, null, null, false ) ; break ;
 
 		case 'TableInsertRowAfter'		: oCommand = new FCKTableCommand('TableInsertRowAfter') ; break ;
Index: /FCKeditor/branches/features/div_container/editor/dialog/fck_div.html
===================================================================
--- /FCKeditor/branches/features/div_container/editor/dialog/fck_div.html	(revision 2102)
+++ /FCKeditor/branches/features/div_container/editor/dialog/fck_div.html	(revision 2103)
@@ -102,5 +102,5 @@
 function Ok()
 {
-	dialog.Selection.EnsureSelection() ;
+	oEditor.FCKUndo.SaveUndoStep() ;
 
 	if ( !ActiveEl )
@@ -130,4 +130,11 @@
 	setValue( 'dir', 'selLangDir' ) ;
 
+	var styleName = GetE( 'selStyle' ).value ;
+	var range = new oEditor.FCKDomRange( oEditor.FCK.EditorWindow ) ;
+	range.SetStart( ActiveEl, 3 ) ;
+	range.SetEnd( ActiveEl, 4 ) ;
+	if ( styleName )
+		FCKStyles.GetStyle( styleName ).ApplyToRange( range, false, true ) ;
+
 	return true ;
 }
@@ -147,4 +154,5 @@
 					<span fcklang="DlgDivStyle">Style</span><br />
 					<select id="selStyle" style="width: 100%;">
+						<option value="">&nbsp;
 					</select>
 				</td>
Index: /FCKeditor/branches/features/div_container/editor/lang/en.js
===================================================================
--- /FCKeditor/branches/features/div_container/editor/lang/en.js	(revision 2102)
+++ /FCKeditor/branches/features/div_container/editor/lang/en.js	(revision 2103)
@@ -73,5 +73,6 @@
 IncreaseIndent		: "Increase Indent",
 Blockquote			: "Blockquote",
-Div				: "Div",
+CreateDiv			: "Create DIV Container",
+EditDiv				: "Edit DIV Container",
 Undo				: "Undo",
 Redo				: "Redo",
Index: /FCKeditor/branches/features/div_container/fckconfig.js
===================================================================
--- /FCKeditor/branches/features/div_container/fckconfig.js	(revision 2102)
+++ /FCKeditor/branches/features/div_container/fckconfig.js	(revision 2103)
@@ -143,5 +143,5 @@
 ] ;
 
-FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Flash','Select','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','Table','Form'] ;
+FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Flash','Select','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','Table','Form','DivContainer'] ;
 FCKConfig.BrowserContextMenuOnCtrl = false ;