From 871c673928406f1059bc157d29611e35d8c95891 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 15 Aug 2006 05:40:23 +0000
Subject: [PATCH] *** empty log message ***
---
Common/ViewsIO.cpp | 4 ++--
Fltk/GUI.cpp | 14 +++++++++-----
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/Common/ViewsIO.cpp b/Common/ViewsIO.cpp
index 85d26f73e3..db7828238b 100644
--- a/Common/ViewsIO.cpp
+++ b/Common/ViewsIO.cpp
@@ -1,4 +1,4 @@
-// $Id: ViewsIO.cpp,v 1.7 2006-08-13 16:02:01 geuzaine Exp $
+// $Id: ViewsIO.cpp,v 1.8 2006-08-15 05:40:23 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -35,7 +35,7 @@ void UpdateViewsInGUI();
int ReadView(char *filename)
{
- FILE *fp = fopen(filename, "r");
+ FILE *fp = fopen(filename, "rb");
if(!fp){
Msg(GERROR, "Unable to open file '%s'", filename);
return 0;
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 95a4ec4b27..5859fd8717 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.515 2006-08-15 05:19:28 geuzaine Exp $
+// $Id: GUI.cpp,v 1.516 2006-08-15 05:40:23 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -1426,10 +1426,14 @@ void GUI::create_graphic_window()
}
x += 2;
- g_status_label[0] = new Fl_Box(x, glheight + 2,
- (width - x) / 3 - 1, sht);
- g_status_label[1] = new Fl_Box(x + (width - x) / 3, glheight + 2,
- width - (width - x) / 3, sht);
+ int wleft = (width - x) / 3 - 1;
+ int wright = (width - x) - (width - x) / 3 - 1;
+#if defined(WIN32)
+ wright += 1; // go right up to the right edge of the window
+#endif
+
+ g_status_label[0] = new Fl_Box(x, glheight + 2, wleft, sht);
+ g_status_label[1] = new Fl_Box(x + (width - x) / 3, glheight + 2, wright, sht);
for(int i = 0; i < 2; i++) {
g_status_label[i]->box(FL_THIN_DOWN_BOX);
g_status_label[i]->align(FL_ALIGN_LEFT | FL_ALIGN_INSIDE | FL_ALIGN_CLIP);
--
GitLab