some fixes..

master
steffen 13 years ago
parent 8cc646d18e
commit a8bfba1032

@ -1,4 +1,4 @@
/* $Id: gui_mainmenu.c,v 1.10 2013/03/06 23:27:25 steffen Exp $ */ /* $Id: gui_mainmenu.c,v 1.11 2013/05/29 14:08:41 steffen Exp $ */
/*************************************************************************** /***************************************************************************
* gui_mainmenu.c * gui_mainmenu.c
* *
@ -59,8 +59,8 @@ void gui_mainmenu_show () {
} }
gui_window_item_add (&wmmenu, mbtn_refresh); gui_window_item_add (&wmmenu, mbtn_refresh);
mbtn_refreshidx = gui_button_new (_("Update Index"), 105, 30, 90, 20);
if (mbtn_refreshidx == NULL) { if (mbtn_refreshidx == NULL) {
mbtn_refreshidx = gui_button_new (_("Update Index"), 105, 30, 90, 20);
GUI_BUTTON_T(mbtn_refreshidx)->callback_clicked = (void*)gui_mainmenu_refreshidx; GUI_BUTTON_T(mbtn_refreshidx)->callback_clicked = (void*)gui_mainmenu_refreshidx;
} }
gui_window_item_add (&wmmenu, mbtn_refreshidx); gui_window_item_add (&wmmenu, mbtn_refreshidx);
@ -197,18 +197,16 @@ void gui_mainmenu_refresh () {
void gui_mainmenu_refreshidx () { void gui_mainmenu_refreshidx () {
char lfn[LEN_FILENAME];
#ifndef _WINDOWSCE_ #ifndef _WINDOWSCE_
char lfn[LEN_FILENAME];
char rfn[LEN_FILENAME] = "search.mapidx"; char rfn[LEN_FILENAME] = "search.mapidx";
#endif
gui_close (); gui_close ();
map_search_get_filename (lfn, LEN_FILENAME); map_search_get_filename (lfn, LEN_FILENAME);
#ifndef _WINDOWSCE_
map_webload (rfn, lfn, NULL); map_webload (rfn, lfn, NULL);
#endif
map_search_sort (); map_search_sort ();
draw_redrawmap (); draw_redrawmap ();
#endif
}; };

@ -170,7 +170,6 @@ void gfx_draw_polygon (struct image *dimg, iPoint *p, int pcnt, struct line_styl
void gfx_draw_text (struct image *dimg, int x, int y, char *text, struct color *c) { void gfx_draw_text (struct image *dimg, int x, int y, char *text, struct color *c) {
gfx_fbo_switch (dimg); gfx_fbo_switch (dimg);
glColor4f (c->c.r, c->c.g, c->c.b, 1.0f); glColor4f (c->c.r, c->c.g, c->c.b, 1.0f);
d_printf ("fint_draw:'%s'", text);
font_draw (font, text, x, y+12.0, 1.0, 1.0); font_draw (font, text, x, y+12.0, 1.0, 1.0);
}; };

Loading…
Cancel
Save