From c9da270a193428c755b7bc6c5607201515bb4f2f Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 10 Jan 2001 09:11:56 +0000
Subject: [PATCH] *** empty log message ***
---
Fltk/Colorbar_Window.h | 12 ++----------
Fltk/GUI.cpp | 2 +-
Fltk/GUI.h | 21 +++------------------
Fltk/Makefile | 7 ++++---
Fltk/{Opengl.cpp => Opengl_Window.cpp} | 3 ++-
Fltk/Opengl_Window.h | 20 ++++++++++++++++++++
6 files changed, 32 insertions(+), 33 deletions(-)
rename Fltk/{Opengl.cpp => Opengl_Window.cpp} (99%)
create mode 100644 Fltk/Opengl_Window.h
diff --git a/Fltk/Colorbar_Window.h b/Fltk/Colorbar_Window.h
index 9bab815f5d..9bdc872a2e 100644
--- a/Fltk/Colorbar_Window.h
+++ b/Fltk/Colorbar_Window.h
@@ -1,8 +1,9 @@
#ifndef _COLORBAR_WINDOW_H
#define _COLORBAR_WINDOW_H
+#include "ColorTable.h"
+
typedef struct _colorbar {
- Window window;
int width, height; /* size */
int wedge_y; /* top coord of color wedge */
int marker_y; /* top coord of marker arrow */
@@ -17,13 +18,4 @@ typedef struct _colorbar {
#define WEDGE_HEIGHT 12 /* epaisseur de la colorbar */
#define MARKER_HEIGHT 10 /* hauteur de la fleche */
-void ColorBarCreate(Window win, int width, int height);
-void ColorBarShow(void);
-void ColorBarChange(char *label, float min, float max, ColorTable *ct, int rgb);
-void ColorBarCopy(ColorTable *ct);
-void ColorBarPaste(ColorTable *ct);
-void ColorBarResizeCb(Widget w, XtPointer client_data,
- XmDrawingAreaCallbackStruct *call_data);
-void ColorBarRedraw(void);
-
#endif
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index fe6ceaf05b..9aa4e7048f 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,6 +1,6 @@
// To make the interface as visually consistent as possible, please:
-// - use the BH and WB values for button heights and window borders
+// - use the BH, BW, WB, IW values for button heights/widths, window borders, etc.
// - use CTX.fontsize for font sizes
// - examine what's already done before adding something new...
diff --git a/Fltk/GUI.h b/Fltk/GUI.h
index 1312c42c38..dadfffe8ff 100644
--- a/Fltk/GUI.h
+++ b/Fltk/GUI.h
@@ -23,6 +23,9 @@
#include <FL/Fl_Browser.H>
#include <FL/Fl_Bitmap.H>
+#include "Opengl_Window.h"
+#include "Colorbar_Window.h"
+
#define NB_BUTT_MAX 100
#define NB_HISTORY_MAX 1000
@@ -57,24 +60,6 @@ extern Context_Item menu_mesh_define[];
extern Context_Item menu_mesh_define_transfinite[];
extern Context_Item menu_post[];
-// New composite widgets
-
-class Opengl_Window : public Fl_Gl_Window {
- void draw();
- void draw_overlay();
- int handle(int);
-
- // new
- void draw_highlight();
- void clear_overlay();
- void draw_overlay_zoom();
- void draw_overlay_highlight();
-
-public:
- Opengl_Window(int x,int y,int w,int h,const char *l=0)
- : Fl_Gl_Window(x, y, w, h, l) {}
-};
-
// The GUI class contains only the important widgets. All these
// widgets should stay private, and be accessed only by the public
// member functions.
diff --git a/Fltk/Makefile b/Fltk/Makefile
index 8ed53955a6..83dd6cd7b0 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 2001-01-09 14:24:06 geuzaine Exp $
+# $Id: Makefile,v 1.3 2001-01-10 09:08:59 geuzaine Exp $
#
# Makefile for "libFltk.a"
#
@@ -28,8 +28,9 @@ CFLAGS = $(C_FLAGS) $(OS_FLAGS) $(VERSION_FLAGS) $(INCLUDE)\
SRC = Main.cpp \
Message.cpp \
GUI.cpp\
- Opengl.cpp\
- Callbacks.cpp
+ Callbacks.cpp\
+ Opengl_Window.cpp\
+ Colorbar_Window.cpp
OBJ = $(SRC:.cpp=.o)
diff --git a/Fltk/Opengl.cpp b/Fltk/Opengl_Window.cpp
similarity index 99%
rename from Fltk/Opengl.cpp
rename to Fltk/Opengl_Window.cpp
index 5fbfe6e1fe..d5e3f1cb22 100644
--- a/Fltk/Opengl.cpp
+++ b/Fltk/Opengl_Window.cpp
@@ -1,4 +1,4 @@
-// $Id: Opengl.cpp,v 1.4 2001-01-09 15:45:03 geuzaine Exp $
+// $Id: Opengl_Window.cpp,v 1.1 2001-01-10 09:08:59 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -8,6 +8,7 @@
#include "Mesh.h"
#include "Draw.h"
#include "GUI.h"
+#include "Opengl_Window.h"
extern GUI *WID;
extern Mesh M;
diff --git a/Fltk/Opengl_Window.h b/Fltk/Opengl_Window.h
new file mode 100644
index 0000000000..7bbedaa1e1
--- /dev/null
+++ b/Fltk/Opengl_Window.h
@@ -0,0 +1,20 @@
+#ifndef _OPENGL_WINDOW_H_
+#define _OPENGL_WINDOW_H_
+
+class Opengl_Window : public Fl_Gl_Window {
+ void draw();
+ void draw_overlay();
+ int handle(int);
+
+ // new
+ void draw_highlight();
+ void clear_overlay();
+ void draw_overlay_zoom();
+ void draw_overlay_highlight();
+
+public:
+ Opengl_Window(int x,int y,int w,int h,const char *l=0)
+ : Fl_Gl_Window(x, y, w, h, l) {}
+};
+
+#endif
--
GitLab