From f268c054b11a9cf8c2b9edf274a101d8c8057619 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 8 May 2001 12:09:31 +0000
Subject: [PATCH] *** empty log message ***
---
Common/Bitmaps.h | 22 +++++++++++-----------
Fltk/GUI.cpp | 11 +++++++----
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/Common/Bitmaps.h b/Common/Bitmaps.h
index 0e570694c8..7449b93d46 100644
--- a/Common/Bitmaps.h
+++ b/Common/Bitmaps.h
@@ -159,17 +159,17 @@ static char stop_bits[] = {
// 'Gmsh' (Windows) icon
static char gmsh_and_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x03,0x00,0x01,0xf0,0x03,0xc1,
- 0x63,0x8c,0x83,0xe3,0xf3,0x86,0xc3,0xf3,0xf9,0x87,0xe3,0xcb,0xe5,0x47,0xb3,
- 0xc7,0xe3,0x3f,0x9a,0xe3,0xe1,0x1f,0xce,0xe1,0xe0,0x07,0xc7,0x60,0xc0,0x80,
- 0x03,0x00,0x00,0xc0,0x01,0x60,0x00,0xe0,0x00,0x60,0x00,0xf0,0x00,0x70,0x00,
- 0x78,0x00,0x38,0x00,0x7c,0x00,0x38,0x00,0x3c,0x00,0x1c,0x00,0x1e,0x00,0x0e,
- 0x00,0x0c,0x02,0x06,0x00,0x00,0x03,0x03,0x00,0x80,0x07,0xc1,0x00,0xc0,0x87,
- 0xe0,0x01,0x60,0x8f,0xf0,0x01,0x10,0x4e,0xe8,0x01,0x08,0x4e,0xc4,0x21,0x24,
- 0xe4,0xc2,0x11,0x32,0xe6,0xc1,0x09,0x70,0xe3,0xc0,0x05,0xe0,0x40,0xc0,0x03,
- 0x00,0x00,0x80,0x01,0x00,0x00,0x00,0x00};
-
-static char gmsh_and_bits[] = {
+ 0xff,0xff,0xdf,0xff,0xff,0xff,0x8f,0xff,0xff,0xff,0x87,0xff,0xff,0x1f,0x80,
+ 0xff,0xff,0xe7,0xc3,0xff,0xff,0xf3,0x81,0xff,0xff,0xf8,0x81,0xff,0x7f,0xf8,
+ 0x01,0xff,0x7f,0xf8,0x01,0xff,0x3f,0xf0,0x05,0xff,0x1f,0xf0,0x0e,0xef,0x1f,
+ 0x00,0x8f,0xf3,0x1f,0x80,0x9f,0xf8,0x1f,0xc0,0x5f,0xfc,0x1f,0xe0,0x0f,0xfe,
+ 0x3f,0xf8,0x8f,0xff,0xff,0xff,0xc3,0xff,0xff,0xff,0xe1,0xff,0xff,0xff,0xe0,
+ 0xff,0xff,0x7f,0xf0,0xff,0xff,0x3f,0xf0,0xff,0xff,0x1f,0xf8,0xff,0xff,0x0f,
+ 0xfc,0xff,0xff,0x07,0xfc,0xff,0xff,0x03,0xfe,0xff,0xff,0x03,0xff,0xff,0xff,
+ 0x01,0xff,0xff,0xff,0x81,0xff,0xff,0xff,0xc1,0xff,0xff,0xff,0xe1,0xff,0xff,
+ 0xff,0xf9,0xff,0xff,0xff,0xff,0xff,0xff};
+
+static char gmsh_xor_bits[] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 3146ea7f87..64ac42ae4a 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.73 2001-05-08 11:34:19 geuzaine Exp $
+// $Id: GUI.cpp,v 1.74 2001-05-08 12:09:31 geuzaine Exp $
// To make the interface as visually consistent as possible, please:
// - use the BH, BW, WB, IW values for button heights/widths, window borders, etc.
@@ -472,11 +472,14 @@ GUI::GUI(int argc, char **argv) {
create_graphic_window(argc, argv);
#ifdef WIN32
- HICON icon = CreateIcon(NULL, 32, 32, 1, 1,
+ HICON icon = CreateIcon(NULL,
+ GetSystemMetrics(SM_CXICON),
+ GetSystemMetrics(SM_CYICON),
+ 1, 1,
(CONST BYTE *)gmsh_and_bits,
(CONST BYTE *)gmsh_xor_bits);
- m_window->icon((char *)icon);
- g_window->icon((char *)icon);
+ //m_window->icon((char *)icon);
+ //g_window->icon((char *)icon);
#else
fl_open_display();
Pixmap p1 = XCreateBitmapFromData(fl_display, DefaultRootWindow(fl_display),
--
GitLab