Minor changes converting C to C++.

This commit is contained in:
David Capello 2009-10-16 02:26:28 +00:00
parent f2f78377ad
commit 3f1f5e378e
2 changed files with 30 additions and 35 deletions

View File

@ -37,7 +37,6 @@
#include "raster/image.h"
#include "widgets/editor.h"
/* static BITMAP *icons_pcx; */
static BITMAP* gfx_bmps[GFX_BITMAP_COUNT];
#include "modules/gfxdata.cpp"
@ -245,7 +244,7 @@ void simple_dotted_mode(BITMAP *bmp, int fg, int bg)
/**********************************************************************/
/* Set/Restore sub-clip regions */
struct CLIP_DATA
{
BITMAP* bmp;
@ -291,7 +290,7 @@ void backclip(void* _data)
/**********************************************************************/
/* Rectangle Tracker (Save/Restore rectangles from/to the screen) */
struct RectTracker
{
BITMAP* bmp;
@ -400,7 +399,7 @@ void rect_tracker_free(RectTracker* rt)
/**********************************************************************/
/* Rectangles */
void bevel_box(BITMAP* bmp, int x1, int y1, int x2, int y2, int c1, int c2, int bevel)
{
hline(bmp, x1+bevel, y1, x2-bevel, c1); /* top */

View File

@ -99,38 +99,34 @@ typedef struct RectTracker RectTracker;
int init_module_graphics();
void exit_module_graphics();
struct BITMAP *get_gfx(int id);
BITMAP* get_gfx(int id);
void dotted_mode(int offset);
void simple_dotted_mode(struct BITMAP *bmp, int fg, int bg);
void simple_dotted_mode(BITMAP* bmp, int fg, int bg);
void *subclip(struct BITMAP *bmp, int x1, int y1, int x2, int y2);
void *subclip(BITMAP* bmp, int x1, int y1, int x2, int y2);
void backclip(void *data);
RectTracker *rect_tracker_new(struct BITMAP *bmp, int x1, int y1, int x2, int y2);
RectTracker *rect_tracker_new(BITMAP* bmp, int x1, int y1, int x2, int y2);
void rect_tracker_free(RectTracker *tracker);
void bevel_box(struct BITMAP *bmp, int x1, int y1, int x2, int y2, int c1, int c2, int bevel);
void rectdotted(struct BITMAP *bmp, int x1, int y1, int x2, int y2, int fg, int bg);
void rectgrid(struct BITMAP *bmp, int x1, int y1, int x2, int y2, int w, int h);
void bevel_box(BITMAP* bmp, int x1, int y1, int x2, int y2, int c1, int c2, int bevel);
void rectdotted(BITMAP* bmp, int x1, int y1, int x2, int y2, int fg, int bg);
void rectgrid(BITMAP* bmp, int x1, int y1, int x2, int y2, int w, int h);
void draw_emptyset_symbol(JRect rc, int color);
void draw_color(struct BITMAP *bmp, int x1, int y1, int x2, int y2,
void draw_color(BITMAP* bmp, int x1, int y1, int x2, int y2,
int imgtype, color_t color);
void draw_color_button(struct BITMAP *bmp,
void draw_color_button(BITMAP* bmp,
int x1, int y1, int x2, int y2,
int b0, int b1, int b2, int b3,
int imgtype, color_t color,
bool hot, bool drag);
void draw_progress_bar(struct BITMAP* bmp,
void draw_progress_bar(BITMAP* bmp,
int x1, int y1, int x2, int y2,
float progress);
int character_length(struct FONT *font, int chr);
void render_character(struct BITMAP *bmp, struct FONT *font, int chr, int x, int y, int fg, int bg);
/* void swap_bitmap(struct ASE_BITMAP *bmp, struct ASE_BITMAP *area, int x, int y); */
/* void render_background(struct ASE_BITMAP *bitmap, int x1, int y1, int x2, int y2); */
int character_length(FONT* font, int chr);
void render_character(BITMAP* bmp, FONT* font, int chr, int x, int y, int fg, int bg);
#endif