wxruby3 0.9.0.pre.beta.11 → 0.9.0.pre.beta.13

data/rakelib/lib/director/region_iterator.rb

@@ -0,0 +1,48 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+module WXRuby3
+
+  class Director
+
+    class RegionIterator < Director
+
+      def setup
+        super
+        spec.gc_never
+        spec.disable_proxies
+        spec.make_abstract 'wxRegionIterator'
+        # not useful in wxRuby
+        spec.ignore 'wxRegionIterator::Reset(const wxRegion &)',
+                    'wxRegionIterator::operator bool'
+        # add iteration control methods
+        spec.add_extend_code 'wxRegionIterator', <<~__HEREDOC
+          void next_rect()
+          {
+            $self->operator ++();
+          }
+          __HEREDOC
+        # add custom factory method
+        spec.add_extend_code 'wxRegionIterator', <<~__HEREDOC
+          static void for_region(const wxRegion& region) 
+          {
+            wxRegionIterator region_it(region);
+            if (rb_block_given_p())
+            {
+              wxRegionIterator *p_region_it = &region_it;
+              VALUE rb_region_it = SWIG_NewPointerObj(SWIG_as_voidptr(p_region_it), SWIGTYPE_p_wxRegionIterator, 0);
+              rb_yield(rb_region_it);
+              SWIG_RubyRemoveTracking((void *)p_region_it);
+              DATA_PTR(rb_region_it) = NULL;
+            }
+          }
+          __HEREDOC
+        spec.do_not_generate :functions, :variables, :defines, :enums
+      end
+    end # class RegionIterator
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/richtext_buffer.rb

@@ -22,7 +22,7 @@ module WXRuby3
           wxRichTextBuffer
           ]
         spec.gc_as_object 'wxRichTextAttr'
-        spec.gc_never 'wxRichTextBuffer'
+        spec.gc_as_object 'wxRichTextBuffer'
         spec.override_inheritance_chain('wxRichTextBuffer', %w[wxObject])
         spec.ignore %w[
           wxRichTextBuffer::GetBatchedCommand

data/rakelib/lib/director/richtext_buffer_data_object.rb

@@ -0,0 +1,45 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+module WXRuby3
+
+  class Director
+
+    class RichTextBufferDataObject < Director
+
+      include Typemap::DataFormat
+      include Typemap::DataObjectData
+
+      def setup
+        super
+        spec.gc_as_object
+        # make sure the build scripts know that DataObjectSimple is part of the DataObject module
+        spec.override_inheritance_chain('wxRichTextBufferDataObject', {'wxDataObjectSimple' => 'wxDataObject'}, 'wxDataObject')
+        # we only allow Ruby derivatives from wxDataObject but not of any of the C++ implemented
+        # specializations
+        spec.no_proxy 'wxRichTextBufferDataObject'
+        spec.add_swig_code <<~__HEREDOC
+            // SWIG gets confused and doesn't realise that various virtual methods
+            // from wxDataObject are implemented fully in this subclass, and so,
+            // believing it to be abstract doesn't provide an allocator for this
+            // class. This undocumented feature overrides this.
+            %feature("notabstract") wxRichTextBufferDataObject;
+        __HEREDOC
+
+        # ignore overrrides (will be available through base class)
+        spec.ignore 'wxRichTextBufferDataObject::GetPreferredFormat'
+        spec.ignore 'wxRichTextBufferDataObject::GetDataSize'
+        spec.ignore 'wxRichTextBufferDataObject::GetDataHere'
+        spec.ignore 'wxRichTextBufferDataObject::SetData'
+
+        spec.new_object 'wxRichTextBufferDataObject::GetRichTextBuffer'
+        spec.do_not_generate :variables, :defines, :functions, :enums
+      end
+
+    end
+
+  end
+
+end

data/rakelib/lib/director/scroll_bar.rb

@@ -0,0 +1,39 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+require_relative './window'
+
+module WXRuby3
+
+  class Director
+
+    class ScrollBar < Window
+
+      def setup
+        super
+      end
+
+      def process(gendoc: false)
+        defmod = super
+        # fix documentation errors for scroll events
+        def_item = defmod.find_item('wxScrollBar')
+        if def_item
+          def_item.event_types.each do |evt_spec|
+            case evt_spec.first
+            when 'EVT_COMMAND_SCROLL_THUMBRELEASE', 'EVT_COMMAND_SCROLL_CHANGED'
+              if evt_spec[2] == 0
+                evt_spec[2] = 1       # incorrectly documented without 'id' argument
+                evt_spec[4] = true    # ignore extracted docs
+              end
+            end
+          end
+        end
+        defmod
+      end
+    end # class ScrollBar
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/slider.rb

@@ -0,0 +1,39 @@
+###
+# wxRuby3 wxWidgets interface director
+# Copyright (c) M.J.N. Corino, The Netherlands
+###
+
+require_relative './window'
+
+module WXRuby3
+
+  class Director
+
+    class Slider < Window
+
+      def setup
+        super
+      end
+
+      def process(gendoc: false)
+        defmod = super
+        # fix documentation errors for scroll events
+        def_item = defmod.find_item('wxSlider')
+        if def_item
+          def_item.event_types.each do |evt_spec|
+            case evt_spec.first
+            when 'EVT_COMMAND_SCROLL_THUMBRELEASE', 'EVT_COMMAND_SCROLL_CHANGED'
+              if evt_spec[2] == 0
+                evt_spec[2] = 1       # incorrectly documented without 'id' argument
+                evt_spec[4] = true    # ignore extracted docs
+              end
+            end
+          end
+        end
+        defmod
+      end
+    end # class Slider
+
+  end # class Director
+
+end # module WXRuby3

data/rakelib/lib/director/window.rb

@@ -156,7 +156,29 @@ module WXRuby3
             extern VALUE wxRuby_GetWindowClass() {
               return SwigClassWxWindow.klass;
             }
+            // we need this static method here because we do not want SWIG to parse the preprocessor 
+            // statements (#if/#else/#endif) which it does in %extend blocks
+            static VALUE do_paint_buffered(wxWindow* ptr)
+            {
+              VALUE rc = Qnil;
+              wxAutoBufferedPaintDC dc(ptr);
+            #if wxALWAYS_NATIVE_DOUBLE_BUFFER
+              wxPaintDC* ptr_dc = &dc;
+              VALUE r_class = rb_const_get(mWxCore, rb_intern("PaintDC"));
+            #else
+              wxMemoryDC* ptr_dc = &dc;
+              VALUE r_class = rb_const_get(mWxCore, rb_intern("MemoryDC"));
+            #endif
+              swig_type_info* swig_type = wxRuby_GetSwigTypeForClass(r_class);
+              VALUE rb_dc = SWIG_NewPointerObj(SWIG_as_voidptr(ptr_dc), swig_type, 0);
+              rc = rb_yield(rb_dc);
+              SWIG_RubyRemoveTracking((void *)ptr_dc);
+              DATA_PTR(rb_dc) = NULL;
+
+              return rc;
+            }
             __HEREDOC
+          spec.add_header_code 'static VALUE do_paint_buffered(wxWindow* ptr);'
           spec.add_extend_code 'wxWindow', <<~__HEREDOC
             // passes a DC for drawing on Window into a passed ruby block, and
             // ensure that the DC is correctly deleted when drawing is
@@ -167,9 +189,9 @@ module WXRuby3
             {  
               static WxRuby_ID painting_id("@__painting__");
 
-              if ( ! rb_block_given_p() )
-              rb_raise(rb_eArgError, "No block given for Window#paint");
+              if (!rb_block_given_p()) rb_raise(rb_eArgError, "No block given for Window#paint");
           
+              VALUE rc = Qnil;
               wxWindow *ptr = self;
               VALUE rb_win = SWIG_RubyInstanceFor(ptr);
               // see if within an evt_paint block - see classes/window.rb
@@ -178,7 +200,7 @@ module WXRuby3
               {
                 wxPaintDC dc(ptr);
                 VALUE dcVal = SWIG_NewPointerObj((void *) &dc,SWIGTYPE_p_wxPaintDC, 0);
-                rb_yield(dcVal);
+                rc = rb_yield(dcVal);
                 SWIG_RubyRemoveTracking((void *) &dc);
                 DATA_PTR(dcVal) = NULL;
               }
@@ -186,12 +208,21 @@ module WXRuby3
               {
                 wxClientDC dc(ptr);
                 VALUE dcVal = SWIG_NewPointerObj((void *) &dc,SWIGTYPE_p_wxClientDC, 0);
-                rb_yield(dcVal);
+                rc = rb_yield(dcVal);
                 SWIG_RubyRemoveTracking((void *) &dc);
                 DATA_PTR(dcVal) = NULL;
               }
           
-              return Qnil;
+              return rc;
+            }
+
+            // similar to the paint() method but now for buffered painting
+            // we do not check __painting__ here, instead we do that in pure Ruby
+            VALUE paint_buffered()
+            {
+              if (!rb_block_given_p()) rb_raise(rb_eArgError, "No block given for Window#paint_buffered");
+          
+              return do_paint_buffered(self);
             }
           
             // Return a window handle as a platform-specific ruby integer

data/rakelib/lib/director/window_disabler.rb

@@ -28,13 +28,6 @@ module WXRuby3
             return ;
           }
           __HEREDOC
-        spec.ignore %w[
-          wxFindWindowByLabel
-          wxFindWindowByName
-          wxNewId
-          wxUsleep
-          ]
-        spec.ignore 'wxPostDelete' unless Config.instance.wx_version >= '3.3.0'
         spec.do_not_generate(:variables, :enums, :defines, :functions)
       end
     end # class WindowDisabler

data/rakelib/lib/extractor/class.rb

@@ -227,7 +227,7 @@ module WXRuby3
                                end
                     # record event handler (macro) name, event type handled and the number of event id arguments
                     evt_arity = args.inject(0) {|c, a| c += 1 if a.start_with?('id'); c }
-                    @event_types << [evt_handler, evt_type, evt_arity, evt_klass]
+                    @event_types << [evt_handler, evt_type, evt_arity, evt_klass, false]
                   end
                 end
               end

data/rakelib/lib/extractor/function.rb

@@ -111,7 +111,7 @@ module WXRuby3
                   end
             params << { name: pnm, type: arg.type }
             if paramdef.default
-              defexp = rb_constant_expression(paramdef.default)
+              defexp = rb_constant_expression(paramdef.default, xml_trans.constants_xref_db)
               # in case the default expression dereferences a pointer or passes an address clean it up
               defexp.sub!(/\A\s*[\*\&]/, '')
               # in case the default expression contains anything else but simple numbers or identifiers, wrap in ()

data/rakelib/lib/generate/doc.rb

@@ -46,12 +46,17 @@ module WXRuby3
           tmpfile << script
           tmpfile.close(false)
           result = if Director.trace?
-                     Config.instance.run(ftmp_name, capture: :out)
+                     Config.instance.run(ftmp_name, capture: :out, verbose: false)
                    else
-                     Config.instance.run(ftmp_name, capture: :no_err)
+                     Config.instance.run(ftmp_name, capture: :no_err, verbose: false)
                    end
           STDERR.puts "* got constants collection output:\n#{result}" if Director.trace?
-          db = JSON.load(result)
+          begin
+            db = JSON.load(result)
+          rescue Exception
+            File.open('constants_raw.json', "w") { |f| f << result } if Director.verbose?
+            ::Kernel.raise RuntimeError, "Exception loading constants collection result: #{$!.message.slice(0, 512)}", cause: nil
+          end
           File.open('constants.json', "w") { |f| f << JSON.pretty_generate(db) } if Director.verbose?
           return db
         ensure
@@ -293,6 +298,8 @@ module WXRuby3
               ["#{DocGenerator.constants_xref_db[constnm]['mod']}::#{constnm}", true]
             elsif DocGenerator.constants_xref_db.has_key?(rb_constant_name(nm_str))
               ["Wx::#{rb_constant_name(nm_str)}", true]
+            elsif DocGenerator.constants_xref_db.has_key?(rb_constant_name(nm_str, false))
+              ["Wx::#{rb_constant_name(nm_str, false)}", true]
             elsif !_is_method?(nm_str, ref_scope)
               ["Wx::#{constnm}", true]
             else
@@ -324,6 +331,9 @@ module WXRuby3
           elsif DocGenerator.constants_xref_db.has_key?(rb_constant_name(nm_str))
             cnm = rb_constant_name(nm_str)
             constnm = "#{DocGenerator.constants_xref_db[cnm]['mod']}::#{cnm}"
+          elsif DocGenerator.constants_xref_db.has_key?(rb_constant_name(nm_str, false))
+            cnm = rb_constant_name(nm_str, false)
+            constnm = "#{DocGenerator.constants_xref_db[cnm]['mod']}::#{cnm}"
           elsif nm_str.start_with?('wx')
             known = false
             constnm = "Wx::#{constnm}"
@@ -411,10 +421,12 @@ module WXRuby3
         para = node_to_doc(node)
         # loose specific notes paragraphs
         case para
-        when /\A\s*wxPerl Note:/,   # wxPerl note
-          /\A\s*Library:/        # Library note
+        when /\A(\<b\>)?wxPerl Note:/,  # wxPerl note
+             /\A\s*Library:/,           # Library note
+             /\A\s*Include\s+file:/     # Include file note
           ''
         else
+          para.sub!(/Include\s+file:\s+\#include\s+\<[^>]+\>\s*\Z/, '')
           if event_section?
             case para
             when /The following event handler macros redirect.*(\{.*})/
@@ -509,6 +521,14 @@ module WXRuby3
         doc
       end
 
+      def constants_db
+        DocGenerator.constants_db
+      end
+
+      def constants_xref_db
+        DocGenerator.constants_xref_db
+      end
+
     end
 
     def run
@@ -611,7 +631,7 @@ module WXRuby3
               end
             else
               item.items.each do |e|
-                const_name = rb_constant_name(e.name)
+                const_name = rb_constant_name(e.name, false)
                 if xref_table.has_key?(const_name)
                   gen_constant_doc(fdoc, const_name, xref_table[const_name], get_constant_doc(e))
                 end

data/rakelib/lib/specs/interfaces.rb

@@ -43,6 +43,7 @@ module WXRuby3
     Director.Spec(pkg, 'wxPen')
     Director.Spec(pkg, 'wxPalette')
     Director.Spec(pkg, 'wxRegion')
+    Director.Spec(pkg, 'wxRegionIterator')
     Director.Spec(pkg, 'wxIconLocation')
     Director.Spec(pkg, 'wxBitmap')
     Director.Spec(pkg, 'wxIcon')
@@ -84,7 +85,8 @@ module WXRuby3
     Director.Spec(pkg, 'wxCollapsiblePaneEvent', requirements: %w[wxUSE_COLLPANE])
     Director.Spec(pkg, 'wxStaticLine', director: Director::Window)
     Director.Spec(pkg, 'wxGauge', director: Director::Window)
-    Director.Spec(pkg, 'wxSlider', director: Director::Window)
+    Director.Spec(pkg, 'wxSlider')
+    Director.Spec(pkg, 'wxScrollBar')
     Director.Spec(pkg, 'wxStaticText', director: Director::Window)
     Director.Spec(pkg, 'wxSpinButton', director: Director::Window, requirements: %w[wxUSE_SPINBTN])
     Director.Spec(pkg, 'wxSpinEvent', director: Director::Event, requirements: Director.AnyOf(*%w[wxUSE_SPINBTN wxUSE_SPINCTRL]))
@@ -220,6 +222,8 @@ module WXRuby3
     Director.Spec(pkg, 'wxRichTextHeaderFooterData', requirements: %w[wxUSE_PRINTING_ARCHITECTURE])
     Director.Spec(pkg, 'wxRichTextPrinting', requirements: %w[wxUSE_PRINTING_ARCHITECTURE])
     Director.Spec(pkg, 'wxSymbolPickerDialog', director: Director::Dialog)
+    # need to look into special needs
+    # Director.Spec(pkg, 'wxRichTextBufferDataObject')
   }
 
   Director.Package('Wx::STC', 'wxUSE_STC') { |pkg|
@@ -270,6 +274,7 @@ module WXRuby3
     Director.Spec(pkg, 'wxHtmlEasyPrinting', requirements: %w[wxUSE_PRINTING_ARCHITECTURE])
     Director.Spec(pkg, 'wxHtmlPrintout', requirements: %w[wxUSE_PRINTING_ARCHITECTURE])
     Director.Spec(pkg, 'wxHtmlListBox')
+    Director.Spec(pkg, 'wxHTMLDataObject') if Config.instance.wx_version >= '3.3'
   }
 
   Director.Package('Wx::AUI', 'wxUSE_AUI') { |pkg|

data/rakelib/lib/typemap/common.rb

@@ -588,7 +588,7 @@ module WXRuby3
         end
 
         # special case bc SWIG causes trouble in Window.cpp
-        map 'const wxRegion&', 'const wxRegion*' do
+        map 'const wxRegion&', 'const wxRegion*', as: 'Wx::Region' do
           map_out code: '$result = wxRuby_WrapWxObjectInRuby(new wxRegion(*static_cast<const wxRegion*> ($1)));'
         end
 

data/rakelib/lib/util/string.rb

@@ -62,10 +62,13 @@ module WXRuby3
         rbnm
       end
 
-      def rb_constant_name(name)
-        rbnm = underscore(name)
+      def rb_constant_name(name, do_transform = true)
+        rbnm = do_transform ? underscore(name) : name.dup
         rbnm.sub!(/\Awx_/, '')
-        rbnm.upcase!
+        unless do_transform
+          rbnm.sub!(/\Awx([A-Z])/, '\1')
+        end
+        rbnm.upcase! if do_transform
         rbnm
       end
 
@@ -85,10 +88,17 @@ module WXRuby3
 
       def rb_constant_value(name)
         val = name.sub(/\Awx/, 'Wx::')
-        val == 'NULL' ? 'nil' : val
+        case val
+        when /NULL|nullptr/
+          'nil'
+        when /EmptyString/
+          %q['']
+        else
+          val
+        end
       end
 
-      def rb_constant_expression(exp)
+      def rb_constant_expression(exp, const_xref)
         exp.gsub(/(\w+(::\w+)*)(\s*\()?/) do |s|
           idstr = $1
           is_call = !!$3
@@ -119,15 +129,26 @@ module WXRuby3
           else
             if is_scoped
               # nested identifier
+              if const_xref.has_key?(rb_constant_name(idstr))
+                "#{scoped_name}::#{rb_constant_name(idstr)}"
+              elsif const_xref.has_key?(rb_constant_name(idstr, false))
+                "#{scoped_name}::#{rb_constant_name(idstr, false)}"
+              end
               "#{scoped_name}::#{idstr}"
             else
               # constant
               if /[\-\+\.\d]+/ =~ idstr
                 idstr # numeric constant
-              elsif /\A(true|false|NULL)/ =~ idstr
-                $1 == 'NULL' ? 'nil' : $1
+              elsif /\A(true|false|NULL|nullptr)/ =~ idstr
+                ($1 == 'NULL' || $1 == 'nullptr') ? 'nil' : $1
               else
-                "Wx::#{rb_constant_name(idstr)}"
+                if const_xref.has_key?(rb_constant_name(idstr))
+                  "#{const_xref[rb_constant_name(idstr)]['mod']}::#{rb_constant_name(idstr)}"
+                elsif const_xref.has_key?(rb_constant_name(idstr, false))
+                  "#{const_xref[rb_constant_name(idstr, false)]['mod']}::#{rb_constant_name(idstr, false)}"
+                else
+                  rb_constant_value(idstr)
+                end
               end
             end
           end

data/samples/drawing/graphics_drawing.rb

@@ -155,8 +155,7 @@ class GraphicsWindow < Wx::Window
   def on_paint
     # We do our drawing now
     rect = self.get_client_size
-    paint do |dc|
-      gdc = Wx::GraphicsContext.create(dc)
+    Wx::GraphicsContext.draw_on(self) do |gdc|
       unless @rtxt
         create_resources(gdc)
       end

data/samples/propgrid/propgrid.rb

@@ -286,75 +286,75 @@ class MyColourProperty < Wx::PG::ColourProperty
 end
 
 module ID
-  %i[
-    PGID
-    ABOUT
-    QUIT
-    APPENDPROP
-    APPENDCAT
-    INSERTPROP
-    INSERTCAT
-    ENABLE
-    SETREADONLY
-    HIDE
-    BOOL_CHECKBOX
-    DELETE
-    DELETER
-    DELETEALL
-    UNSPECIFY
-    ITERATE1
-    ITERATE2
-    ITERATE3
-    ITERATE4
-    CLEARMODIF
-    FREEZE
-    DUMPLIST
-    COLOURSCHEME1
-    COLOURSCHEME2
-    COLOURSCHEME3
-    CATCOLOURS
-    SETBGCOLOUR
-    SETBGCOLOURRECUR
-    STATICLAYOUT
-    POPULATE1
-    POPULATE2
-    COLLAPSE
-    COLLAPSEALL
-    GETVALUES
-    SETVALUES
-    SETVALUES2
-    RUNTESTFULL
-    RUNTESTPARTIAL
-    FITCOLUMNS
-    CHANGEFLAGSITEMS
-    TESTINSERTCHOICE
-    TESTDELETECHOICE
-    INSERTPAGE
-    REMOVEPAGE
-    SETSPINCTRLEDITOR
-    SETPROPERTYVALUE
-    TESTREPLACE
-    SETCOLUMNS
-    SETVIRTWIDTH
-    SETPGDISABLED
-    TESTXRC
-    ENABLECOMMONVALUES
-    SELECTSTYLE
-    SAVESTATE
-    RESTORESTATE
-    RUNMINIMAL
-    ENABLELABELEDITING
-    VETOCOLDRAG
-    ONEXTENDEDKEYNAV
-    SHOWPOPUP
-    POPUPGRID
-  ].each_with_index { |sym, ix| self.const_set(sym, ix+1) }
+  include Wx::IDHelper
+
+  PGID = self.next_id
+  ABOUT = self.next_id
+  QUIT = self.next_id
+  APPENDPROP = self.next_id
+  APPENDCAT = self.next_id
+  INSERTPROP = self.next_id
+  INSERTCAT = self.next_id
+  ENABLE = self.next_id
+  SETREADONLY = self.next_id
+  HIDE = self.next_id
+  BOOL_CHECKBOX = self.next_id
+  DELETE = self.next_id
+  DELETER = self.next_id
+  DELETEALL = self.next_id
+  UNSPECIFY = self.next_id
+  ITERATE1 = self.next_id
+  ITERATE2 = self.next_id
+  ITERATE3 = self.next_id
+  ITERATE4 = self.next_id
+  CLEARMODIF = self.next_id
+  FREEZE = self.next_id
+  DUMPLIST = self.next_id
+  COLOURSCHEME1 = self.next_id
+  COLOURSCHEME2 = self.next_id
+  COLOURSCHEME3 = self.next_id
+  CATCOLOURS = self.next_id
+  SETBGCOLOUR = self.next_id
+  SETBGCOLOURRECUR = self.next_id
+  STATICLAYOUT = self.next_id
+  POPULATE1 = self.next_id
+  POPULATE2 = self.next_id
+  COLLAPSE = self.next_id
+  COLLAPSEALL = self.next_id
+  GETVALUES = self.next_id
+  SETVALUES = self.next_id
+  SETVALUES2 = self.next_id
+  RUNTESTFULL = self.next_id
+  RUNTESTPARTIAL = self.next_id
+  FITCOLUMNS = self.next_id
+  CHANGEFLAGSITEMS = self.next_id
+  TESTINSERTCHOICE = self.next_id
+  TESTDELETECHOICE = self.next_id
+  INSERTPAGE = self.next_id
+  REMOVEPAGE = self.next_id
+  SETSPINCTRLEDITOR = self.next_id
+  SETPROPERTYVALUE = self.next_id
+  TESTREPLACE = self.next_id
+  SETCOLUMNS = self.next_id
+  SETVIRTWIDTH = self.next_id
+  SETPGDISABLED = self.next_id
+  TESTXRC = self.next_id
+  ENABLECOMMONVALUES = self.next_id
+  SELECTSTYLE = self.next_id
+  SAVESTATE = self.next_id
+  RESTORESTATE = self.next_id
+  RUNMINIMAL = self.next_id
+  ENABLELABELEDITING = self.next_id
+  VETOCOLDRAG = self.next_id
+  ONEXTENDEDKEYNAV = self.next_id
+  SHOWPOPUP = self.next_id
+  POPUPGRID = self.next_id
 
   if Wx.has_feature?(:USE_HEADERCTRL)
-    SHOWHEADER = POPUPGRID+1
+    SHOWHEADER = self.next_id
   end
 
-  COLOURSCHEME4 = 100
+  COLOURSCHEME4 = self.next_id
 end
 
 #