Whitespace and formatting changes only.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6679 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2003-04-02 09:49:19 +00:00
parent c93bea2449
commit 67a1cfd4cc
8 changed files with 80 additions and 57 deletions

View File

@ -1,3 +1,10 @@
2003-04-02 Angus Leeming <leeming@lyx.org>
* FormDocument.[Ch]:
* FormPreferences.[Ch]:
* Toolbar_pimpl.[Ch]:
* xforms_helpers.C: whitespace and formatting changes.
2003-04-02 Angus Leeming <leeming@lyx.org> 2003-04-02 Angus Leeming <leeming@lyx.org>
* XFormsView.C (create_form_form_main): no longer pass this to the * XFormsView.C (create_form_form_main): no longer pass this to the

View File

@ -24,12 +24,9 @@
#include "input_validators.h" // fl_unsigned_float_filter #include "input_validators.h" // fl_unsigned_float_filter
#include "xforms_helpers.h" #include "xforms_helpers.h"
//#include "buffer.h"
//#include "BufferView.h"
#include "CutAndPaste.h" #include "CutAndPaste.h"
#include "debug.h" #include "debug.h"
#include "language.h" #include "language.h"
//#include "lyx_main.h" // for user_lyxdir
#include "lyxrc.h" #include "lyxrc.h"
#include "lyxtextclasslist.h" #include "lyxtextclasslist.h"
#include "tex-strings.h" #include "tex-strings.h"

View File

@ -32,7 +32,7 @@ struct FD_document_options;
struct FD_document_bullet; struct FD_document_bullet;
/** This class provides an XForms implementation of the FormDocument dialog. /** This class provides an XForms implementation of the FormDocument dialog.
The table-layout-form here changes values for latex-tabulars * The table-layout-form here changes values for latex-tabulars
*/ */
class FormDocument : public FormCB<ControlDocument, FormDB<FD_document> > { class FormDocument : public FormCB<ControlDocument, FormDB<FD_document> > {
public: public:

View File

@ -1847,11 +1847,21 @@ void FormPreferences::LnFmisc::apply(LyXRC & rc) const
// See FIXME below // See FIXME below
// grfx::DisplayType old_value = rc.display_graphics; // grfx::DisplayType old_value = rc.display_graphics;
switch (fl_get_choice(dialog_->choice_display)) { switch (fl_get_choice(dialog_->choice_display)) {
case 4: rc.display_graphics = grfx::NoDisplay; break; case 4:
case 3: rc.display_graphics = grfx::ColorDisplay; break; rc.display_graphics = grfx::NoDisplay;
case 2: rc.display_graphics = grfx::GrayscaleDisplay; break; break;
case 1: rc.display_graphics = grfx::MonochromeDisplay; break; case 3:
default: rc.display_graphics = grfx::ColorDisplay; break; rc.display_graphics = grfx::ColorDisplay;
break;
case 2:
rc.display_graphics = grfx::GrayscaleDisplay;
break;
case 1:
rc.display_graphics = grfx::MonochromeDisplay;
break;
default:
rc.display_graphics = grfx::ColorDisplay;
break;
} }
#ifdef WITH_WARNINGS #ifdef WITH_WARNINGS
@ -1923,11 +1933,21 @@ void FormPreferences::LnFmisc::update(LyXRC const & rc)
fl_set_counter_value(dialog_->counter_wm_jump, rc.wheel_jump); fl_set_counter_value(dialog_->counter_wm_jump, rc.wheel_jump);
switch (rc.display_graphics) { switch (rc.display_graphics) {
case grfx::NoDisplay: fl_set_choice(dialog_->choice_display, 4); break; case grfx::NoDisplay:
case grfx::ColorDisplay: fl_set_choice(dialog_->choice_display, 3); break; fl_set_choice(dialog_->choice_display, 4);
case grfx::GrayscaleDisplay: fl_set_choice(dialog_->choice_display, 2); break; break;
case grfx::MonochromeDisplay: fl_set_choice(dialog_->choice_display, 1); break; case grfx::ColorDisplay:
default: fl_set_choice(dialog_->choice_display, 3); break; fl_set_choice(dialog_->choice_display, 3);
break;
case grfx::GrayscaleDisplay:
fl_set_choice(dialog_->choice_display, 2);
break;
case grfx::MonochromeDisplay:
fl_set_choice(dialog_->choice_display, 1);
break;
default:
fl_set_choice(dialog_->choice_display, 3);
break;
} }
} }

View File

@ -48,7 +48,7 @@ struct FD_preferences_spelloptions;
/** This class provides an XForms implementation of the FormPreferences Dialog. /** This class provides an XForms implementation of the FormPreferences Dialog.
The preferences dialog allows users to set/save their preferences. * The preferences dialog allows users to set/save their preferences.
*/ */
class FormPreferences : public FormCB<ControlPrefs, FormDB<FD_preferences> > { class FormPreferences : public FormCB<ControlPrefs, FormDB<FD_preferences> > {
public: public:

View File

@ -234,7 +234,6 @@ void ToolbarCB(FL_OBJECT * ob, long ac)
extern "C" { extern "C" {
static
void C_Toolbar_ToolbarCB(FL_OBJECT * ob, long data) void C_Toolbar_ToolbarCB(FL_OBJECT * ob, long data)
{ {
ToolbarCB(ob, data); ToolbarCB(ob, data);