white-space changes, removed definitions.h several enum changes because of this,...

[lyx.git] / src / PaperLayout.C

diff --git a/src/PaperLayout.C b/src/PaperLayout.C
index ff98d2bae65c5cdc9a70b13046577909eb82c8ae..3ac090b07c435f4cd5d236efe88b6acc0ce8a266 100644 (file)
--- a/src/PaperLayout.C
+++ b/src/PaperLayout.C
@@ -2,7 +2,6 @@
 
 #include <cstdlib>
 
-#include "definitions.h"
 #include FORMS_H_LOCATION
 #include "layout_forms.h"
 #include "lyx_main.h"
@@ -16,9 +15,9 @@
 #include "BufferView.h"
 #include "gettext.h"
 
-extern FD_form_paper *fd_form_paper;
-extern MiniBuffer *minibuffer;
-extern BufferView *current_view;
+extern FD_form_paper * fd_form_paper;
+extern MiniBuffer * minibuffer;
+extern BufferView * current_view;
 
 
 inline void DeactivatePaperButtons ()
@@ -89,11 +88,7 @@ static void checkMarginValues()
     
        fl_hide_object(fd_form_paper->text_warning);
        ActivatePaperButtons();
-#if 0
-       val = fl_get_choice(fd_form_paper->choice_papersize2)-1;
-       if (val == VM_PAPER_DEFAULT)
-               return;
-#endif
+
        allEmpty = (!strlen(fl_get_input(fd_form_paper->input_top_margin)) &&
                    !strlen(fl_get_input(fd_form_paper->input_bottom_margin)) &&
                    !strlen(fl_get_input(fd_form_paper->input_left_margin)) &&
@@ -116,7 +111,7 @@ bool UpdateLayoutPaper()
                update = false;
 
        if (update) {
-               BufferParams * params = &current_view->currentBuffer()->params;
+               BufferParams * params = &current_view->buffer()->params;
 
                fl_set_choice(fd_form_paper->choice_papersize2,
                              params->papersize2 + 1);
@@ -126,7 +121,7 @@ bool UpdateLayoutPaper()
                              params->use_geometry);
                fl_set_button(fd_form_paper->radio_portrait, 0);
                fl_set_button(fd_form_paper->radio_landscape, 0);
-               if (params->orientation == ORIENTATION_LANDSCAPE)
+               if (params->orientation == BufferParams::ORIENTATION_LANDSCAPE)
                        fl_set_button(fd_form_paper->radio_landscape, 1);
                else
                        fl_set_button(fd_form_paper->radio_portrait, 1);
@@ -152,7 +147,7 @@ bool UpdateLayoutPaper()
                fl_set_focus_object(fd_form_paper->form_paper,
                                    fd_form_paper->choice_papersize2);
                fl_hide_object(fd_form_paper->text_warning);
-               if (current_view->currentBuffer()->isReadonly()) {
+               if (current_view->buffer()->isReadonly()) {
                        DisablePaperLayout();
                        fl_set_object_label(fd_form_paper->text_warning,
                                            _("Document is read-only."
@@ -176,8 +171,7 @@ void MenuLayoutPaper()
                        fl_raise_form(fd_form_paper->form_paper);
                } else {
                        fl_show_form(fd_form_paper->form_paper,
-                                    FL_PLACE_MOUSE
-                                    | FL_FREE_SIZE,FL_FULLBORDER,
+                                    FL_PLACE_MOUSE, FL_FULLBORDER,
                                     _("Paper Layout"));
                }
        }
@@ -189,17 +183,17 @@ void PaperApplyCB(FL_OBJECT *, long)
        if (! current_view->available()) 
                return;
        
-       BufferParams *params = &current_view->currentBuffer()->params;
+       BufferParams * params = &current_view->buffer()->params;
        
-       const FD_form_paper* fd = fd_form_paper;
+       FD_form_paper const * fd = fd_form_paper;
     
        params->papersize2 = fl_get_choice(fd->choice_papersize2)-1;
        params->paperpackage = fl_get_choice(fd->choice_paperpackage)-1;
        params->use_geometry = fl_get_button(fd_form_paper->push_use_geometry);
        if (fl_get_button(fd_form_paper->radio_landscape))
-               params->orientation = ORIENTATION_LANDSCAPE;
+               params->orientation = BufferParams::ORIENTATION_LANDSCAPE;
        else
-               params->orientation = ORIENTATION_PORTRAIT;
+               params->orientation = BufferParams::ORIENTATION_PORTRAIT;
        params->paperwidth = fl_get_input(fd->input_custom_width);
        params->paperheight = fl_get_input(fd->input_custom_height);
        params->leftmargin = fl_get_input(fd->input_left_margin);
@@ -209,9 +203,9 @@ void PaperApplyCB(FL_OBJECT *, long)
        params->headheight = fl_get_input(fd->input_head_height);
        params->headsep = fl_get_input(fd->input_head_sep);
        params->footskip = fl_get_input(fd->input_foot_skip);
-       current_view->currentBuffer()->setPaperStuff();
+       current_view->buffer()->setPaperStuff();
        minibuffer->Set(_("Paper layout set"));
-       current_view->currentBuffer()->markDirty();
+       current_view->buffer()->markDirty();
        
        return;
 }
@@ -223,47 +217,52 @@ void PaperCancelCB(FL_OBJECT *, long)
 }
 
 
-void PaperOKCB(FL_OBJECT *ob, long data)
+void PaperOKCB(FL_OBJECT * ob, long data)
 {
-       PaperCancelCB(ob,data);
-       PaperApplyCB(ob,data);
+       PaperCancelCB(ob, data);
+       PaperApplyCB(ob, data);
 }
 
 
-void PaperMarginsCB(FL_OBJECT *ob, long)
+void PaperMarginsCB(FL_OBJECT * ob, long)
 {
-       const FD_form_paper
-               *fd = fd_form_paper;
-       string
-               str;
-       char
-               val;
+       FD_form_paper const * fd = fd_form_paper;
+       string str;
+       char val;
     
        checkMarginValues();
        if (ob == fd->choice_papersize2) {
                val = fl_get_choice(fd->choice_papersize2)-1;
-               if (val == VM_PAPER_DEFAULT) {
+               if (val == BufferParams::VM_PAPER_DEFAULT) {
                        fl_set_button(fd->push_use_geometry, 0);
                        checkMarginValues();
                } else {
-                       if ((val != VM_PAPER_USLETTER) && (val != VM_PAPER_USLEGAL) &&
-                           (val != VM_PAPER_USEXECUTIVE) && (val != VM_PAPER_A4) &&
-                           (val != VM_PAPER_A5) && (val != VM_PAPER_B5)) {
+                       if (val != BufferParams::VM_PAPER_USLETTER
+                           && val != BufferParams::VM_PAPER_USLEGAL
+                           && val != BufferParams::VM_PAPER_USEXECUTIVE
+                           && val != BufferParams::VM_PAPER_A4
+                           && val != BufferParams::VM_PAPER_A5
+                           && val != BufferParams::VM_PAPER_B5) {
                                fl_set_button(fd->push_use_geometry, 1);
                        }
-                       fl_set_choice(fd->choice_paperpackage, PACKAGE_NONE + 1);
+                       fl_set_choice(fd->choice_paperpackage, BufferParams::PACKAGE_NONE + 1);
                }
        } else if (ob == fd->choice_paperpackage) {
                val = fl_get_choice(fd->choice_paperpackage)-1;
-               if (val != PACKAGE_NONE) {
-                       fl_set_choice(fd->choice_papersize2, VM_PAPER_DEFAULT + 1);
+               if (val != BufferParams::PACKAGE_NONE) {
+                       fl_set_choice(fd->choice_papersize2,
+                                     BufferParams::VM_PAPER_DEFAULT + 1);
                        fl_set_button(fd->push_use_geometry, 0);
                }
-       } else if ((ob==fd->input_custom_width) || (ob==fd->input_custom_height) ||
-                  (ob==fd->input_left_margin) || (ob==fd->input_right_margin) ||
-                  (ob==fd->input_top_margin) || (ob==fd->input_bottom_margin) ||
-                  (ob==fd->input_head_height) || (ob==fd->input_head_sep) ||
-                  (ob==fd->input_foot_skip)) {
+       } else if (ob == fd->input_custom_width
+                  || ob == fd->input_custom_height 
+                  || ob == fd->input_left_margin
+                  || ob == fd->input_right_margin 
+                  || ob == fd->input_top_margin
+                  || ob == fd->input_bottom_margin 
+                  || ob == fd->input_head_height
+                  || ob == fd->input_head_sep
+                  || ob == fd->input_foot_skip) {
                str = fl_get_input(ob);
                if (!str.empty() && !isValidLength(str)) {
                        fl_set_object_label(fd_form_paper->text_warning,