nobody at rubyforge.org
2007-May-29 22:30 UTC
[Wxruby-development] [1035] trunk/wxruby2/swig/classes/EvtHandler.i: Removed a heap of redundant stuff that''s been #if 0''d for a while
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:'':'';} #msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; } #msg ul, pre { overflow: auto; } #header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[1035] trunk/wxruby2/swig/classes/EvtHandler.i: Removed a heap of redundant stuff that''s been #if 0''d for a while</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1035</dd> <dt>Author</dt> <dd>brokentoy</dd> <dt>Date</dt> <dd>2007-05-29 18:30:26 -0400 (Tue, 29 May 2007)</dd> </dl> <h3>Log Message</h3> <pre>Removed a heap of redundant stuff that''s been #if 0''d for a while</pre> <h3>Modified Paths</h3> <ul> <li><a href="#trunkwxruby2swigclassesEvtHandleri">trunk/wxruby2/swig/classes/EvtHandler.i</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="trunkwxruby2swigclassesEvtHandleri"></a> <div class="modfile"><h4>Modified: trunk/wxruby2/swig/classes/EvtHandler.i (1034 => 1035)</h4> <pre class="diff"><span> <span class="info">--- trunk/wxruby2/swig/classes/EvtHandler.i        2007-05-28 20:04:18 UTC (rev 1034) +++ trunk/wxruby2/swig/classes/EvtHandler.i        2007-05-29 22:30:26 UTC (rev 1035) </span><span class="lines">@@ -541,783 +541,6 @@ </span><span class="cx"> %} </span><span class="cx"> </span><span class="cx"> </span><del>-#if 0 -%{ - static VALUE callbacks = Qnil; -%} - -%{ -static void internal_connect(VALUE self, int firstId, int lastId, - wxEventType eventType) -{ - - wxEvtHandler *cppSelf = (wxEvtHandler *) 0 ; - SWIG_ConvertPtr(self, (void **) &cppSelf, SWIGTYPE_p_wxEvtHandler, 1); - - VALUE func = rb_funcall(rb_cProc, rb_intern("new"), 0); - rb_global_variable(&callbacks); - if(callbacks == Qnil) - callbacks = rb_ary_new(); - rb_ary_push(callbacks, func); - - wxObject* userData = new wxRbCallback(func); - wxObjectEventFunction function = - (wxObjectEventFunction )&wxRbCallback::EventThunker; - (cppSelf)->Connect(firstId, lastId, eventType, function, userData); -} - -static VALUE internal_evt_with_id(int argc, VALUE *argv, VALUE self, - wxEventType eventType) -{ - if (argc != 1) - rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); - - int id = NUM2INT(argv[0]); - //printf("evt_with_id(%d) %s\n", id, rb_block_given_p() ? "with block" : ""); - - internal_connect(self, id, id, eventType); - return Qnil; -} - -static VALUE internal_evt_with_id_range(int argc, VALUE *argv, VALUE self, - wxEventType eventType) -{ - if (argc != 2) - rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); - - int idStart = NUM2INT(argv[0]); - int idEnd = NUM2INT(argv[1]); - //printf("evt_with_id(%d) %s\n", id, rb_block_given_p() ? "with block" : ""); - - internal_connect(self, idStart, idEnd, eventType); - return Qnil; -} - -static VALUE internal_evt_no_parameters(int argc, VALUE *argv, VALUE self, - wxEventType eventType) -{ - if (argc != 0) - rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); - - //printf("evt_no_parameters() %s\n", rb_block_given_p() ? "with block" : ""); - internal_connect(self, -1, -1, eventType); - return Qnil; -} - -static VALUE connect_fnc(int argc, VALUE *argv, VALUE self) -{ - if (argc != 3) - rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)", argc); - - int id = NUM2INT(argv[0]); - int lastId = NUM2INT(argv[1]); - int type = NUM2INT(argv[2]); - - internal_connect(self, id, lastId, type); - return Qnil; -} - -static VALUE evt_menu(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_COMMAND_MENU_SELECTED); -} - -static VALUE evt_menu_range(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id_range(argc, argv, self, wxEVT_COMMAND_MENU_SELECTED); -} - -static VALUE evt_combobox(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_COMMAND_COMBOBOX_SELECTED); -} - - -static VALUE evt_choice(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_COMMAND_CHOICE_SELECTED); -} - -static VALUE evt_calendar(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_CALENDAR_DOUBLECLICKED); -} - -static VALUE evt_calendar_sel_changed(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_CALENDAR_SEL_CHANGED); -} - -static VALUE evt_calendar_day(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_CALENDAR_DAY_CHANGED); -} - -static VALUE evt_calendar_month(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_CALENDAR_MONTH_CHANGED); -} - -static VALUE evt_calendar_year(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_CALENDAR_YEAR_CHANGED); -} - -static VALUE evt_calendar_weekday_clicked(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_CALENDAR_WEEKDAY_CLICKED); -} - -static VALUE evt_update_ui(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_UPDATE_UI); -} - -static VALUE evt_paint(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_PAINT); -} - -static VALUE evt_set_focus(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_SET_FOCUS); -} - -static VALUE evt_kill_focus(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_KILL_FOCUS); -} - -static VALUE evt_close(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_CLOSE_WINDOW); -} - -static VALUE evt_idle(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_IDLE); -} - -static VALUE evt_show(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_SHOW); -} - -static VALUE evt_window_create(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_CREATE); -} - -static VALUE evt_size(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_SIZE); -} - -static VALUE evt_key_down(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_KEY_DOWN); -} - -static VALUE evt_key_up(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_KEY_UP); -} - -static VALUE evt_char(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_CHAR); -} - -static VALUE evt_find(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_COMMAND_FIND); -} - -static VALUE evt_find_next(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_COMMAND_FIND_NEXT); -} - -static VALUE evt_find_replace(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_COMMAND_FIND_REPLACE); -} - -static VALUE evt_find_replace_all(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_COMMAND_FIND_REPLACE_ALL); -} - -static VALUE evt_find_close(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_COMMAND_FIND_CLOSE); -} - -static VALUE evt_button(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_COMMAND_BUTTON_CLICKED); -} - -static VALUE evt_tool_rclicked(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_COMMAND_TOOL_RCLICKED); -} - -static VALUE evt_tool_enter(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_COMMAND_TOOL_ENTER); -} - -static VALUE evt_left_down(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_LEFT_DOWN); -} - -static VALUE evt_left_up(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_LEFT_UP); -} - -static VALUE evt_left_dclick(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_LEFT_DCLICK); -} - -static VALUE evt_right_down(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_RIGHT_DOWN); -} - -static VALUE evt_right_up(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_RIGHT_UP); -} - -static VALUE evt_right_dclick(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_RIGHT_DCLICK); -} - -static VALUE evt_middle_down(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_MIDDLE_DOWN); -} - -static VALUE evt_middle_up(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_MIDDLE_UP); -} - -static VALUE evt_middle_dclick(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_MIDDLE_DCLICK); -} - -static VALUE evt_motion(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_MOTION); -} - -static VALUE evt_enter_window(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_ENTER_WINDOW); -} - -static VALUE evt_leave_window(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_LEAVE_WINDOW); -} - -static VALUE evt_mousewheel(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_MOUSEWHEEL); -} - -static VALUE evt_spin(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_SCROLL_THUMBTRACK); -} - -static VALUE evt_spin_up(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_SCROLL_LINEUP); -} - -static VALUE evt_spin_down(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_SCROLL_LINEDOWN); -} - -static VALUE evt_notebook_page_changing(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING); -} - -static VALUE evt_notebook_page_changed(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED); -} - -static VALUE evt_listbook_page_changing(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING); -} - -static VALUE evt_listbook_page_changed(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED); -} - -static VALUE evt_listbox(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_COMMAND_LISTBOX_SELECTED); -} - -static VALUE evt_listbox_dclick(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_COMMAND_LISTBOX_DOUBLECLICKED); -} - -static VALUE evt_checkbox(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_COMMAND_CHECKBOX_CLICKED); -} - -static VALUE evt_text(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_COMMAND_TEXT_UPDATED); -} - -static VALUE evt_text_enter(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_COMMAND_TEXT_ENTER); -} - -static VALUE evt_text_maxlen(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_COMMAND_TEXT_MAXLEN); -} - -#ifndef __WXMAC__ -static VALUE evt_text_url(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_COMMAND_TEXT_URL); -} -#endif - -static VALUE evt_radiobox(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_COMMAND_RADIOBOX_SELECTED); -} - -static VALUE evt_radiobutton(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_COMMAND_RADIOBUTTON_SELECTED); -} - -static VALUE evt_grid_cell_left_click(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_GRID_CELL_LEFT_CLICK); -} - -static VALUE evt_grid_cell_right_click(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_GRID_CELL_RIGHT_CLICK); -} - -static VALUE evt_grid_cell_left_dclick(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_GRID_CELL_LEFT_DCLICK); -} - -static VALUE evt_grid_cell_right_dclick(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_GRID_CELL_RIGHT_DCLICK); -} - -static VALUE evt_grid_label_left_click(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_GRID_LABEL_LEFT_CLICK); -} - -static VALUE evt_grid_label_right_click(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_GRID_LABEL_RIGHT_CLICK); -} - -static VALUE evt_grid_label_left_dclick(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_GRID_LABEL_LEFT_DCLICK); -} - -static VALUE evt_grid_label_right_dclick(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_GRID_LABEL_RIGHT_DCLICK); -} - -static VALUE evt_grid_cell_change(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_GRID_CELL_CHANGE); -} - -static VALUE evt_grid_select_cell(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_GRID_SELECT_CELL); -} - -static VALUE evt_grid_editor_hidden(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_GRID_EDITOR_HIDDEN); -} - -static VALUE evt_grid_editor_shown(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_GRID_EDITOR_SHOWN); -} - -static VALUE evt_grid_cmd_cell_left_click(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_GRID_CELL_LEFT_CLICK); -} - -static VALUE evt_grid_cmd_cell_right_click(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_GRID_CELL_RIGHT_CLICK); -} - -static VALUE evt_grid_cmd_cell_left_dclick(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_GRID_CELL_LEFT_DCLICK); -} - -static VALUE evt_grid_cmd_cell_right_dclick(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_GRID_CELL_RIGHT_DCLICK); -} - -static VALUE evt_grid_cmd_label_left_click(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_GRID_LABEL_LEFT_CLICK); -} - -static VALUE evt_grid_cmd_label_right_click(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_GRID_LABEL_RIGHT_CLICK); -} - -static VALUE evt_grid_cmd_label_left_dclick(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_GRID_LABEL_LEFT_DCLICK); -} - -static VALUE evt_grid_cmd_label_right_dclick(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_GRID_LABEL_RIGHT_DCLICK); -} - -static VALUE evt_grid_cmd_cell_change(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_GRID_CELL_CHANGE); -} - -static VALUE evt_grid_cmd_select_cell(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_GRID_SELECT_CELL); -} - -static VALUE evt_grid_cmd_editor_hidden(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_GRID_EDITOR_HIDDEN); -} - -static VALUE evt_grid_cmd_editor_shown(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_GRID_EDITOR_SHOWN); -} - -static VALUE evt_grid_col_size(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_GRID_COL_SIZE); -} - -static VALUE evt_grid_row_size(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_GRID_ROW_SIZE); -} - -static VALUE evt_grid_cmd_col_size(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_GRID_COL_SIZE); -} - -static VALUE evt_grid_cmd_row_size(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_GRID_ROW_SIZE); -} - -static VALUE evt_grid_range_select(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_GRID_RANGE_SELECT); -} - -static VALUE evt_grid_cmd_range_select(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_GRID_RANGE_SELECT); -} - -static VALUE evt_grid_editor_created(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_GRID_EDITOR_CREATED); -} - -static VALUE evt_grid_cmd_editor_created(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_GRID_EDITOR_CREATED); -} - -static VALUE evt_wizard_page_changed(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_WIZARD_PAGE_CHANGED); -} - -static VALUE evt_wizard_page_changing(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_WIZARD_PAGE_CHANGING); -} - -static VALUE evt_wizard_cancel(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_WIZARD_CANCEL); -} - -static VALUE evt_wizard_help(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_WIZARD_HELP); -} - -static VALUE evt_wizard_finished(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_WIZARD_FINISHED); -} - -static VALUE evt_sash_dragged(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_SASH_DRAGGED); -} - -static VALUE evt_sash_dragged_range(int argc_1, int argc_2, VALUE *argv, VALUE self) -{ - return internal_evt_with_id_range(argc_1, argc_2, argv, self, wxEVT_SASH_DRAGGED_RANGE); -} - -static VALUE evt_scrollwin_top(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_SCROLLWIN_TOP); -} - -static VALUE evt_scrollwin_bottom(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_SCROLLWIN_BOTTOM); -} - -static VALUE evt_scrollwin_lineup(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_SCROLLWIN_LINEUP); -} - -static VALUE evt_scrollwin_linedown(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_SCROLLWIN_LINEDOWN); -} - -static VALUE evt_scrollwin_pageup(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_SCROLLWIN_PAGEUP); -} - -static VALUE evt_scrollwin_pagedown(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_SCROLLWIN_PAGEDOWN); -} - -static VALUE evt_scrollwin_thumbtrack(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_SCROLLWIN_THUMBTRACK); -} - -static VALUE evt_scrollwin_thumbrelease(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_SCROLLWIN_THUMBRELEASE); -} - -static VALUE evt_activate(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_ACTIVATE); -} - -static VALUE evt_activate_app(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_ACTIVATE_APP); -} - -static VALUE evt_create(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_CREATE); -} - -static VALUE evt_destroy(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_DESTROY); -} - -static VALUE evt_menu_open(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_MENU_OPEN); -} - -static VALUE evt_menu_close(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_MENU_CLOSE); -} - -static VALUE evt_menu_highlight(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_with_id(argc, argv, self, wxEVT_MENU_HIGHLIGHT); -} - -static VALUE evt_menu_highlight_all(int argc, VALUE *argv, VALUE self) -{ - return internal_evt_no_parameters(argc, argv, self, wxEVT_MENU_HIGHLIGHT_ALL); -} - - -// TODO: Add for ListEvent types? Is this needed? - -%} - - - - -%init %{ - rb_define_method(cWxEvtHandler.klass, "connect", VALUEFUNC(connect_fnc), -1); - rb_define_method(cWxEvtHandler.klass, "evt_menu", VALUEFUNC(evt_menu), -1); - rb_define_method(cWxEvtHandler.klass, "evt_tool", VALUEFUNC(evt_menu), -1); - rb_define_method(cWxEvtHandler.klass, "evt_menu_range", VALUEFUNC(evt_menu_range), -1); - rb_define_method(cWxEvtHandler.klass, "evt_tool_range", VALUEFUNC(evt_menu_range), -1); - rb_define_method(cWxEvtHandler.klass, "evt_choice", VALUEFUNC(evt_choice), -1); - rb_define_method(cWxEvtHandler.klass, "evt_combobox", VALUEFUNC(evt_combobox), -1); - - rb_define_method(cWxEvtHandler.klass, "evt_calendar", VALUEFUNC(evt_calendar), -1); - rb_define_method(cWxEvtHandler.klass, "evt_calendar_sel_changed", VALUEFUNC(evt_calendar_sel_changed), -1); - rb_define_method(cWxEvtHandler.klass, "evt_calendar_day", VALUEFUNC(evt_calendar_day), -1); - rb_define_method(cWxEvtHandler.klass, "evt_calendar_month", VALUEFUNC(evt_calendar_month), -1); - rb_define_method(cWxEvtHandler.klass, "evt_calendar_year", VALUEFUNC(evt_calendar_year), -1); - rb_define_method(cWxEvtHandler.klass, "evt_calendar_weekday_clicked", VALUEFUNC(evt_calendar_weekday_clicked), -1); - rb_define_method(cWxEvtHandler.klass, "evt_idle", VALUEFUNC(evt_idle), -1); - rb_define_method(cWxEvtHandler.klass, "evt_size", VALUEFUNC(evt_size), -1); - rb_define_method(cWxEvtHandler.klass, "evt_show", VALUEFUNC(evt_show), -1); - rb_define_method(cWxEvtHandler.klass, "evt_update_ui", VALUEFUNC(evt_update_ui), -1); - rb_define_method(cWxEvtHandler.klass, "evt_window_create", VALUEFUNC(evt_window_create), -1); - - rb_define_method(cWxEvtHandler.klass, "evt_paint", VALUEFUNC(evt_paint), -1); - rb_define_method(cWxEvtHandler.klass, "evt_close", VALUEFUNC(evt_close), -1); - rb_define_method(cWxEvtHandler.klass, "evt_key_down", VALUEFUNC(evt_key_down), -1); - rb_define_method(cWxEvtHandler.klass, "evt_key_up", VALUEFUNC(evt_key_up), -1); - rb_define_method(cWxEvtHandler.klass, "evt_char", VALUEFUNC(evt_char), -1); - rb_define_method(cWxEvtHandler.klass, "evt_find", VALUEFUNC(evt_find), -1); - rb_define_method(cWxEvtHandler.klass, "evt_find_next", VALUEFUNC(evt_find_next), -1); - rb_define_method(cWxEvtHandler.klass, "evt_find_replace", VALUEFUNC(evt_find_replace), -1); - rb_define_method(cWxEvtHandler.klass, "evt_find_replace_all", VALUEFUNC(evt_find_replace_all), -1); - rb_define_method(cWxEvtHandler.klass, "evt_find_close", VALUEFUNC(evt_find_close), -1); - rb_define_method(cWxEvtHandler.klass, "evt_button", VALUEFUNC(evt_button), -1); - rb_define_method(cWxEvtHandler.klass, "evt_tool_rclicked", VALUEFUNC(evt_tool_rclicked), -1); - rb_define_method(cWxEvtHandler.klass, "evt_tool_enter", VALUEFUNC(evt_tool_enter), -1); - rb_define_method(cWxEvtHandler.klass, "evt_left_down", VALUEFUNC(evt_left_down), -1); - rb_define_method(cWxEvtHandler.klass, "evt_left_up", VALUEFUNC(evt_left_up), -1); - rb_define_method(cWxEvtHandler.klass, "evt_left_dclick", VALUEFUNC(evt_left_dclick), -1); - rb_define_method(cWxEvtHandler.klass, "evt_right_down", VALUEFUNC(evt_right_down), -1); - rb_define_method(cWxEvtHandler.klass, "evt_right_up", VALUEFUNC(evt_right_up), -1); - rb_define_method(cWxEvtHandler.klass, "evt_right_dclick", VALUEFUNC(evt_right_dclick), -1); - rb_define_method(cWxEvtHandler.klass, "evt_middle_down", VALUEFUNC(evt_middle_down), -1); - rb_define_method(cWxEvtHandler.klass, "evt_middle_up", VALUEFUNC(evt_middle_up), -1); - rb_define_method(cWxEvtHandler.klass, "evt_middle_dclick", VALUEFUNC(evt_middle_dclick), -1); - rb_define_method(cWxEvtHandler.klass, "evt_enter_window", VALUEFUNC(evt_enter_window), -1); - rb_define_method(cWxEvtHandler.klass, "evt_leave_window", VALUEFUNC(evt_leave_window), -1); - rb_define_method(cWxEvtHandler.klass, "evt_mousewheel", VALUEFUNC(evt_mousewheel), -1); - rb_define_method(cWxEvtHandler.klass, "evt_set_focus", VALUEFUNC(evt_set_focus), -1); - rb_define_method(cWxEvtHandler.klass, "evt_kill_focus", VALUEFUNC(evt_kill_focus), -1); - rb_define_method(cWxEvtHandler.klass, "evt_spin", VALUEFUNC(evt_spin), -1); - rb_define_method(cWxEvtHandler.klass, "evt_spin_up", VALUEFUNC(evt_spin_up), -1); - rb_define_method(cWxEvtHandler.klass, "evt_spin_down", VALUEFUNC(evt_spin_down), -1); - rb_define_method(cWxEvtHandler.klass, "evt_choicebook_page_changing", VALUEFUNC(evt_choicebook_page_changing), -1); - rb_define_method(cWxEvtHandler.klass, "evt_choicebook_page_changed", VALUEFUNC(evt_choicebook_page_changed), -1); - rb_define_method(cWxEvtHandler.klass, "evt_notebook_page_changing", VALUEFUNC(evt_notebook_page_changing), -1); - rb_define_method(cWxEvtHandler.klass, "evt_notebook_page_changed", VALUEFUNC(evt_notebook_page_changed), -1); - rb_define_method(cWxEvtHandler.klass, "evt_listbook_page_changing", VALUEFUNC(evt_listbook_page_changing), -1); - rb_define_method(cWxEvtHandler.klass, "evt_listbook_page_changed", VALUEFUNC(evt_listbook_page_changed), -1); - rb_define_method(cWxEvtHandler.klass, "evt_listbox", VALUEFUNC(evt_listbox), -1); - rb_define_method(cWxEvtHandler.klass, "evt_listbox_dclick", VALUEFUNC(evt_listbox_dclick), -1); - rb_define_method(cWxEvtHandler.klass, "evt_checkbox", VALUEFUNC(evt_checkbox), -1); - rb_define_method(cWxEvtHandler.klass, "evt_text", VALUEFUNC(evt_text), -1); - rb_define_method(cWxEvtHandler.klass, "evt_text_enter", VALUEFUNC(evt_text_enter), -1); - rb_define_method(cWxEvtHandler.klass, "evt_text_maxlen", VALUEFUNC(evt_text_maxlen), -1); -#ifdef __WXMSW__ - rb_define_method(cWxEvtHandler.klass, "evt_text_url", VALUEFUNC(evt_text_url), -1); -#endif - rb_define_method(cWxEvtHandler.klass, "evt_radiobox", VALUEFUNC(evt_radiobox), -1); - rb_define_method(cWxEvtHandler.klass, "evt_radiobutton", VALUEFUNC(evt_radiobutton), -1); - - rb_define_method(cWxEvtHandler.klass, "evt_grid_cell_left_click", VALUEFUNC(evt_grid_cell_left_click), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_cell_right_click", VALUEFUNC(evt_grid_cell_right_click), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_cell_left_dclick", VALUEFUNC(evt_grid_cell_left_dclick), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_cell_right_dclick", VALUEFUNC(evt_grid_cell_right_dclick), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_label_left_click", VALUEFUNC(evt_grid_label_left_click), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_label_right_click", VALUEFUNC(evt_grid_label_right_click), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_label_left_dclick", VALUEFUNC(evt_grid_label_left_dclick), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_label_right_dclick", VALUEFUNC(evt_grid_label_right_dclick), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_cell_change", VALUEFUNC(evt_grid_cell_change), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_select_cell", VALUEFUNC(evt_grid_select_cell), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_editor_hidden", VALUEFUNC(evt_grid_editor_hidden), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_editor_shown", VALUEFUNC(evt_grid_editor_shown), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_cmd_cell_left_click", VALUEFUNC(evt_grid_cmd_cell_left_click), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_cmd_cell_right_click", VALUEFUNC(evt_grid_cmd_cell_right_click), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_cmd_cell_left_dclick", VALUEFUNC(evt_grid_cmd_cell_left_dclick), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_cmd_cell_right_dclick", VALUEFUNC(evt_grid_cmd_cell_right_dclick), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_cmd_label_left_click", VALUEFUNC(evt_grid_cmd_label_left_click), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_cmd_label_right_click", VALUEFUNC(evt_grid_cmd_label_right_click), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_cmd_label_left_dclick", VALUEFUNC(evt_grid_cmd_label_left_dclick), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_cmd_label_right_dclick", VALUEFUNC(evt_grid_cmd_label_right_dclick), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_cmd_cell_change", VALUEFUNC(evt_grid_cmd_cell_change), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_cmd_select_cell", VALUEFUNC(evt_grid_cmd_select_cell), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_cmd_editor_hidden", VALUEFUNC(evt_grid_cmd_editor_hidden), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_cmd_editor_shown", VALUEFUNC(evt_grid_cmd_editor_shown), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_col_size", VALUEFUNC(evt_grid_col_size), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_row_size", VALUEFUNC(evt_grid_row_size), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_cmd_col_size", VALUEFUNC(evt_grid_cmd_col_size), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_cmd_row_size", VALUEFUNC(evt_grid_cmd_row_size), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_range_select", VALUEFUNC(evt_grid_range_select), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_cmd_range_select", VALUEFUNC(evt_grid_cmd_range_select), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_editor_created", VALUEFUNC(evt_grid_editor_created), -1); - rb_define_method(cWxEvtHandler.klass, "evt_grid_cmd_editor_created", VALUEFUNC(evt_grid_cmd_editor_created), -1); - -        rb_define_method(cWxEvtHandler.klass, "evt_scrollwin", VALUEFUNC(evt_scrollwin), -1); -        rb_define_method(cWxEvtHandler.klass, "evt_scrollwin_top", VALUEFUNC(evt_scrollwin_top), -1); -        rb_define_method(cWxEvtHandler.klass, "evt_scrollwin_bottom", VALUEFUNC(evt_scrollwin_bottom), -1); -        rb_define_method(cWxEvtHandler.klass, "evt_scrollwin_lineup", VALUEFUNC(evt_scrollwin_lineup), -1); -        rb_define_method(cWxEvtHandler.klass, "evt_scrollwin_linedown", VALUEFUNC(evt_scrollwin_linedown), -1); -        rb_define_method(cWxEvtHandler.klass, "evt_scrollwin_pageup", VALUEFUNC(evt_scrollwin_pageup), -1); -        rb_define_method(cWxEvtHandler.klass, "evt_scrollwin_pagedown", VALUEFUNC(evt_scrollwin_pagedown), -1); -        rb_define_method(cWxEvtHandler.klass, "evt_scrollwin_thumbtrack", VALUEFUNC(evt_scrollwin_thumbtrack), -1); - rb_define_method(cWxEvtHandler.klass, "evt_wizard_page_changed", VALUEFUNC(evt_wizard_page_changed), -1); -        rb_define_method(cWxEvtHandler.klass, "evt_wizard_page_changing", VALUEFUNC(evt_wizard_page_changing), -1); -        rb_define_method(cWxEvtHandler.klass, "evt_wizard_cancel", VALUEFUNC(evt_wizard_cancel), -1); -        rb_define_method(cWxEvtHandler.klass, "evt_wizard_help", VALUEFUNC(evt_wizard_help), -1); -        rb_define_method(cWxEvtHandler.klass, "evt_wizard_finished", VALUEFUNC(evt_wizard_finished), -1); -        rb_define_method(cWxEvtHandler.klass, "evt_sash_dragged", VALUEFUNC(evt_sash_dragged), -1); -        rb_define_method(cWxEvtHandler.klass, "evt_sash_dragged_range", VALUEFUNC(evt_sash_dragged_range), -1); -        rb_define_method(cWxEvtHandler.klass, "evt_activate", VALUEFUNC(evt_activate), -1); -        rb_define_method(cWxEvtHandler.klass, "evt_activate_app", VALUEFUNC(evt_activate_app), -1); - -%} - -#endif </del><ins>+// The EvtHandler instance event methods (evt_xxx) are not defined +// here. Instead, they are defined by Events.cpp, generated from +// swig/Event.i and modified by swig/fixevents.rb </ins></span></pre> </div> </div> </body> </html>
Apparently Analagous Threads
- [1060] trunk/wxruby2/swig/fixevents.rb: Include some previously missing events, rehash and simplify
- [1067] trunk/wxruby2: Set up event handlers in Ruby rather than by post-processing SWIG output
- Wizards
- [1042] trunk/wxruby2: Overhaul of the event handling WxType->RubyClass mapping to make it
- [802] trunk/wxruby2/swig/classes: Add support for MenuEvent (MENU_OPEN, MENU_CLOSE, MENU_HIGHLIGHT)