wxruby3 0.9.0.pre.beta.11-x64-mingw-ucrt → 0.9.0.pre.beta.13-x64-mingw-ucrt

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (270) hide show
  1. checksums.yaml +4 -4
  2. data/INSTALL.md +85 -0
  3. data/README.md +2 -0
  4. data/assets/logo.png +0 -0
  5. data/assets/logo.svg +170 -0
  6. data/assets/logo.xcf +0 -0
  7. data/ext/wxbase32u_gcc_custom.dll +0 -0
  8. data/ext/wxbase32u_net_gcc_custom.dll +0 -0
  9. data/ext/wxbase32u_xml_gcc_custom.dll +0 -0
  10. data/ext/wxmsw32u_aui_gcc_custom.dll +0 -0
  11. data/ext/wxmsw32u_core_gcc_custom.dll +0 -0
  12. data/ext/wxmsw32u_gl_gcc_custom.dll +0 -0
  13. data/ext/wxmsw32u_html_gcc_custom.dll +0 -0
  14. data/ext/wxmsw32u_media_gcc_custom.dll +0 -0
  15. data/ext/wxmsw32u_propgrid_gcc_custom.dll +0 -0
  16. data/ext/wxmsw32u_qa_gcc_custom.dll +0 -0
  17. data/ext/wxmsw32u_ribbon_gcc_custom.dll +0 -0
  18. data/ext/wxmsw32u_richtext_gcc_custom.dll +0 -0
  19. data/ext/wxmsw32u_stc_gcc_custom.dll +0 -0
  20. data/ext/wxmsw32u_webview_gcc_custom.dll +0 -0
  21. data/ext/wxmsw32u_xrc_gcc_custom.dll +0 -0
  22. data/lib/wx/core/array_ext.rb +26 -0
  23. data/lib/wx/core/art_locator.rb +92 -0
  24. data/lib/wx/core/artprovider.rb +1 -1
  25. data/lib/wx/core/bitmap.rb +90 -53
  26. data/lib/wx/core/cursor.rb +12 -0
  27. data/lib/wx/core/dataformat.rb +3 -1
  28. data/lib/wx/core/dc.rb +76 -52
  29. data/lib/wx/core/enum.rb +4 -0
  30. data/lib/wx/core/event.rb +38 -5
  31. data/lib/wx/core/events/evt_list.rb +3 -2
  32. data/lib/wx/core/evthandler.rb +64 -23
  33. data/lib/wx/core/icon.rb +50 -35
  34. data/lib/wx/core/id_helper.rb +32 -0
  35. data/lib/wx/core/image.rb +63 -53
  36. data/lib/wx/core/point.rb +14 -0
  37. data/lib/wx/core/real_point.rb +15 -1
  38. data/lib/wx/core/rect.rb +42 -7
  39. data/lib/wx/core/region_iterator.rb +37 -0
  40. data/lib/wx/core/size.rb +20 -0
  41. data/lib/wx/core/window.rb +8 -31
  42. data/lib/wx/doc/array_ext.rb +27 -0
  43. data/lib/wx/doc/art_locator.rb +57 -0
  44. data/lib/wx/doc/bitmap.rb +27 -0
  45. data/lib/wx/doc/clipboard.rb +12 -0
  46. data/lib/wx/doc/const.rb +77 -0
  47. data/lib/wx/doc/cursor.rb +16 -0
  48. data/lib/wx/doc/data_object.rb +1 -2
  49. data/lib/wx/doc/dc.rb +63 -46
  50. data/lib/wx/doc/event.rb +24 -0
  51. data/lib/wx/doc/events.rb +14 -0
  52. data/lib/wx/doc/evthandler.rb +24 -3
  53. data/lib/wx/doc/extra/00_starting.md +1 -1
  54. data/lib/wx/doc/extra/06_geometry.md +10 -4
  55. data/lib/wx/doc/extra/10_art.md +105 -0
  56. data/lib/wx/doc/gc_dc.rb +21 -0
  57. data/lib/wx/doc/gdi_common.rb +122 -1
  58. data/lib/wx/doc/gen/about_dialog_info.rb +1 -4
  59. data/lib/wx/doc/gen/animation.rb +3 -3
  60. data/lib/wx/doc/gen/animation_ctrl.rb +4 -4
  61. data/lib/wx/doc/gen/any_button.rb +1 -1
  62. data/lib/wx/doc/gen/aui/aui_floating_frame.rb +1 -1
  63. data/lib/wx/doc/gen/aui/aui_manager.rb +2 -2
  64. data/lib/wx/doc/gen/aui/aui_mdi_child_frame.rb +3 -3
  65. data/lib/wx/doc/gen/aui/aui_mdi_parent_frame.rb +3 -3
  66. data/lib/wx/doc/gen/aui/aui_notebook.rb +2 -2
  67. data/lib/wx/doc/gen/aui/aui_tool_bar.rb +6 -6
  68. data/lib/wx/doc/gen/bitmap.rb +1 -1
  69. data/lib/wx/doc/gen/bitmap_button.rb +2 -2
  70. data/lib/wx/doc/gen/book_ctrl_base.rb +4 -4
  71. data/lib/wx/doc/gen/brush.rb +1 -1
  72. data/lib/wx/doc/gen/button.rb +2 -2
  73. data/lib/wx/doc/gen/calendar_ctrl.rb +3 -3
  74. data/lib/wx/doc/gen/calendar_date_attr.rb +1 -1
  75. data/lib/wx/doc/gen/check_box.rb +2 -2
  76. data/lib/wx/doc/gen/check_list_box.rb +3 -3
  77. data/lib/wx/doc/gen/choice.rb +2 -2
  78. data/lib/wx/doc/gen/choicebook.rb +2 -2
  79. data/lib/wx/doc/gen/collapsible_pane.rb +2 -2
  80. data/lib/wx/doc/gen/colour.rb +1 -3
  81. data/lib/wx/doc/gen/colour_dialog.rb +1 -2
  82. data/lib/wx/doc/gen/colour_picker_ctrl.rb +2 -2
  83. data/lib/wx/doc/gen/combo_box.rb +4 -4
  84. data/lib/wx/doc/gen/context_help_button.rb +1 -1
  85. data/lib/wx/doc/gen/control.rb +3 -3
  86. data/lib/wx/doc/gen/core.rb +2 -2
  87. data/lib/wx/doc/gen/data_format.rb +1 -1
  88. data/lib/wx/doc/gen/data_object.rb +6 -6
  89. data/lib/wx/doc/gen/date_picker_ctrl.rb +2 -2
  90. data/lib/wx/doc/gen/dc.rb +9 -9
  91. data/lib/wx/doc/gen/defs.rb +0 -4
  92. data/lib/wx/doc/gen/dialog.rb +3 -3
  93. data/lib/wx/doc/gen/dir_dialog.rb +2 -4
  94. data/lib/wx/doc/gen/dir_filter_list_ctrl.rb +2 -2
  95. data/lib/wx/doc/gen/dir_picker_ctrl.rb +2 -2
  96. data/lib/wx/doc/gen/drag_drop.rb +13 -1
  97. data/lib/wx/doc/gen/editable_list_box.rb +2 -2
  98. data/lib/wx/doc/gen/event.rb +0 -1
  99. data/lib/wx/doc/gen/event_list.rb +18 -16
  100. data/lib/wx/doc/gen/events.rb +87 -2
  101. data/lib/wx/doc/gen/ext_help_controller.rb +2 -2
  102. data/lib/wx/doc/gen/file_dialog.rb +1 -1
  103. data/lib/wx/doc/gen/file_picker_ctrl.rb +2 -2
  104. data/lib/wx/doc/gen/font.rb +6 -6
  105. data/lib/wx/doc/gen/font_dialog.rb +1 -2
  106. data/lib/wx/doc/gen/font_picker_ctrl.rb +2 -2
  107. data/lib/wx/doc/gen/frame.rb +5 -5
  108. data/lib/wx/doc/gen/fs_file.rb +2 -2
  109. data/lib/wx/doc/gen/gauge.rb +2 -2
  110. data/lib/wx/doc/gen/gdi_common.rb +18 -21
  111. data/lib/wx/doc/gen/generic_dir_ctrl.rb +2 -2
  112. data/lib/wx/doc/gen/graphics_context.rb +4 -4
  113. data/lib/wx/doc/gen/graphics_object.rb +2 -2
  114. data/lib/wx/doc/gen/grid/grid_cell_bool_editor.rb +1 -1
  115. data/lib/wx/doc/gen/grid/grid_cell_date_time_renderer.rb +1 -1
  116. data/lib/wx/doc/gen/grid/grid_cell_enum_editor.rb +1 -1
  117. data/lib/wx/doc/gen/grid/grid_cell_enum_renderer.rb +1 -1
  118. data/lib/wx/doc/gen/grid/grid_cell_float_editor.rb +1 -1
  119. data/lib/wx/doc/gen/grid/grid_cell_float_renderer.rb +1 -1
  120. data/lib/wx/doc/gen/grid/grid_ctrl.rb +7 -7
  121. data/lib/wx/doc/gen/help_controller.rb +1 -1
  122. data/lib/wx/doc/gen/html/html_cell.rb +4 -4
  123. data/lib/wx/doc/gen/html/html_easy_printing.rb +6 -6
  124. data/lib/wx/doc/gen/html/html_help_controller.rb +6 -6
  125. data/lib/wx/doc/gen/html/html_help_frame.rb +2 -2
  126. data/lib/wx/doc/gen/html/html_help_window.rb +6 -6
  127. data/lib/wx/doc/gen/html/html_list_box.rb +6 -6
  128. data/lib/wx/doc/gen/html/html_printout.rb +4 -4
  129. data/lib/wx/doc/gen/html/html_window.rb +4 -4
  130. data/lib/wx/doc/gen/icon.rb +6 -6
  131. data/lib/wx/doc/gen/image.rb +7 -7
  132. data/lib/wx/doc/gen/list_box.rb +4 -4
  133. data/lib/wx/doc/gen/list_ctrl.rb +5 -5
  134. data/lib/wx/doc/gen/listbook.rb +2 -2
  135. data/lib/wx/doc/gen/locale.rb +8 -8
  136. data/lib/wx/doc/gen/log.rb +2 -2
  137. data/lib/wx/doc/gen/mdi_frame.rb +5 -5
  138. data/lib/wx/doc/gen/media_ctrl.rb +4 -4
  139. data/lib/wx/doc/gen/menu.rb +12 -12
  140. data/lib/wx/doc/gen/menu_item.rb +1 -1
  141. data/lib/wx/doc/gen/message_dialog.rb +2 -4
  142. data/lib/wx/doc/gen/mini_frame.rb +2 -2
  143. data/lib/wx/doc/gen/notebook.rb +3 -3
  144. data/lib/wx/doc/gen/number_entry_dialog.rb +0 -1
  145. data/lib/wx/doc/gen/object.rb +0 -1
  146. data/lib/wx/doc/gen/panel.rb +2 -2
  147. data/lib/wx/doc/gen/pen.rb +2 -2
  148. data/lib/wx/doc/gen/pg/pg_array_editor_dialog.rb +1 -1
  149. data/lib/wx/doc/gen/pg/pg_cell.rb +1 -1
  150. data/lib/wx/doc/gen/pg/pg_properties.rb +20 -20
  151. data/lib/wx/doc/gen/pg/pg_property.rb +12 -12
  152. data/lib/wx/doc/gen/pg/property_grid.rb +3 -3
  153. data/lib/wx/doc/gen/pg/property_grid_interface.rb +14 -14
  154. data/lib/wx/doc/gen/pg/property_grid_manager.rb +3 -3
  155. data/lib/wx/doc/gen/pg/property_grid_page.rb +2 -2
  156. data/lib/wx/doc/gen/pg/property_grid_page_state.rb +2 -2
  157. data/lib/wx/doc/gen/popup_window.rb +3 -3
  158. data/lib/wx/doc/gen/property_sheet_dialog.rb +3 -3
  159. data/lib/wx/doc/gen/prt/print_abort_dialog.rb +1 -1
  160. data/lib/wx/doc/gen/prt/printer.rb +1 -1
  161. data/lib/wx/doc/gen/radio_box.rb +4 -4
  162. data/lib/wx/doc/gen/radio_button.rb +2 -2
  163. data/lib/wx/doc/gen/rbn/ribbon_bar.rb +2 -2
  164. data/lib/wx/doc/gen/rbn/ribbon_button_bar.rb +12 -12
  165. data/lib/wx/doc/gen/rbn/ribbon_control.rb +1 -1
  166. data/lib/wx/doc/gen/rbn/ribbon_gallery.rb +2 -2
  167. data/lib/wx/doc/gen/rbn/ribbon_page.rb +2 -2
  168. data/lib/wx/doc/gen/rbn/ribbon_panel.rb +2 -2
  169. data/lib/wx/doc/gen/rbn/ribbon_tool_bar.rb +11 -11
  170. data/lib/wx/doc/gen/region.rb +1 -1
  171. data/lib/wx/doc/gen/region_iterator.rb +76 -0
  172. data/lib/wx/doc/gen/rtc/rich_text_buffer.rb +10 -10
  173. data/lib/wx/doc/gen/rtc/rich_text_ctrl.rb +19 -19
  174. data/lib/wx/doc/gen/rtc/rich_text_file_handler.rb +2 -2
  175. data/lib/wx/doc/gen/rtc/rich_text_header_footer_data.rb +4 -4
  176. data/lib/wx/doc/gen/rtc/rich_text_html_handler.rb +1 -1
  177. data/lib/wx/doc/gen/rtc/rich_text_printing.rb +6 -6
  178. data/lib/wx/doc/gen/rtc/rich_text_xml_handler.rb +1 -1
  179. data/lib/wx/doc/gen/rtc/symbol_picker_dialog.rb +2 -2
  180. data/lib/wx/doc/gen/sash_event.rb +1 -1
  181. data/lib/wx/doc/gen/sash_layout_window.rb +2 -2
  182. data/lib/wx/doc/gen/sash_window.rb +1 -1
  183. data/lib/wx/doc/gen/scroll_bar.rb +150 -0
  184. data/lib/wx/doc/gen/scrolled_canvas.rb +2 -2
  185. data/lib/wx/doc/gen/scrolled_control.rb +2 -2
  186. data/lib/wx/doc/gen/scrolled_window.rb +2 -2
  187. data/lib/wx/doc/gen/simplebook.rb +2 -2
  188. data/lib/wx/doc/gen/sizer.rb +3 -3
  189. data/lib/wx/doc/gen/slider.rb +2 -2
  190. data/lib/wx/doc/gen/spin_button.rb +2 -2
  191. data/lib/wx/doc/gen/spin_ctrl.rb +2 -2
  192. data/lib/wx/doc/gen/splash_screen.rb +1 -1
  193. data/lib/wx/doc/gen/splitter_window.rb +2 -2
  194. data/lib/wx/doc/gen/static_bitmap.rb +2 -2
  195. data/lib/wx/doc/gen/static_box.rb +4 -4
  196. data/lib/wx/doc/gen/static_box_sizer.rb +1 -1
  197. data/lib/wx/doc/gen/static_line.rb +2 -2
  198. data/lib/wx/doc/gen/static_text.rb +2 -2
  199. data/lib/wx/doc/gen/status_bar.rb +2 -2
  200. data/lib/wx/doc/gen/stc/styled_text_ctrl.rb +3 -3
  201. data/lib/wx/doc/gen/task_bar_icon.rb +2 -2
  202. data/lib/wx/doc/gen/text_attr.rb +3 -3
  203. data/lib/wx/doc/gen/text_ctrl.rb +3 -3
  204. data/lib/wx/doc/gen/text_entry_dialog.rb +6 -8
  205. data/lib/wx/doc/gen/text_validator.rb +1 -1
  206. data/lib/wx/doc/gen/time_picker_ctrl.rb +2 -2
  207. data/lib/wx/doc/gen/tip_provider.rb +1 -3
  208. data/lib/wx/doc/gen/toggle_button.rb +2 -2
  209. data/lib/wx/doc/gen/tool_bar.rb +10 -10
  210. data/lib/wx/doc/gen/toolbook.rb +2 -2
  211. data/lib/wx/doc/gen/top_level_window.rb +4 -4
  212. data/lib/wx/doc/gen/tree_ctrl.rb +4 -4
  213. data/lib/wx/doc/gen/treebook.rb +2 -2
  214. data/lib/wx/doc/gen/utils.rb +5 -42
  215. data/lib/wx/doc/gen/v_list_box.rb +2 -2
  216. data/lib/wx/doc/gen/v_scrolled_window.rb +2 -2
  217. data/lib/wx/doc/gen/variant.rb +10 -10
  218. data/lib/wx/doc/gen/window.rb +9 -14
  219. data/lib/wx/doc/gen/wizard.rb +2 -2
  220. data/lib/wx/doc/gen/wizard_event.rb +1 -1
  221. data/lib/wx/doc/gen/xml_node.rb +2 -2
  222. data/lib/wx/doc/gen/xml_resource.rb +3 -3
  223. data/lib/wx/doc/graphics_context.rb +42 -0
  224. data/lib/wx/doc/icon.rb +18 -0
  225. data/lib/wx/doc/id_helper.rb +25 -0
  226. data/lib/wx/doc/image.rb +33 -0
  227. data/lib/wx/doc/region_iterator.rb +31 -0
  228. data/lib/wx/doc/scaled_dc.rb +1 -0
  229. data/lib/wx/doc/window.rb +18 -0
  230. data/lib/wx/version.rb +1 -1
  231. data/lib/wx/wxruby/cmd/sampler.rb +3 -21
  232. data/lib/wxruby_aui.so +0 -0
  233. data/lib/wxruby_core.so +0 -0
  234. data/lib/wxruby_grid.so +0 -0
  235. data/lib/wxruby_html.so +0 -0
  236. data/lib/wxruby_pg.so +0 -0
  237. data/lib/wxruby_prt.so +0 -0
  238. data/lib/wxruby_rbn.so +0 -0
  239. data/lib/wxruby_rtc.so +0 -0
  240. data/lib/wxruby_stc.so +0 -0
  241. data/rakelib/lib/config.rb +4 -4
  242. data/samples/art/wxruby-128x128.png +0 -0
  243. data/samples/art/wxruby-256x256.png +0 -0
  244. data/samples/art/wxruby-64x64.png +0 -0
  245. data/samples/art/wxruby.ico +0 -0
  246. data/samples/art/wxruby.png +0 -0
  247. data/samples/drawing/graphics_drawing.rb +1 -2
  248. data/samples/propgrid/propgrid.rb +65 -65
  249. data/samples/sample.xpm +246 -470
  250. data/samples/treectrl/treectrl.rb +1 -1
  251. data/tests/art/my_art/sample.xpm +251 -0
  252. data/tests/art/sample3.xpm +251 -0
  253. data/tests/art/test_art/bitmap/sample.xpm +251 -0
  254. data/tests/art/test_art/bitmap/wxruby.bmp +0 -0
  255. data/tests/art/test_art/bitmap/wxruby.png +0 -0
  256. data/tests/art/test_art/bitmap/wxruby.xpm +251 -0
  257. data/tests/art/test_art/cursor/wxruby.bmp +0 -0
  258. data/tests/art/test_art/icon/sample.xpm +251 -0
  259. data/tests/art/test_art/icon/wxruby.ico +0 -0
  260. data/tests/art/test_art/icon/wxruby.png +0 -0
  261. data/tests/art/test_art/image/sample.xpm +251 -0
  262. data/tests/art/test_art/image/wxruby.jpg +0 -0
  263. data/tests/art/test_art/image/wxruby.png +0 -0
  264. data/tests/art/test_art/sample2.xpm +251 -0
  265. data/tests/test_art.rb +91 -0
  266. data/tests/test_clipboard.rb +35 -0
  267. data/tests/test_dc.rb +70 -0
  268. data/tests/test_events.rb +12 -0
  269. data/tests/test_geometry.rb +13 -0
  270. metadata +48 -5
@@ -286,75 +286,75 @@ class MyColourProperty < Wx::PG::ColourProperty
286
286
  end
287
287
 
288
288
  module ID
289
- %i[
290
- PGID
291
- ABOUT
292
- QUIT
293
- APPENDPROP
294
- APPENDCAT
295
- INSERTPROP
296
- INSERTCAT
297
- ENABLE
298
- SETREADONLY
299
- HIDE
300
- BOOL_CHECKBOX
301
- DELETE
302
- DELETER
303
- DELETEALL
304
- UNSPECIFY
305
- ITERATE1
306
- ITERATE2
307
- ITERATE3
308
- ITERATE4
309
- CLEARMODIF
310
- FREEZE
311
- DUMPLIST
312
- COLOURSCHEME1
313
- COLOURSCHEME2
314
- COLOURSCHEME3
315
- CATCOLOURS
316
- SETBGCOLOUR
317
- SETBGCOLOURRECUR
318
- STATICLAYOUT
319
- POPULATE1
320
- POPULATE2
321
- COLLAPSE
322
- COLLAPSEALL
323
- GETVALUES
324
- SETVALUES
325
- SETVALUES2
326
- RUNTESTFULL
327
- RUNTESTPARTIAL
328
- FITCOLUMNS
329
- CHANGEFLAGSITEMS
330
- TESTINSERTCHOICE
331
- TESTDELETECHOICE
332
- INSERTPAGE
333
- REMOVEPAGE
334
- SETSPINCTRLEDITOR
335
- SETPROPERTYVALUE
336
- TESTREPLACE
337
- SETCOLUMNS
338
- SETVIRTWIDTH
339
- SETPGDISABLED
340
- TESTXRC
341
- ENABLECOMMONVALUES
342
- SELECTSTYLE
343
- SAVESTATE
344
- RESTORESTATE
345
- RUNMINIMAL
346
- ENABLELABELEDITING
347
- VETOCOLDRAG
348
- ONEXTENDEDKEYNAV
349
- SHOWPOPUP
350
- POPUPGRID
351
- ].each_with_index { |sym, ix| self.const_set(sym, ix+1) }
289
+ include Wx::IDHelper
290
+
291
+ PGID = self.next_id
292
+ ABOUT = self.next_id
293
+ QUIT = self.next_id
294
+ APPENDPROP = self.next_id
295
+ APPENDCAT = self.next_id
296
+ INSERTPROP = self.next_id
297
+ INSERTCAT = self.next_id
298
+ ENABLE = self.next_id
299
+ SETREADONLY = self.next_id
300
+ HIDE = self.next_id
301
+ BOOL_CHECKBOX = self.next_id
302
+ DELETE = self.next_id
303
+ DELETER = self.next_id
304
+ DELETEALL = self.next_id
305
+ UNSPECIFY = self.next_id
306
+ ITERATE1 = self.next_id
307
+ ITERATE2 = self.next_id
308
+ ITERATE3 = self.next_id
309
+ ITERATE4 = self.next_id
310
+ CLEARMODIF = self.next_id
311
+ FREEZE = self.next_id
312
+ DUMPLIST = self.next_id
313
+ COLOURSCHEME1 = self.next_id
314
+ COLOURSCHEME2 = self.next_id
315
+ COLOURSCHEME3 = self.next_id
316
+ CATCOLOURS = self.next_id
317
+ SETBGCOLOUR = self.next_id
318
+ SETBGCOLOURRECUR = self.next_id
319
+ STATICLAYOUT = self.next_id
320
+ POPULATE1 = self.next_id
321
+ POPULATE2 = self.next_id
322
+ COLLAPSE = self.next_id
323
+ COLLAPSEALL = self.next_id
324
+ GETVALUES = self.next_id
325
+ SETVALUES = self.next_id
326
+ SETVALUES2 = self.next_id
327
+ RUNTESTFULL = self.next_id
328
+ RUNTESTPARTIAL = self.next_id
329
+ FITCOLUMNS = self.next_id
330
+ CHANGEFLAGSITEMS = self.next_id
331
+ TESTINSERTCHOICE = self.next_id
332
+ TESTDELETECHOICE = self.next_id
333
+ INSERTPAGE = self.next_id
334
+ REMOVEPAGE = self.next_id
335
+ SETSPINCTRLEDITOR = self.next_id
336
+ SETPROPERTYVALUE = self.next_id
337
+ TESTREPLACE = self.next_id
338
+ SETCOLUMNS = self.next_id
339
+ SETVIRTWIDTH = self.next_id
340
+ SETPGDISABLED = self.next_id
341
+ TESTXRC = self.next_id
342
+ ENABLECOMMONVALUES = self.next_id
343
+ SELECTSTYLE = self.next_id
344
+ SAVESTATE = self.next_id
345
+ RESTORESTATE = self.next_id
346
+ RUNMINIMAL = self.next_id
347
+ ENABLELABELEDITING = self.next_id
348
+ VETOCOLDRAG = self.next_id
349
+ ONEXTENDEDKEYNAV = self.next_id
350
+ SHOWPOPUP = self.next_id
351
+ POPUPGRID = self.next_id
352
352
 
353
353
  if Wx.has_feature?(:USE_HEADERCTRL)
354
- SHOWHEADER = POPUPGRID+1
354
+ SHOWHEADER = self.next_id
355
355
  end
356
356
 
357
- COLOURSCHEME4 = 100
357
+ COLOURSCHEME4 = self.next_id
358
358
  end
359
359
 
360
360
  #