root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 2.0 nopatch

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :
Compilazione Linux


git-svn-id: svn://10.65.10.50/trunk@11220 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
alex 2003-06-06 13:50:22 +00:00
parent 18697ab995
commit fa53273fe0
14 changed files with 307 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
xi/xi.c
View File

@ -443,9 +443,13 @@ control_event( XI_OBJ * itf, XinWindow win, XinEvent * ep )
xi_control_event_scroll( xi_obj, XI_SCROLL_FIRST, percent, TRUE ); xi_control_event_scroll( xi_obj, XI_SCROLL_FIRST, percent, TRUE );
break; break;
} }
default:
break;
} }
break; break;
} }
default:
break;
} }
} }
if ( xi_is_itf( itf ) && if ( xi_is_itf( itf ) &&
@ -488,8 +492,12 @@ control_event( XI_OBJ * itf, XinWindow win, XinEvent * ep )
control_event_hscroll( xi_obj, XI_SCROLL_FIRST, pos ); control_event_hscroll( xi_obj, XI_SCROLL_FIRST, pos );
break; break;
} }
default:
break;
} }
break; break;
default:
break;
} }
} }
} }
@ -536,6 +544,8 @@ destroy_controls( XI_OBJ * xi_obj )
xi_bitmap_destroy( xi_obj->v.btn->down_bitmap ); xi_bitmap_destroy( xi_obj->v.btn->down_bitmap );
xi_bitmap_destroy( xi_obj->v.btn->disabled_bitmap ); xi_bitmap_destroy( xi_obj->v.btn->disabled_bitmap );
break; break;
default:
break;
} }
objp = xi_obj->children; objp = xi_obj->children;
for ( i = xi_obj->nbr_children; i > 0; i--, objp++ ) for ( i = xi_obj->nbr_children; i > 0; i--, objp++ )
@ -637,6 +647,8 @@ do_edit_menu( XI_OBJ * itf, XinEvent * ep )
attrib = xi_get_attrib( column ); attrib = xi_get_attrib( column );
break; break;
} }
default:
break;
} }
if ( attrib & XI_ATR_EDITMENU ) if ( attrib & XI_ATR_EDITMENU )
{ {
@ -1354,6 +1366,9 @@ field_event( XI_OBJ * xi_obj, XinEvent * ep )
} }
} }
break; break;
default:
break;
} }
} }
@ -1459,8 +1474,10 @@ form_event( XI_OBJ * xi_obj, XinEvent * ep )
static BOOLEAN static BOOLEAN
invalidate_button_rect( XI_OBJ * xi_obj, XI_BTN_DATA * bd, XinRect * rct ) invalidate_button_rect( XI_OBJ * xi_obj, XI_BTN_DATA * bd, XinRect * rct )
{ {
if ( ( bd->type == XIBT_BUTTON || bd->type == XIBT_BUTTON_CHECKBOX || // if (( bd->type == XIBT_BUTTON || bd->type == XIBT_BUTTON_CHECKBOX ||
bd->type == XIBT_RADIOBTN ) && bd->drawable || bd->type == XIBT_TABBTN ) // bd->type == XIBT_RADIOBTN ) && bd->drawable || bd->type == XIBT_TABBTN)
if ((( bd->type == XIBT_BUTTON || bd->type == XIBT_BUTTON_CHECKBOX ||
bd->type == XIBT_RADIOBTN ) && bd->drawable) || bd->type == XIBT_TABBTN)
{ {
XinRect r; XinRect r;
XinWindow win; XinWindow win;
@ -1603,6 +1620,8 @@ btn_event( XI_OBJ * xi_obj, XinEvent * ep )
} }
} }
break; break;
default:
break;
} }
} }
ret_val = TRUE; ret_val = TRUE;
@ -1770,6 +1789,8 @@ list_event( XI_OBJ * xi_obj, XinEvent * ep )
} }
} }
break; break;
default:
break;
} }
} }
} }
@ -1878,6 +1899,8 @@ itf_event( XI_OBJ * xi_obj, XinEvent * ep )
xi_move_focus( obj ); xi_move_focus( obj );
ep->v.character.consumed = TRUE; ep->v.character.consumed = TRUE;
break; break;
default:
break;
} }
} }
} }
@ -2235,6 +2258,9 @@ xi_event( XinWindow win, XinEvent * ep )
new_cursor = new_cursor =
( XinCursor ) xi_get_pref( XI_PREF_VSIZE_CURSOR_RID ); ( XinCursor ) xi_get_pref( XI_PREF_VSIZE_CURSOR_RID );
break; break;
default:
new_cursor = XI_CURSOR_ARROW;
break;
} }
if ( itf_data->cursor != new_cursor && !itf_data->cursor_override ) if ( itf_data->cursor != new_cursor && !itf_data->cursor_override )
{ {
@ -2311,6 +2337,8 @@ xi_event( XinWindow win, XinEvent * ep )
XinNativeHelp( win, itf->help_key ); XinNativeHelp( win, itf->help_key );
break; break;
} }
default:
break;
} }
if ( ep->type == XinEventPaint ) if ( ep->type == XinEventPaint )
@ -2677,7 +2705,7 @@ void
xi_set_rect( XI_OBJ * xi_obj, XinRect * rctp, BOOLEAN do_invalidates ) xi_set_rect( XI_OBJ * xi_obj, XinRect * rctp, BOOLEAN do_invalidates )
{ {
XinRect old_rect; XinRect old_rect;
XinWindow win; XinWindow win = 0L;
if (do_invalidates) if (do_invalidates)
{ {
win = xi_get_window( xi_obj ); win = xi_get_window( xi_obj );
@ -2740,6 +2768,8 @@ xi_get_sel( XI_OBJ * xi_obj, int *selstart, int *selstop )
case XIT_TEXT: case XIT_TEXT:
XinError( 20022, XinSeverityFatal, 0L ); XinError( 20022, XinSeverityFatal, 0L );
break; break;
default:
break;
} }
} }
@ -2784,6 +2814,8 @@ xi_get_text( XI_OBJ * xi_obj, char *s, int len )
if ( s ) if ( s )
*s = '\0'; *s = '\0';
break; break;
default:
break;
} }
if ( s && b ) if ( s && b )
tstrncpy( s, b, len ); tstrncpy( s, b, len );
@ -2966,6 +2998,8 @@ xi_set_fore_color( XI_OBJ * xi_obj, XinColor color )
} }
break; break;
} }
default:
break;
} }
} }
@ -3143,6 +3177,8 @@ xi_set_bufsize( XI_OBJ * xi_obj, int size )
for ( i = xi_obj->nbr_children; i > 0; i--, objp++ ) for ( i = xi_obj->nbr_children; i > 0; i--, objp++ )
xi_set_bufsize( *objp, size ); xi_set_bufsize( *objp, size );
break; break;
default:
break;
} }
} }
@ -3171,6 +3207,8 @@ case XIT_CELL:
case XIT_ROW: case XIT_ROW:
XinError( 20028, XinSeverityFatal, 0L ); XinError( 20028, XinSeverityFatal, 0L );
break; break;
default:
break;
} }
} }
@ -3265,6 +3303,8 @@ xi_set_text( XI_OBJ * xi_obj, char *s )
case XIT_FORM: case XIT_FORM:
case XIT_LIST: case XIT_LIST:
break; break;
default:
break;
} }
} }
@ -4017,6 +4057,8 @@ xi_get_handle( XI_OBJ * list, XI_OBJ * child )
return lm_data->recs[row]; return lm_data->recs[row];
break; break;
} }
default:
break;
} }
return -1L; return -1L;
} }
@ -4282,6 +4324,8 @@ xi_container_def_get_width( XI_OBJ_DEF * obj_def )
} }
case XI_STACK_VERTICAL: case XI_STACK_VERTICAL:
return xi_container_def_get_btn_width( obj_def ); return xi_container_def_get_btn_width( obj_def );
default:
break;
} }
return 0; return 0;
} }
@ -4328,6 +4372,10 @@ xi_container_def_get_height( XI_OBJ_DEF * obj_def )
vert_spacing = 0; vert_spacing = 0;
top_offset = 0; top_offset = 0;
break; break;
default:
vert_spacing = 0;
top_offset = 0;
break;
} }
return height * obj_def->nbr_children + vert_spacing return height * obj_def->nbr_children + vert_spacing
* ( obj_def->nbr_children - 1 ) + top_offset; * ( obj_def->nbr_children - 1 ) + top_offset;

33
xi/xi2.c
View File

@ -243,9 +243,8 @@ XI_OBJ *
xi_find_next_obj( XI_OBJ * focus_obj, XI_NEXT_TYPE tab_type, long c ) xi_find_next_obj( XI_OBJ * focus_obj, XI_NEXT_TYPE tab_type, long c )
{ {
XI_OBJ_TYPE type; XI_OBJ_TYPE type;
XI_OBJ *itf, XI_OBJ *itf, *obj = NULL;
*obj; int tab_cid = 0;
int tab_cid;
if ( focus_obj == NULL || focus_obj->type == XIT_ITF ) if ( focus_obj == NULL || focus_obj->type == XIT_ITF )
{ {
@ -271,6 +270,8 @@ xi_find_next_obj( XI_OBJ * focus_obj, XI_NEXT_TYPE tab_type, long c )
if ( obj->type == XIT_ITF ) /* No container, ignore it */ if ( obj->type == XIT_ITF ) /* No container, ignore it */
return NULL; return NULL;
break; break;
default:
break;
} }
while ( TRUE ) while ( TRUE )
{ {
@ -389,6 +390,8 @@ xi_find_next_obj( XI_OBJ * focus_obj, XI_NEXT_TYPE tab_type, long c )
if ( obj->type == XIT_ITF ) /* No container, ignore it */ if ( obj->type == XIT_ITF ) /* No container, ignore it */
return NULL; return NULL;
break; break;
default:
break;
} }
while ( TRUE ) while ( TRUE )
{ {
@ -774,6 +777,8 @@ gen_place_focus_events( XI_OBJ * old_focus, XI_OBJ * new_focus, BOOLEAN old_is_c
return FALSE; return FALSE;
return ( move_group_focus( new_focus, old_focus, itf, XIE_ON_GROUP, old_is_cell ) return ( move_group_focus( new_focus, old_focus, itf, XIE_ON_GROUP, old_is_cell )
&& send_object_event( new_focus, XIE_ON_FIELD ) ); && send_object_event( new_focus, XIE_ON_FIELD ) );
default:
break;
} }
return move_group_focus( new_focus, old_focus, itf, XIE_ON_GROUP, old_is_cell ); return move_group_focus( new_focus, old_focus, itf, XIE_ON_GROUP, old_is_cell );
} }
@ -844,7 +849,7 @@ move_focus_to_list( XI_OBJ ** focus_result )
attrib = lmp->lm_column_data[col]->attrib; attrib = lmp->lm_column_data[col]->attrib;
if ( ( attrib & XI_ATR_ENABLED ) && !( attrib & XI_ATR_SELECTABLE ) if ( ( attrib & XI_ATR_ENABLED ) && !( attrib & XI_ATR_SELECTABLE )
&& ( col < lm_get_fixed_columns( list_data->lm ) && ( col < lm_get_fixed_columns( list_data->lm )
|| col >= first_col && col <= last_col ) ) || (col >= first_col && col <= last_col )))
{ {
new_focus->v.cell.column = ( unsigned char ) col; new_focus->v.cell.column = ( unsigned char ) col;
break; break;
@ -925,6 +930,8 @@ determine_new_focus( XI_OBJ ** new_focus )
case XIT_CONTAINER: case XIT_CONTAINER:
*new_focus = determine_focus_button( *new_focus ); *new_focus = determine_focus_button( *new_focus );
break; break;
default:
break;
} }
} while ( *new_focus != NULL && } while ( *new_focus != NULL &&
( ( *new_focus )->type == XIT_CONTAINER || ( ( *new_focus )->type == XIT_CONTAINER ||
@ -967,6 +974,8 @@ check_new_focus_enabled( XI_OBJ * xi_obj )
XinError( 20007, XinSeverityFatal, 0L ); XinError( 20007, XinSeverityFatal, 0L );
break; break;
} }
default:
break;
} }
} }
@ -1339,7 +1348,7 @@ static void
xi_stx_cb( STX_CB_DATA * stx_cb_data ) xi_stx_cb( STX_CB_DATA * stx_cb_data )
{ {
XI_EVENT xiev; XI_EVENT xiev;
BOOLEAN send_cb; BOOLEAN send_cb = FALSE;
XI_OBJ *xi_obj; XI_OBJ *xi_obj;
xi_obj = xiev.v.xi_obj = ( XI_OBJ * ) stx_get_app_data( stx_cb_data->stx ); xi_obj = xiev.v.xi_obj = ( XI_OBJ * ) stx_get_app_data( stx_cb_data->stx );
@ -1508,6 +1517,8 @@ xi_lm_cb( LM_CB_DATA * lm_cb_data )
case LM_CB_GET_LAST: case LM_CB_GET_LAST:
xiev.type = XIE_GET_LAST; xiev.type = XIE_GET_LAST;
break; break;
default:
break;
} }
xiev.v.rec_request.list = lm_obj; xiev.v.rec_request.list = lm_obj;
xiev.v.rec_request.spec_rec = lm_cb_data->v.rec_request.spec_rec; xiev.v.rec_request.spec_rec = lm_cb_data->v.rec_request.spec_rec;
@ -1671,6 +1682,8 @@ xi_lm_cb( LM_CB_DATA * lm_cb_data )
case LM_CB_COL_SIZE: case LM_CB_COL_SIZE:
lm_cb_data->v.column.refused = xiev.refused; lm_cb_data->v.column.refused = xiev.refused;
break; break;
default:
break;
} }
} }
@ -2243,7 +2256,7 @@ container_create( XI_OBJ_DEF * xi_obj_def, XI_OBJ * container )
int i, int i,
len, len,
max_len; max_len;
XI_BTN_TYPE button_type; XI_BTN_TYPE button_type = XIBT_BUTTON;
int border; int border;
if ( xi_obj_def->nbr_children <= 0 ) if ( xi_obj_def->nbr_children <= 0 )
@ -2296,7 +2309,7 @@ xi_container_set_rect_internal( XI_OBJ *xi_obj, XinRect *rect )
len, len,
max_len; max_len;
int border; int border;
XI_OBJ *child; XI_OBJ *child = NULL;
XinRect child_rect; XinRect child_rect;
cdata = xi_obj->v.container; cdata = xi_obj->v.container;
@ -2329,7 +2342,7 @@ xi_container_set_rect_internal( XI_OBJ *xi_obj, XinRect *rect )
case XIBT_TABBTN: case XIBT_TABBTN:
{ {
int top_ofst, int top_ofst,
vert_spacing, vert_spacing = 0,
vert_form_unit; vert_form_unit;
vert_form_unit = xi_get_fu_height( xi_obj->itf ); vert_form_unit = xi_get_fu_height( xi_obj->itf );
if ( !cdata->packed ) if ( !cdata->packed )
@ -2342,6 +2355,8 @@ xi_container_set_rect_internal( XI_OBJ *xi_obj, XinRect *rect )
cdata->rct.bottom -= top_ofst; cdata->rct.bottom -= top_ofst;
} }
break; break;
default:
break;
} }
} }
@ -3077,10 +3092,12 @@ column_create( XI_OBJ_DEF * xi_obj_def, XI_OBJ * obj,
lm_column_def.attrib = col_def->attrib; lm_column_def.attrib = col_def->attrib;
char_pixel_width = xi_get_fu_width( obj->itf ); char_pixel_width = xi_get_fu_width( obj->itf );
if ( col_def->pixel_width == 0 ) if ( col_def->pixel_width == 0 )
{
if ( xi_get_xil_pref( obj->parent->parent ) ) if ( xi_get_xil_pref( obj->parent->parent ) )
col_def->pixel_width = col_def->width * char_pixel_width; col_def->pixel_width = col_def->width * char_pixel_width;
else else
col_def->pixel_width = col_def->width * char_pixel_width / XI_FU_MULTIPLE; col_def->pixel_width = col_def->width * char_pixel_width / XI_FU_MULTIPLE;
}
pixel_width = col_def->pixel_width; pixel_width = col_def->pixel_width;
if ( list_data->width ) if ( list_data->width )
{ {

6
xi/xicf.c
View File

@ -794,6 +794,8 @@ case XIT_LIST:
xi_rd->bitmap = xi_bitmap_copy( rect_data->bitmap ); xi_rd->bitmap = xi_bitmap_copy( rect_data->bitmap );
return rect; return rect;
} }
default:
break;
} }
return NULL; return NULL;
} }
@ -869,6 +871,8 @@ xi_def_free_internal( XI_OBJ_DEF* obj_def )
case XIT_RECT: case XIT_RECT:
xi_bitmap_destroy( obj_def->v.rect->bitmap ); xi_bitmap_destroy( obj_def->v.rect->bitmap );
break; break;
default:
break;
} }
for ( num = 0; num < obj_def->nbr_children; num++ ) for ( num = 0; num < obj_def->nbr_children; num++ )
xi_def_free_internal( obj_def->children[ num ] ); xi_def_free_internal( obj_def->children[ num ] );
@ -1333,6 +1337,8 @@ xi_button_set_default( XI_OBJ * xi_obj, BOOLEAN set )
xi_button_set_default( *ptr, FALSE ); xi_button_set_default( *ptr, FALSE );
return TRUE; return TRUE;
} }
default:
break;
} }
return FALSE; return FALSE;
} }

4
xi/xidbg.c
View File

@ -408,6 +408,8 @@ xi_event_debug( char *tag, XI_EVENT * xiev, char *s, int len )
object_type[k].desc, char_str, xiev->v.chr.shift, object_type[k].desc, char_str, xiev->v.chr.shift,
xiev->v.chr.control, xiev->v.chr.alt ); xiev->v.chr.control, xiev->v.chr.alt );
break; break;
default:
break;
} }
break; break;
} }
@ -463,6 +465,8 @@ xi_event_debug( char *tag, XI_EVENT * xiev, char *s, int len )
xiev->v.column.list->cid, xiev->v.column.col_nbr, xiev->v.column.list->cid, xiev->v.column.col_nbr,
xiev->v.column.new_col_width, xiev->v.column.new_col_pixel_width ); xiev->v.column.new_col_width, xiev->v.column.new_col_pixel_width );
break; break;
default:
break;
} }
tmp = ( char * ) xi_tree_malloc( strlen( str ) + strlen( str2 ) + 2, NULL ); tmp = ( char * ) xi_tree_malloc( strlen( str ) + strlen( str2 ) + 2, NULL );
strcpy( tmp, str ); strcpy( tmp, str );

6
xi/xilm.c
View File

@ -763,6 +763,8 @@ lm_get_rect( LM lm, LM_PART part, int idx, XinRect * rct )
rct->right = lmp->rct.right; rct->right = lmp->rct.right;
break; break;
} }
default:
break;
} }
return rct; return rct;
} }
@ -995,6 +997,8 @@ lm_set_color( LM lm, LM_PART part, int idx, int idx2, BOOLEAN v_scrolled,
cell_data->color = color; cell_data->color = color;
} }
break; break;
default:
break;
} }
} }
@ -1462,6 +1466,8 @@ lm_set_font( LM lm, LM_PART part, int idx, int idx2, XinFont * font )
XinWindowFontMap( lmp->win, cell_data->font ); XinWindowFontMap( lmp->win, cell_data->font );
break; break;
} }
default:
break;
} }
} }

15
xi/xilm2.c
View File

@ -15,6 +15,7 @@
#include "xiutils.h" #include "xiutils.h"
#include "xidisply.h" #include "xidisply.h"
#include "xi_int.h" #include "xi_int.h"
#include <limits.h>
#define REALIZED_ROWS_GRANULE 4 #define REALIZED_ROWS_GRANULE 4
#define REC_AT_TOP 1 #define REC_AT_TOP 1
@ -2653,7 +2654,7 @@ lm_insert_row( LM lm, int row )
{ {
if ( row > 0 && lmp->nbr_realized_rows ) if ( row > 0 && lmp->nbr_realized_rows )
{ {
int idx, int idx = 0,
row_height, row_height,
pix; pix;
XinRect r, XinRect r,
@ -4226,7 +4227,7 @@ lm_move_event( LM_DATA * lmp, XinEvent * ep )
break; break;
case XinEventMouseMove: case XinEventMouseMove:
{ {
static autoscroll_count = 0; static int autoscroll_count = 0;
BOOLEAN scrolled = FALSE; BOOLEAN scrolled = FALSE;
if ( lmp->pixel_width != 0 ) if ( lmp->pixel_width != 0 )
@ -4436,6 +4437,8 @@ lm_move_event( LM_DATA * lmp, XinEvent * ep )
lm_focus_cell_visible_attempt( lmp ); lm_focus_cell_visible_attempt( lmp );
break; break;
} }
default:
break;
} }
} }
@ -4592,7 +4595,7 @@ lm_drag_row_event( XI_OBJ * itf, LM_DATA * lmp, XinEvent * ep, XinEvent * oevp )
{ {
case XinEventMouseMove: case XinEventMouseMove:
{ {
static autoscroll_count = 0; static int autoscroll_count = 0;
BOOLEAN scrolled = FALSE; BOOLEAN scrolled = FALSE;
XI_OBJ *new_itf; XI_OBJ *new_itf;
@ -4724,7 +4727,7 @@ lm_drag_row_event( XI_OBJ * itf, LM_DATA * lmp, XinEvent * ep, XinEvent * oevp )
{ /* Generate drop rows event */ { /* Generate drop rows event */
int row; int row;
int column; int column = 0;
LM_CB_DATA lm_cb_data; LM_CB_DATA lm_cb_data;
XinRect list_rct; XinRect list_rct;
@ -4763,6 +4766,8 @@ lm_drag_row_event( XI_OBJ * itf, LM_DATA * lmp, XinEvent * ep, XinEvent * oevp )
} }
break; break;
} }
default:
break;
} }
} }
@ -4940,6 +4945,8 @@ lm_size_event( LM_DATA * lmp, XinEvent * ep )
lm_focus_cell_visible_attempt( lmp ); lm_focus_cell_visible_attempt( lmp );
break; break;
} }
default:
break;
} }
} }

13
xi/xilm3.c
View File

@ -14,6 +14,7 @@
#include "xilmst.h" #include "xilmst.h"
#include "xiutils.h" #include "xiutils.h"
#include "xidisply.h" #include "xidisply.h"
#include <limits.h>
static XinDrawTools lm_normal_ctools; static XinDrawTools lm_normal_ctools;
@ -2529,6 +2530,8 @@ lm_cell_btn_event( LM_DATA * lmp, XinEvent * ep, XinEvent * oevp )
redraw_cell( ( LM ) lmp, lmp->btn_down_row, lmp->btn_down_col, FALSE ); redraw_cell( ( LM ) lmp, lmp->btn_down_row, lmp->btn_down_col, FALSE );
break; break;
} }
default:
break;
} }
} }
@ -3273,6 +3276,8 @@ lm_vsize_event( LM_DATA * lmp, XinEvent * ep )
lm_focus_cell_visible_attempt( lmp ); lm_focus_cell_visible_attempt( lmp );
break; break;
} }
default:
break;
} }
} }
@ -3651,6 +3656,8 @@ lm_select_cell_event( LM_DATA * lmp, XinEvent * ep )
} }
} }
break; break;
default:
break;
} }
} }
@ -3733,6 +3740,8 @@ lm_event( XI_OBJ * itf, LM lm, XinEvent * ep )
} }
break; break;
} }
default:
break;
} }
switch ( ep->type ) switch ( ep->type )
{ {
@ -4665,7 +4674,7 @@ lm_event( XI_OBJ * itf, LM lm, XinEvent * ep )
BOOLEAN right_row = FALSE; BOOLEAN right_row = FALSE;
int comp_len; int comp_len;
int comp_result; int comp_result;
long spec_rec, data_rec, swap_rec, start_rec; long spec_rec, data_rec = 0L, swap_rec, start_rec = 0L;
XI_EVENT xiev; XI_EVENT xiev;
char text_buffer[200]; char text_buffer[200];
int col_nbr; int col_nbr;
@ -4863,6 +4872,8 @@ lm_event( XI_OBJ * itf, LM lm, XinEvent * ep )
if ( lm_focus_state_get( lmp ) == LM_FOCUS_VISIBLE ) if ( lm_focus_state_get( lmp ) == LM_FOCUS_VISIBLE )
retval = send_cell_event( lm, ep, FALSE, TRUE ); retval = send_cell_event( lm, ep, FALSE, TRUE );
break; break;
default:
break;
} }
if ( ep_needs_restore ) if ( ep_needs_restore )
*ep = oevt; *ep = oevt;

3
xi/xilmst.c
View File

@ -15,6 +15,7 @@
#include "xilmst.h" #include "xilmst.h"
#include "xiutils.h" #include "xiutils.h"
#include "xidisply.h" #include "xidisply.h"
#include <limits.h>
void void
lm_focus_set( long lm, int row, int column, BOOLEAN v_scrolled, BOOLEAN set ) lm_focus_set( long lm, int row, int column, BOOLEAN v_scrolled, BOOLEAN set )
@ -353,7 +354,7 @@ lm_stop_edit( LM lm, BOOLEAN do_update, int row, int column, LM_FOCUS state_was
/* if lmp->row_focus_border is TRUE, don't redraw, because old focus row will /* if lmp->row_focus_border is TRUE, don't redraw, because old focus row will
* be invalidated */ * be invalidated */
if ( ( do_update && state_was == LM_FOCUS_VISIBLE ) || if ( ( do_update && state_was == LM_FOCUS_VISIBLE ) ||
do_update && cell_data->button_full_cell ) (do_update && cell_data->button_full_cell))
redraw_cell( lm, row, column, FALSE ); redraw_cell( lm, row, column, FALSE );
} }

25
xi/xiport.c
View File

@ -1449,6 +1449,8 @@ case PAT_SOLID:
return XinBrushSolid; return XinBrushSolid;
case PAT_HOLLOW: case PAT_HOLLOW:
return XinBrushHollow; return XinBrushHollow;
default:
break;
} }
return XinBrushSolid; return XinBrushSolid;
} }
@ -1464,6 +1466,8 @@ case PAT_SOLID:
return XinPenHollow; return XinPenHollow;
case PAT_RUBBER: case PAT_RUBBER:
return XinPenDashed; return XinPenDashed;
default:
break;
} }
return XinPenSolid; return XinPenSolid;
} }
@ -1749,6 +1753,8 @@ case SC_LINE_UP:
return XinScrollBarActionThumb; return XinScrollBarActionThumb;
case SC_THUMBTRACK: case SC_THUMBTRACK:
return XinScrollBarActionThumbTrack; return XinScrollBarActionThumbTrack;
default:
break;
} }
return XinScrollBarActionLineUp; return XinScrollBarActionLineUp;
} }
@ -2011,6 +2017,8 @@ ConvertEvent( EVENT * ep, XinEvent * xiep )
xiep->v.control.ctrl_info.v.scroll.action = ConvertWhat( ep->v.ctl.ci.v.scroll.what ); xiep->v.control.ctrl_info.v.scroll.action = ConvertWhat( ep->v.ctl.ci.v.scroll.what );
xiep->v.control.ctrl_info.v.scroll.position = ep->v.ctl.ci.v.scroll.pos; xiep->v.control.ctrl_info.v.scroll.position = ep->v.ctl.ci.v.scroll.pos;
break; break;
default:
break;
} }
break; break;
case E_TIMER: case E_TIMER:
@ -2210,6 +2218,8 @@ XinWindowCreate( XinWindowDef * Def )
else else
parent = TASK_WIN; parent = TASK_WIN;
break; break;
default:
break;
} }
#if XIWS == XIWS_WIN || XIWS == XIWS_PM #if XIWS == XIWS_WIN || XIWS == XIWS_PM
if ( Def->iconizable && Def->icon_rid != 0 ) if ( Def->iconizable && Def->icon_rid != 0 )
@ -2297,6 +2307,8 @@ XinWindowCreate( XinWindowDef * Def )
case XinModalAutoclose: case XinModalAutoclose:
xin_autoclose_win = win; xin_autoclose_win = win;
break; break;
default:
break;
} }
#if XVT_PTK_VERSION_MAJOR == 4 && XVT_PTK_VERSION_MINOR >= 50 #if XVT_PTK_VERSION_MAJOR == 4 && XVT_PTK_VERSION_MINOR >= 50
} }
@ -2334,6 +2346,8 @@ XinWindowCreate( XinWindowDef * Def )
Def->title = ""; Def->title = "";
ctl_def.wtype = WC_VSCROLL; ctl_def.wtype = WC_VSCROLL;
break; break;
default:
break;
} }
flags = ( Def->visible ? 0 : CTL_FLAG_INVISIBLE ); flags = ( Def->visible ? 0 : CTL_FLAG_INVISIBLE );
if ( !Def->enabled ) if ( !Def->enabled )
@ -2355,6 +2369,8 @@ XinWindowCreate( XinWindowDef * Def )
#endif #endif
return ( XinWindow ) xvt_ctl_create_def( &ctl_def, ( WINDOW ) Def->parent, 0L ); return ( XinWindow ) xvt_ctl_create_def( &ctl_def, ( WINDOW ) Def->parent, 0L );
} }
default:
break;
} }
return 0L; return 0L;
/*START*/ /*START*/
@ -2575,6 +2591,8 @@ case M_COPY:
return XinDrawModeCopy; return XinDrawModeCopy;
case M_XOR: case M_XOR:
return XinDrawModeXor; return XinDrawModeXor;
default:
break;
} }
return XinDrawModeCopy; return XinDrawModeCopy;
} }
@ -2702,6 +2720,8 @@ XinWindowDrawToolsSet( XinWindow win, XinDrawTools * ct )
case XinPenDashed: case XinPenDashed:
xct.pen.style = P_DASH; xct.pen.style = P_DASH;
break; break;
default:
break;
} }
xct.brush.color = ct->brush.fore_color; xct.brush.color = ct->brush.fore_color;
xct.brush.pat = BrushPatternToPAT( ct->brush.pattern ); xct.brush.pat = BrushPatternToPAT( ct->brush.pattern );
@ -4106,6 +4126,9 @@ XinClipboardPut( XinClipboardFormat format, long size, void *data )
case XinClipboardFormatBitmap: case XinClipboardFormatBitmap:
xvt_format = CB_PICT; xvt_format = CB_PICT;
break; break;
default:
xvt_format = CB_APPL;
break;
} }
xvt_cb_put_data( xvt_format, NULL, size + 1, ( PICTURE ) buf ); xvt_cb_put_data( xvt_format, NULL, size + 1, ( PICTURE ) buf );
xvt_cb_free_data( ); xvt_cb_free_data( );
@ -4942,6 +4965,8 @@ XinFontFamilySet( XinFont * font, XinFontFamily family )
case XinFontFamilyHelvetica: case XinFontFamilyHelvetica:
xvt_font_set_family( font->xvt_fntid, XVT_FFN_HELVETICA ); xvt_font_set_family( font->xvt_fntid, XVT_FFN_HELVETICA );
break; break;
default:
break;
} }
/*START*/ /*START*/
} }

18
xi/xiport.h
View File

@ -601,24 +601,6 @@ XIN_FAKE_TYPE( s_XinPrintRecord, XinPrintRecord );
#define XI_COLOR_LTGRAY 0x00C0C0C0L #define XI_COLOR_LTGRAY 0x00C0C0C0L
#define XI_COLOR_WHITE 0x00FFFFFFL #define XI_COLOR_WHITE 0x00FFFFFFL
#ifndef USHRT_MAX
#define USHRT_MAX (unsigned short)(~0)
#endif
#ifndef SHRT_MAX
#define SHRT_MAX ((short)(USHRT_MAX >> 1))
#endif
#ifndef UINT_MAX
#define UINT_MAX (unsigned)(~0)
#endif
#ifndef INT_MAX
#define INT_MAX ((int)(UINT_MAX >> 1))
#endif
#ifndef ULONG_MAX
#define ULONG_MAX (unsigned long)(~0)
#endif
#ifndef LONG_MAX
#define LONG_MAX ((long)(ULONG_MAX >> 1 ))
#endif
/* New -- values for Motif */ /* New -- values for Motif */
#if XIWS == XIWS_XM #if XIWS == XIWS_XM

5
xi/xistx.c
View File

@ -14,6 +14,7 @@
#include "xistx.h" #include "xistx.h"
#include "xiutils.h" #include "xiutils.h"
#include "xi_int.h" #include "xi_int.h"
#include <limits.h>
/* error codes 30100 - 30104 */ /* error codes 30100 - 30104 */
@ -78,7 +79,7 @@ stx_redraw( STX stx, BOOLEAN update )
BOOLEAN do_border = FALSE; BOOLEAN do_border = FALSE;
unsigned long tattrib; unsigned long tattrib;
XinRect rct; XinRect rct;
XinColor border_color; XinColor border_color = 0L;
#if XIWS == XIWS_WM #if XIWS == XIWS_WM
XinRect r; XinRect r;
@ -854,6 +855,8 @@ stx_event( STX stx, XinEvent * ep )
case XinEventMenuCommand: case XinEventMenuCommand:
use_event = send_txt_event( stx, ep, FALSE ); use_event = send_txt_event( stx, ep, FALSE );
break; break;
default:
break;
} }
return use_event; return use_event;
} }

23
xi/xitext.c
View File

@ -17,6 +17,7 @@
#include "xilmst.h" #include "xilmst.h"
#include "xiutils.h" #include "xiutils.h"
#include "xistx.h" #include "xistx.h"
#include <limits.h>
#define is_word_char(ch) (ch != ' ' && ch != '\n') #define is_word_char(ch) (ch != ' ' && ch != '\n')
#define SB_DELTA 3 #define SB_DELTA 3
@ -619,9 +620,9 @@ xi_text_draw_internal( XI_TEXT * text, XinColor color, XinColor back_color, BOOL
{ {
XinRect rct; XinRect rct;
char *s; char *s;
char *sws; char *sws = NULL;
int cnt, int cnt,
nbr_lines, nbr_lines = 0,
baseline, baseline,
line_to_draw, line_to_draw,
top_of_rect; top_of_rect;
@ -780,7 +781,7 @@ xi_text_draw_internal( XI_TEXT * text, XinColor color, XinColor back_color, BOOL
if ( !text->multi_line ) if ( !text->multi_line )
{ {
char *str; char *str;
char *sw_str; char *sw_str = NULL;
int len, int len,
sw_len; sw_len;
BOOLEAN dont_draw; BOOLEAN dont_draw;
@ -1216,7 +1217,7 @@ xi_text_caret_on( XI_TEXT * text )
cnt < nbr_lines; cnt < nbr_lines;
++cnt, ++caret_line ) ++cnt, ++caret_line )
{ {
int ip; int ip = 0;
BOOLEAN set_caret = FALSE; BOOLEAN set_caret = FALSE;
lb = &text->line_breaks[caret_line]; lb = &text->line_breaks[caret_line];
@ -1254,7 +1255,7 @@ xi_text_caret_on( XI_TEXT * text )
int ip = ( text->selection_start_ip == text->ip1 ) ? text->ip2 : text->ip1; int ip = ( text->selection_start_ip == text->ip1 ) ? text->ip2 : text->ip1;
int x; int x;
char *pwc = "#"; char *pwc = "#";
int pwc_len; int pwc_len = 0;
if ( text->password ) if ( text->password )
{ {
@ -2209,7 +2210,7 @@ key_line_end( XI_TEXT * text, XinEvent * ep )
static int static int
get_ip_one_word_left( XI_TEXT * text, int ip ) get_ip_one_word_left( XI_TEXT * text, int ip )
{ {
int line; int line = 0;
if ( text->multi_line ) if ( text->multi_line )
{ {
@ -2326,7 +2327,7 @@ key_word_left( XI_TEXT * text, XinEvent * ep )
static int static int
get_ip_one_word_right( XI_TEXT * text, int ip ) get_ip_one_word_right( XI_TEXT * text, int ip )
{ {
int line, int line = 0,
len, len,
string_len; string_len;
@ -2663,7 +2664,7 @@ xi_text_hit_test( XI_TEXT * text, XinEvent * ep, int *ip )
{ {
int del_y, int del_y,
del_x, del_x,
line, line = 0,
len, len,
cnt, cnt,
last_ip; last_ip;
@ -2819,6 +2820,8 @@ xi_text_control_event( XI_TEXT * text, XinEvent * ep )
set_pos_delta( text, percent, prop ); set_pos_delta( text, percent, prop );
break; break;
} }
default:
break;
} }
if ( save_text ) if ( save_text )
free_save_text_state( ); free_save_text_state( );
@ -3098,6 +3101,8 @@ xi_text_event( XI_TEXT * text, XinEvent * ep, BOOLEAN gaining_focus, BOOLEAN * c
case XinEventTimer: case XinEventTimer:
xi_text_timer_event( text, ep ); xi_text_timer_event( text, ep );
break; break;
default:
break;
} }
return retval; return retval;
} }
@ -3209,7 +3214,7 @@ xi_text_focus_get( XinWindow win )
void void
xi_text_buffer_size_set( XI_TEXT * text, int len ) xi_text_buffer_size_set( XI_TEXT * text, int len )
{ {
int ip1, ip2, sip; int ip1 = 0, ip2 = 0, sip = 0;
BOOLEAN reset_ips = FALSE; BOOLEAN reset_ips = FALSE;
if ( xi_text_editing_is( text ) ) if ( xi_text_editing_is( text ) )

62
xi/xiutils.c
View File

@ -1435,7 +1435,7 @@ xi_get_font_metrics_font( XinFont * font, int *leading,
{ {
FONT_INFO* fi; FONT_INFO* fi;
int i; int i;
XinWindow win; XinWindow win = (XinWindow)0L;
BOOLEAN close_win = FALSE; BOOLEAN close_win = FALSE;
XinRect rct; XinRect rct;
@ -1612,6 +1612,8 @@ move_controls( XI_OBJ * xi_obj )
} }
break; break;
} }
default:
break;
} }
objlist = xi_get_member_list( xi_obj, &n ); objlist = xi_get_member_list( xi_obj, &n );
for ( ; n > 0; n--, objlist++ ) for ( ; n > 0; n--, objlist++ )
@ -1736,7 +1738,7 @@ xi_eh( XinWindow win, XinEvent * ep )
{ {
XI_OBJ *itf; XI_OBJ *itf;
XI_ITF_DATA *itf_data; XI_ITF_DATA *itf_data;
int delta_x, int delta_x = 0,
old, old,
d; d;
@ -1776,6 +1778,8 @@ xi_eh( XinWindow win, XinEvent * ep )
case XinScrollBarActionThumbTrack: case XinScrollBarActionThumbTrack:
delta_x = 0; delta_x = 0;
break; break;
default:
break;
} }
old = itf_data->phys_xi_pnt.h; old = itf_data->phys_xi_pnt.h;
itf_data->phys_xi_pnt.h += delta_x; itf_data->phys_xi_pnt.h += delta_x;
@ -1814,7 +1818,7 @@ xi_eh( XinWindow win, XinEvent * ep )
{ {
XI_OBJ *itf; XI_OBJ *itf;
XI_ITF_DATA *itf_data; XI_ITF_DATA *itf_data;
int delta_y, int delta_y = 0,
old, old,
d; d;
@ -1854,6 +1858,8 @@ xi_eh( XinWindow win, XinEvent * ep )
case XinScrollBarActionThumbTrack: case XinScrollBarActionThumbTrack:
delta_y = 0; delta_y = 0;
break; break;
default:
break;
} }
old = itf_data->phys_xi_pnt.v; old = itf_data->phys_xi_pnt.v;
itf_data->phys_xi_pnt.v += delta_y; itf_data->phys_xi_pnt.v += delta_y;
@ -1886,6 +1892,8 @@ xi_eh( XinWindow win, XinEvent * ep )
} }
break; break;
} }
default:
break;
} }
return TRUE; return TRUE;
} }
@ -1977,6 +1985,8 @@ xi_make_obj_visible( XI_OBJ * xi_obj )
case XIT_COLUMN: case XIT_COLUMN:
case XIT_CONTAINER: case XIT_CONTAINER:
return; return;
default:
break;
} }
pref_h = ( int ) xi_get_pref( XI_PREF_VIR_SP_H ); pref_h = ( int ) xi_get_pref( XI_PREF_VIR_SP_H );
pref_v = ( int ) xi_get_pref( XI_PREF_VIR_SP_V ); pref_v = ( int ) xi_get_pref( XI_PREF_VIR_SP_V );
@ -2261,11 +2271,13 @@ xi_menu_enable( XI_OBJ * itf, int tag, BOOLEAN enable )
XinWindowMenuItemEnable( win, ( short ) tag, enable ); XinWindowMenuItemEnable( win, ( short ) tag, enable );
xi_obj = xi_get_obj( itf, tag ); xi_obj = xi_get_obj( itf, tag );
if ( xi_obj != NULL && xi_obj->type == XIT_BTN ) if ( xi_obj != NULL && xi_obj->type == XIT_BTN )
{
if ( enable ) if ( enable )
xi_set_attrib( xi_obj, xi_get_attrib( xi_obj ) | XI_ATR_ENABLED ); xi_set_attrib( xi_obj, xi_get_attrib( xi_obj ) | XI_ATR_ENABLED );
else else
xi_set_attrib( xi_obj, xi_get_attrib( xi_obj ) & ~XI_ATR_ENABLED ); xi_set_attrib( xi_obj, xi_get_attrib( xi_obj ) & ~XI_ATR_ENABLED );
} }
}
void void
xi_set_bitmap( XI_OBJ* xi_obj, XI_BITMAP* bitmap ) xi_set_bitmap( XI_OBJ* xi_obj, XI_BITMAP* bitmap )
@ -2636,6 +2648,8 @@ recalc_metrics( XI_OBJ * xi_obj )
break; break;
} }
default:
break;
} }
for ( i = 0; i < xi_obj->nbr_children; ++i ) for ( i = 0; i < xi_obj->nbr_children; ++i )
recalc_metrics( xi_obj->children[i] ); recalc_metrics( xi_obj->children[i] );
@ -2706,6 +2720,8 @@ case XIT_ITF:
xi_invalidate_rect( xi_get_window( xi_obj->itf ), &rct ); xi_invalidate_rect( xi_get_window( xi_obj->itf ), &rct );
} }
break; break;
default:
break;
} }
} }
@ -2872,6 +2888,8 @@ xi_check( XI_OBJ * xi_obj, BOOLEAN check )
} }
break; break;
} }
default:
break;
} }
} }
#endif #endif
@ -3022,6 +3040,8 @@ xi_set_color( XI_OBJ * xi_obj, XI_COLOR_PART part, XinColor color )
changed = ( stxp->disabled_back_color != color ); changed = ( stxp->disabled_back_color != color );
stxp->disabled_back_color = color; stxp->disabled_back_color = color;
break; break;
default:
break;
} }
if ( changed ) if ( changed )
stx_update_colors( xi_obj->v.field->stx ); stx_update_colors( xi_obj->v.field->stx );
@ -3049,6 +3069,8 @@ xi_set_color( XI_OBJ * xi_obj, XI_COLOR_PART part, XinColor color )
changed = ( cell_data->back_color != color ); changed = ( cell_data->back_color != color );
cell_data->back_color = color; cell_data->back_color = color;
break; break;
default:
break;
} }
} }
break; break;
@ -3074,6 +3096,8 @@ xi_set_color( XI_OBJ * xi_obj, XI_COLOR_PART part, XinColor color )
changed = ( xi_td->back_color != color ); changed = ( xi_td->back_color != color );
xi_td->back_color = color; xi_td->back_color = color;
break; break;
default:
break;
} }
break; break;
} }
@ -3093,6 +3117,8 @@ xi_set_color( XI_OBJ * xi_obj, XI_COLOR_PART part, XinColor color )
changed = ( xi_ld->back_color != color ); changed = ( xi_ld->back_color != color );
xi_ld->back_color = color; xi_ld->back_color = color;
break; break;
default:
break;
} }
break; break;
} }
@ -3120,6 +3146,8 @@ xi_set_color( XI_OBJ * xi_obj, XI_COLOR_PART part, XinColor color )
changed = ( xi_rd->shadow_color != color ); changed = ( xi_rd->shadow_color != color );
xi_rd->shadow_color = color; xi_rd->shadow_color = color;
break; break;
default:
break;
} }
break; break;
} }
@ -3168,9 +3196,13 @@ xi_set_color( XI_OBJ * xi_obj, XI_COLOR_PART part, XinColor color )
changed = ( lmp->white_space_color != color ); changed = ( lmp->white_space_color != color );
lmp->white_space_color = color; lmp->white_space_color = color;
break; break;
default:
break;
} }
break; break;
} }
default:
break;
} }
if ( changed ) if ( changed )
@ -3216,6 +3248,8 @@ case XIT_LIST:
lm_cell_request( xi_obj->parent->v.list->lm, LM_CELL, xi_obj->v.cell.row, lm_cell_request( xi_obj->parent->v.list->lm, LM_CELL, xi_obj->v.cell.row,
xi_obj->v.cell.column ); xi_obj->v.cell.column );
break; break;
default:
break;
} }
} }
@ -3247,10 +3281,10 @@ calc_horizontal_stack( XI_OBJ * itf, XI_CONTAINER_DATA * container,
int btn_width, int btn_width,
max_width, max_width,
horz_spacing, horz_spacing,
btn_height; btn_height = 0;
long horz_form_unit; long horz_form_unit;
long vert_form_unit; long vert_form_unit;
BOOLEAN center; BOOLEAN center = FALSE;
XinRect container_rect; XinRect container_rect;
container_rect = container->rct; container_rect = container->rct;
@ -3334,8 +3368,8 @@ calc_vertical_stack( XI_OBJ * itf, XI_CONTAINER_DATA * container,
{ {
int btn_height, int btn_height,
max_height, max_height,
top_ofst, top_ofst = 0,
vert_spacing; vert_spacing = 0;
XinRect container_rect; XinRect container_rect;
long vert_form_unit; long vert_form_unit;
@ -3360,6 +3394,8 @@ calc_vertical_stack( XI_OBJ * itf, XI_CONTAINER_DATA * container,
vert_spacing = 0; vert_spacing = 0;
top_ofst = 0; top_ofst = 0;
break; break;
default:
break;
} }
if ( container->pix_height ) if ( container->pix_height )
btn_height = container->pix_height; btn_height = container->pix_height;
@ -3374,6 +3410,8 @@ calc_vertical_stack( XI_OBJ * itf, XI_CONTAINER_DATA * container,
case XIBT_RADIOBTN: case XIBT_RADIOBTN:
btn_height = ( int ) vert_form_unit; btn_height = ( int ) vert_form_unit;
break; break;
default:
break;
} }
if ( btn_height > max_height ) if ( btn_height > max_height )
btn_height = max_height; btn_height = max_height;
@ -3507,7 +3545,7 @@ void
xi_button_rect_calc( XI_OBJ * btn_obj, int sequence ) xi_button_rect_calc( XI_OBJ * btn_obj, int sequence )
{ {
XinRect rct; XinRect rct;
BOOLEAN packed; /* button has no dflt or focus rects */ BOOLEAN packed = FALSE; /* button has no dflt or focus rects */
if ( btn_obj->parent->type == XIT_CONTAINER ) if ( btn_obj->parent->type == XIT_CONTAINER )
{ {
@ -3538,6 +3576,10 @@ xi_button_rect_calc( XI_OBJ * btn_obj, int sequence )
row = sequence - col * cdata->nbr_down; row = sequence - col * cdata->nbr_down;
packed = cdata->packed; packed = cdata->packed;
break; break;
default:
row = col = 0;
break;
} }
rct.top = cdata->rct.top + row * cdata->step_down; rct.top = cdata->rct.top + row * cdata->step_down;
rct.left = cdata->rct.left + col * cdata->step_across; rct.left = cdata->rct.left + col * cdata->step_across;
@ -3677,6 +3719,8 @@ xi_def_get_font( XI_OBJ_DEF * obj_def )
} }
#endif #endif
break; break;
default:
break;
} }
if ( font != NULL ) if ( font != NULL )
return font; return font;
@ -3903,6 +3947,8 @@ xi_get_native_controls( XI_OBJ * obj )
return FALSE; return FALSE;
case XIBT_NATIVE: case XIBT_NATIVE:
return TRUE; return TRUE;
default:
break;
} }
return ( BOOLEAN ) xi_get_pref( XI_PREF_NATIVE_CTRLS ); return ( BOOLEAN ) xi_get_pref( XI_PREF_NATIVE_CTRLS );
} }

6
xvaga/xvaga.cpp
View File

@ -19,11 +19,11 @@
#ifdef WIN32 #ifdef WIN32
#include "oswin32.h" #include "oswin32.h"
#include <io.h>
#else #else
#include <unistd.h> #include <unistd.h>
#include "oslinux.h" #include "oslinux.h"
#endif #endif
#include <io.h>
// Funzione interna di utilita' // Funzione interna di utilita'
MENU_ITEM* xvt_menu_duplicate_tree(const MENU_ITEM* m); MENU_ITEM* xvt_menu_duplicate_tree(const MENU_ITEM* m);
@ -952,7 +952,7 @@ void TwxWindow::SetMenuTree(const MENU_ITEM* tree)
TwxWindow::TwxWindow(wxWindow *parent, wxWindowID id, const wxString& title, TwxWindow::TwxWindow(wxWindow *parent, wxWindowID id, const wxString& title,
const wxPoint& pos, const wxSize& size, long style) const wxPoint& pos, const wxSize& size, long style)
: TwxWindowBase(parent, id, title, pos, size, style), : TwxWindowBase(parent, id, title, pos, size, style),
_timer(NULL), m_menu(NULL), _eh(NULL) m_menu(NULL), _eh(NULL), _timer(NULL)
{ {
_nice_windows.Put((WINDOW)this, this); _nice_windows.Put((WINDOW)this, this);
} }
@ -2100,7 +2100,6 @@ int xvt_dwin_get_text_width(WINDOW win, const char *s, int len)
void xvt_dwin_invalidate_rect(WINDOW win, RCT* rctp) void xvt_dwin_invalidate_rect(WINDOW win, RCT* rctp)
{ {
CAST_WIN(win, w); CAST_WIN(win, w);
CAST_TDC(win, dc);
if (rctp) if (rctp)
{ {
const wxRect rct = NormalizeRCT(rctp); const wxRect rct = NormalizeRCT(rctp);
@ -2202,7 +2201,6 @@ void xvt_dwin_set_fore_color(WINDOW win, COLOR color)
void xvt_dwin_set_std_cpen(WINDOW win, long flag) void xvt_dwin_set_std_cpen(WINDOW win, long flag)
{ {
CAST_TDC(win, dc);
CPEN pen; memset(&pen, 0, sizeof(CPEN)); CPEN pen; memset(&pen, 0, sizeof(CPEN));
pen.style = P_SOLID; pen.style = P_SOLID;