Merge pull request #322 from mcorino/develop

Develop

lib/wx/core/brush.rb

@@ -6,8 +6,16 @@
 # Copyright 2004-2007, wxRuby development team
 # released under the MIT-like wxRuby2 license
 
+require_relative './enum'
+
 module Wx
 
   TheBrushList = Wx::Brush
 
+  class BrushStyle < Wx::Enum
+
+    set_non_distinct(%i[BRUSHSTYLE_INVALID BRUSHSTYLE_FIRST_HATCH BRUSHSTYLE_LAST_HATCH])
+
+  end
+
 end

lib/wx/core/defs.rb

@@ -0,0 +1,49 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+#
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
+
+require_relative './enum'
+
+module Wx
+
+  class Orientation < Wx::Enum
+
+    set_non_distinct(%i[ORIENTATION_MASK])
+
+  end
+
+  class Direction < Wx::Enum
+
+    set_non_distinct(%i[TOP BOTTOM NORTH SOUTH WEST EAST ALL DIRECTION_MASK])
+
+  end
+
+  class Alignment < Wx::Enum
+
+    set_non_distinct(%i[ALIGN_INVALID ALIGN_CENTRE_HORIZONTAL ALIGN_LEFT ALIGN_TOP ALIGN_CENTRE_VERTICAL ALIGN_CENTER ALIGN_MASK])
+
+  end
+
+  class SizerFlagBits < Wx::Enum
+
+    set_non_distinct(%i[SIZER_FLAG_BITS_MASK])
+
+  end
+
+  class Stretch < Wx::Enum
+
+    set_non_distinct(%i[GROW STRETCH_MASK])
+
+  end
+
+  class Border < Wx::Enum
+
+    set_non_distinct(%i[BORDER_THEME BORDER_MASK])
+
+  end
+
+end

lib/wx/core/font.rb

@@ -1,5 +1,13 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+#
+# Some parts are
+# Copyright 2004-2007, wxRuby development team
+# released under the MIT-like wxRuby2 license
 
 require_relative './font/encoding'
+require_relative './enum'
 
 module Wx
 
@@ -27,4 +35,10 @@ def set_default_encoding_name(enc)
   # can be accessed through that name too.
   TheFontList = Font
 
+  class FontFlag < Wx::Enum
+
+    set_non_distinct(%i[FONTFLAG_MASK])
+
+  end
+
 end

lib/wx/core/pen.rb

@@ -6,8 +6,28 @@
 # Copyright 2004-2007, wxRuby development team
 # released under the MIT-like wxRuby2 license
 
+require_relative './enum'
+
 module Wx
 
   ThePenList = Wx::Pen
 
+  class PenStyle < Wx::Enum
+
+    set_non_distinct(%i[PENSTYLE_INVALID PENSTYLE_FIRST_HATCH PENSTYLE_LAST_HATCH])
+
+  end
+
+  class PenJoin < Wx::Enum
+
+    set_non_distinct(%i[JOIN_INVALID])
+
+  end
+
+  class PenCap < Wx::Enum
+
+    set_non_distinct(%i[CAP_INVALID])
+
+  end
+
 end

lib/wx/doc/enum.rb

@@ -23,7 +23,7 @@ class << self
       # Sets a class specific list of enumerator ids (symbols) that should be considered
       # non-distinctive enum values (examples would be convenience constants combining
       # multiple distinctive enumerators or enumerators denoting the first/lowest and/or last/highest
-      # distinctive enumerators).
+      # distinctive enumerators). Mostly useful for bitmask enum classes.
       # @param [Array<Symbol>] lst
       def set_non_distinct(lst) end
       alias :non_distinct= :set_non_distinct