Changeset 29220

Timestamp:

Sep 23, 2010, 8:47:04 AM (16 years ago)

Author:

eugene

Message:

need to define hms_buttons on their own

Location:

branches/eam_branches/ipp-20100823/Ohana/src/kapa2

Files:

• include/buttons.h (modified) (12 diffs)
• include/hms_buttons.h (added)
• src/ButtonFunctions.c (modified) (1 diff)
• src/Image.c (modified) (1 diff)

branches/eam_branches/ipp-20100823/Ohana/src/kapa2/include/buttons.h

@@ -1 +1 @@
 #define PS_width 25
 #define PS_height 25
-char PS_bits[] = {
+static char PS_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x81, 0x3f, 0x00,
    0x82, 0x67, 0x60, 0x00, 0x02, 0x26, 0x40, 0x00, 0x02, 0x24, 0x40, 0x00,
@@ -13 +13 @@
 #define grey_width 25
 #define grey_height 25
-char grey_bits[] = {
+static char grey_bits[] = {
    0x90, 0x40, 0xf7, 0x01, 0x04, 0xaa, 0xad, 0x01, 0x68, 0xd5, 0xfe, 0x01,
    0x82, 0x28, 0xdb, 0x01, 0x10, 0xd2, 0x75, 0x01, 0x40, 0xad, 0xee, 0x01,
@@ -25 +25 @@
 #define rainbow_width 25
 #define rainbow_height 25
-char rainbow_bits[] = {
+static char rainbow_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x80, 0xff, 0x00, 0x00, 0x70, 0x00, 0x01, 0x00, 0x0c, 0x7f, 0x00,
@@ -37 +37 @@
 #define recenter_width 25
 #define recenter_height 25
-char recenter_bits[] = {
+static char recenter_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00,
    0x80, 0xef, 0x03, 0x00, 0xe0, 0x00, 0x0e, 0x00, 0x30, 0x00, 0x18, 0x00,
@@ -49 +49 @@
 #define heat_width 25
 #define heat_height 25
-char heat_bits[] = {
+static char heat_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x07, 0xd8, 0x01,
    0x00, 0x0c, 0x37, 0x00, 0xf8, 0xc9, 0x6f, 0x00, 0x0c, 0xde, 0xf0, 0x00,
@@ -61 +61 @@
 #define red_width 25
 #define red_height 25
-char red_bits[] = {
+static char red_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xfc, 0x03, 0x00,
    0x20, 0x07, 0x06, 0x00, 0xe0, 0x00, 0x0c, 0x00, 0x20, 0x00, 0x08, 0x00,
@@ -73 +73 @@
 #define green_width 25
 #define green_height 25
-char green_bits[] = {
+static char green_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0x00,
    0x00, 0x06, 0x04, 0x00, 0x80, 0x03, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00,
@@ -85 +85 @@
 #define blue_width 25
 #define blue_height 25
-char blue_bits[] = {
+static char blue_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xfe, 0x00, 0x00,
    0xc0, 0x83, 0x07, 0x00, 0xc0, 0x00, 0x0c, 0x00, 0x40, 0x00, 0x08, 0x00,
@@ -97 +97 @@
 #define yellow_width 25
 #define yellow_height 25
-char yellow_bits[] = {
+static char yellow_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x18, 0x00,
    0x80, 0x01, 0x0c, 0x00, 0x00, 0x03, 0x06, 0x00, 0x00, 0x02, 0x02, 0x00,
@@ -109 +109 @@
 #define flipx_width 25
 #define flipx_height 25
-char flipx_bits[] = {
+static char flipx_bits[] = {
    0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x01, 0x00, 0x80, 0x10, 0x02, 0x00,
@@ -121 +121 @@
 #define flipy_width 25
 #define flipy_height 25
-char flipy_bits[] = {
+static char flipy_bits[] = {
    0x00, 0x10, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00,
    0x00, 0x82, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x80, 0x00, 0x02, 0x00,
@@ -131 +131 @@
    0x00, 0x82, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00,
    0x00, 0x10, 0x00, 0x00 };
-#define hms_width 25
-#define hms_height 12
-char hms_bits[] = {
-   0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-   0x02, 0x00, 0x00, 0x00, 0x02, 0x01, 0xf0, 0x00, 0x1e, 0xef, 0x89, 0x00,
-   0x22, 0x11, 0x09, 0x00, 0x22, 0x11, 0x71, 0x00, 0x22, 0x11, 0x81, 0x00,
-   0x22, 0x11, 0x89, 0x00, 0x22, 0x01, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00};
-#define ddd_width 25
-#define ddd_height 12
-char ddd_bits[] = {
-   0x40, 0x80, 0x80, 0x00, 0x40, 0x80, 0x80, 0x00, 0x40, 0x80, 0x80, 0x00,
-   0x40, 0x80, 0x80, 0x00, 0x40, 0x80, 0x80, 0x00, 0x5c, 0xb8, 0xb8, 0x00,
-   0x62, 0xc4, 0xc4, 0x00, 0x42, 0x84, 0x84, 0x00, 0x42, 0x84, 0x84, 0x00,
-   0x62, 0xc4, 0xc4, 0x00, 0x5c, 0xb9, 0xb8, 0x00, 0x00, 0x00, 0x00, 0x00};
 #define hex_width 25
 #define hex_height 12
-char hex_bits[] = {
+static char hex_bits[] = {
    0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
    0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0xf0, 0x00, 0x1e, 0x00, 0x88, 0x00,

branches/eam_branches/ipp-20100823/Ohana/src/kapa2/src/ButtonFunctions.c

@@ -1 +1 @@
 # include "Ximage.h"
-# include "buttons.h"
+# include "hms_buttons.h"
 
 int PSfunction (Graphic *graphic, KapaImageWidget *image) {

branches/eam_branches/ipp-20100823/Ohana/src/kapa2/src/Image.c

@@ -1 +1 @@
 # include "Ximage.h"
 # include "buttons.h"
+# include "hms_buttons.h"
 
 int InitImageChannel (KapaImageChannel *channel) {