Index: wysiwyg_editor.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/wysiwyg_editor.admin.inc,v
retrieving revision 1.13
diff -u -p -r1.13 wysiwyg_editor.admin.inc
--- wysiwyg_editor.admin.inc	6 Sep 2008 13:50:35 -0000	1.13
+++ wysiwyg_editor.admin.inc	6 Sep 2008 13:53:06 -0000
@@ -123,26 +123,26 @@ function wysiwyg_editor_profile_form($fo
   );
 
   $form['basic']['default'] = array(
-    '#type' => 'select',
+    '#type' => 'checkbox',
     '#title' => t('Default state'),
     '#default_value' => $edit->settings['default'],
-    '#options' => array(FALSE => t('Disabled'), TRUE => t('Enabled')),
+    '#return_value' => 1,
     '#description' => t('Default editor state for users in this profile. Users will be able to override this state if the next option is enabled.'),
   );
 
   $form['basic']['user_choose'] = array(
-    '#type' => 'select',
+    '#type' => 'checkbox',
     '#title' => t('Allow users to choose default'),
     '#default_value' => $edit->settings['user_choose'],
-    '#options' => array(FALSE => t('Disabled'), TRUE => t('Enabled')),
+    '#return_value' => 1,
     '#description' => t('If allowed, users will be able to choose their own Wysiwyg Editor default state by visiting their profile page.'),
   );
 
   $form['basic']['show_toggle'] = array(
-    '#type' => 'select',
+    '#type' => 'checkbox',
     '#title' => t('Show disable/enable rich text editor toggle'),
     '#default_value' => $edit->settings['show_toggle'],
-    '#options' => array(FALSE => t('Disabled'), TRUE => t('Enabled')),
+    '#return_value' => 1,
     '#description' => t('Whether or not to show the disable/enable rich text editor toggle below the textarea. If false, editor defaults to the global default or user default (see above).'),
   );
 
@@ -160,10 +160,10 @@ function wysiwyg_editor_profile_form($fo
   );
 
   $form['basic']['safari_message'] = array(
-    '#type' => 'select',
+    '#type' => 'checkbox',
     '#title' => t('Safari browser warning'),
     '#default_value' => $edit->settings['safari_message'],
-    '#options' => array(FALSE => t('Disabled'), TRUE => t('Enabled')),
+    '#return_value' => 1,
     '#description' => t('TinyMCE support for the Safari web browser is experimental and a warning message is displayed when that browser is detected. You can disable this message here.'),
   );
 
@@ -292,10 +292,10 @@ function wysiwyg_editor_profile_form($fo
   );
 
   $form['appearance']['resizing'] = array(
-    '#type' => 'select',
+    '#type' => 'checkbox',
     '#title' => t('Enable resizing button'),
     '#default_value' => $edit->settings['resizing'],
-    '#options' => array(FALSE => t('Disabled'), TRUE => t('Enabled')),
+    '#return_value' => 1,
     '#description' => t(' This option gives you the ability to enable/disable the resizing button. If enabled the <strong>Path location toolbar</strong> must be set to "top" or "bottom" in order to display the resize icon.'),
   );
 
@@ -307,50 +307,50 @@ function wysiwyg_editor_profile_form($fo
   );
 
   $form['output']['verify_html'] = array(
-    '#type' => 'select',
+    '#type' => 'checkbox',
     '#title' => t('Verify HTML'),
     '#default_value' => $edit->settings['verify_html'],
-    '#options' => array(FALSE => t('Disabled'), TRUE => t('Enabled')),
+    '#return_value' => 1,
     '#description' => t('Should the HTML contents be verified or not? Verifying will strip &lt;head&gt tags, so choose false if you will be editing full page HTML.'),
   );
 
   $form['output']['preformatted'] = array(
-    '#type' => 'select',
+    '#type' => 'checkbox',
     '#title' => t('Preformatted'),
     '#default_value' => $edit->settings['preformatted'],
-    '#options' => array(FALSE => t('Disabled'), TRUE => t('Enabled')),
+    '#return_value' => 1,
     '#description' => t('If this option is set to true, the editor will insert TAB characters on tab and preserve other whitespace characters just like a PRE HTML element does.'),
   );
 
   $form['output']['convert_fonts_to_spans'] = array(
-    '#type' => 'select',
+    '#type' => 'checkbox',
     '#title' => t('Convert &lt;font&gt; tags to styles'),
     '#default_value' => $edit->settings['convert_fonts_to_spans'],
-    '#options' => array(TRUE => t('Enabled'), FALSE => t('Disabled')),
+    '#return_value' => 1,
     '#description' => t('If you set this option to true, font size, font family, font color and font background color will be replaced by inline styles.'),
   );
 
   $form['output']['remove_linebreaks'] = array(
-    '#type' => 'select',
+    '#type' => 'checkbox',
     '#title' => t('Remove linebreaks'),
     '#default_value' => $edit->settings['remove_linebreaks'],
-    '#options' => array(TRUE => t('Enabled'), FALSE => t('Disabled')),
+    '#return_value' => 1,
     '#description' => t('Set this option to false to prevent TinyMCE from removing linebreaks from existing nodes.  True avoids conflicts with some filters.'),
   );
 
   $form['output']['apply_source_formatting'] = array(
-    '#type' => 'select',
+    '#type' => 'checkbox',
     '#title' => t('Apply source formatting'),
     '#default_value' => $edit->settings['apply_source_formatting'],
-    '#options' => array(TRUE => t('Enabled'), FALSE => t('Disabled')),
+    '#return_value' => 1,
     '#description' => t('This option makes TinyMCE apply source formatting.  Set this to true for a cleaner HTML source.  Choose false to avoid conflicts with some filters.'),
   );
 
   $form['output']['paste_auto_cleanup_on_paste'] = array(
-    '#type' => 'select',
+    '#type' => 'checkbox',
     '#title' => t('Force Word cleanup on standard paste'),
     '#default_value' => $edit->settings['paste_auto_cleanup_on_paste'],
-    '#options' => array(TRUE => t('Enabled'), FALSE => t('Disabled')),
+    '#return_value' => 1,
     '#description' => t('Enable this option to have the default paste function (CTRL-V or SHIFT-INS) to behave like the "paste from word" plugin function.'),
   );
 
Index: wysiwyg_editor.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/wysiwyg_editor.module,v
retrieving revision 1.22
diff -u -p -r1.22 wysiwyg_editor.module
--- wysiwyg_editor.module	6 Sep 2008 13:50:35 -0000	1.22
+++ wysiwyg_editor.module	6 Sep 2008 13:53:20 -0000
@@ -201,6 +201,7 @@ function wysiwyg_editor_load_config($the
       if (is_bool($value)) {
         continue;
       }
+      // Backwards compatibility for obsolete TinyMCE module.
       switch ($value) {
         case 'true':
           $config[$key] = TRUE;