#include <config.h>
#include <cstdlib>
-#include <clocale>
#ifdef __GNUG__
#pragma implementation
#include "lyx_gui.h"
#include FORMS_H_LOCATION
#include "support/filetools.h"
-#include "combox.h"
#include "lyx.h"
#include "form1.h"
#include "print_form.h"
#include "ColorHandler.h"
#include "frontends/Dialogs.h"
#include "frontends/GUIRunTime.h"
-#include "frontends/xforms/xform_helpers.h" // for XformColor
+#include "frontends/xforms/xforms_helpers.h" // for XformColor
using std::endl;
{"-geometry", "*.geometry", XrmoptionSepArg, "690x510"}
};
-static int width = 690;
-static int height = 510;
-static int xpos = -1;
-static int ypos = -1;
-static char geometry[40];
+namespace {
+
+int width = 690;
+int height = 510;
+int xpos = -1;
+int ypos = -1;
+char geometry[40];
+
+} // namespace anon
FL_resource res[] =
fl_initialize(argc, argv, "LyX", cmdopt, num_res);
// It appears that, in xforms >=0.89.5, fl_initialize()
// calls setlocale() and ruins our LC_NUMERIC setting.
- setlocale(LC_NUMERIC, "C");
+ locale_init();
fl_get_app_resources(res, num_res);
static const int geometryBitmask =
ypos += HeightOfScreen(ScreenOfDisplay(fl_get_display(), fl_screen)) - height; //DefaultScreen(fl_get_display())) - height;
// Initialize the LyXColorHandler
- lyxColorHandler = new LyXColorHandler;
+ lyxColorHandler.reset(new LyXColorHandler);
}
// should a mapping exist.
{
string filename = AddName(user_lyxdir, "preferences.xform");
- XformColor::read( filename );
+ XformsColor::read( filename );
}
// Show the main & title form