wxruby3 0.9.0.pre.beta.14 → 0.9.0.pre.rc.2

data/lib/wx/keyword_defs.rb

@@ -3,7 +3,7 @@
 # Adapted from wxRuby2.
 
 # Window : base class for all widgets and frames
-Wx::define_keyword_ctors('Window') do
+Wx::define_keyword_ctors(Wx::Window) do
    wx_ctor_params :id, :pos, :size, :style
    wx_ctor_params :name => 'window'
 end
@@ -13,26 +13,26 @@ end
 # wxTopLevelWindow 	ABSTRACT: Any top level window, dialog or frame
 
 # Normal frame
-Wx::define_keyword_ctors('Frame') do
+Wx::define_keyword_ctors(Wx::Frame) do
   wx_ctor_params :id, :title, :pos, :size, :style => Wx::DEFAULT_FRAME_STYLE
   wx_ctor_params :name => 'frame'
 end
 
 # MDI child frame
-Wx::define_keyword_ctors('MDIChildFrame') do
+Wx::define_keyword_ctors(Wx::MDIChildFrame) do
   wx_ctor_params :id, :title, :pos, :size, :style => Wx::DEFAULT_FRAME_STYLE
   wx_ctor_params :name => 'frame'
 end
 
 # MDI parent frame
-Wx::define_keyword_ctors('MDIParentFrame') do
+Wx::define_keyword_ctors(Wx::MDIParentFrame) do
   wx_ctor_params :id, :title, :pos, :size
   wx_ctor_params :style => Wx::DEFAULT_FRAME_STYLE|Wx::VSCROLL|Wx::HSCROLL
   wx_ctor_params :name => 'frame'
 end
 
 # wxMiniFrame 	A frame with a small title bar
-Wx::define_keyword_ctors('MiniFrame') do
+Wx::define_keyword_ctors(Wx::MiniFrame) do
   wx_ctor_params :id, :title, :pos, :size
   wx_ctor_params :style =>  Wx::DEFAULT_FRAME_STYLE
   wx_ctor_params :name => 'frame'
@@ -42,7 +42,7 @@ end
 # wxTipWindow 	Shows text in a small window
 
 # wxWizard 	A wizard dialog
-Wx::define_keyword_ctors('Wizard') do
+Wx::define_keyword_ctors(Wx::Wizard) do
   wx_ctor_params :id
   wx_ctor_params :title
   wx_ctor_params :bitmap
@@ -63,37 +63,37 @@ Wx::define_keyword_ctors('GLCanvas') do
 end
 
 # A window whose colour changes according to current user settings
-Wx::define_keyword_ctors('Panel') do
+Wx::define_keyword_ctors(Wx::Panel) do
   wx_ctor_params :id, :pos, :size, :style => Wx::TAB_TRAVERSAL
   wx_ctor_params :name => 'panel'
 end
 
 # wxScrolledWindow 	Window with automatically managed scrollbars
-Wx::define_keyword_ctors('ScrolledWindow') do
+Wx::define_keyword_ctors(Wx::ScrolledWindow) do
   wx_ctor_params :id, :pos, :size, :style => Wx::VSCROLL|Wx::HSCROLL
   wx_ctor_params :name => 'scrolledWindow'
 end
 
 # Window which can be split vertically or horizontally
-Wx::define_keyword_ctors('SplitterWindow') do
+Wx::define_keyword_ctors(Wx::SplitterWindow) do
   wx_ctor_params :id, :pos, :size, :style => Wx::SP_3D
   wx_ctor_params :name => 'splitterWindow'
 end
 
 # Implements the status bar on a frame
-Wx::define_keyword_ctors('StatusBar') do
+Wx::define_keyword_ctors(Wx::StatusBar) do
   wx_ctor_params :id, :style => Wx::STB_SIZEGRIP
   wx_ctor_params :name => 'statusBar'
 end
 
 # Toolbar class
-Wx::define_keyword_ctors('ToolBar') do
+Wx::define_keyword_ctors(Wx::ToolBar) do
   wx_ctor_params :id, :pos, :size, :style => Wx::TB_HORIZONTAL|Wx::NO_BORDER
   wx_ctor_params :name => 'toolBar' # not as documented in Wx 2.6.3
 end
 
 # ToolBarTool class
-Wx::define_keyword_ctors('ToolBarTool') do
+Wx::define_keyword_ctors(Wx::ToolBarTool) do
   # By default we want Wx to generate an id for us, thus it doesn't
   # respect the wxWidgets default constructor value which is
   # ID_SEPARATOR
@@ -108,32 +108,32 @@ Wx::define_keyword_ctors('ToolBarTool') do
 end
 
 # Similar to notebook but using choice control
-Wx::define_keyword_ctors('Choicebook') do
+Wx::define_keyword_ctors(Wx::Choicebook) do
   wx_ctor_params :id, :pos, :size, :style, :name => 'choiceBook'
 end
 
 # Notebook class
-Wx::define_keyword_ctors('Notebook') do
+Wx::define_keyword_ctors(Wx::Notebook) do
   wx_ctor_params :id, :pos, :size, :style, :name => 'noteBook'
 end
 
 # Similar to notebook but using list control
-Wx::define_keyword_ctors('Listbook') do
+Wx::define_keyword_ctors(Wx::Listbook) do
   wx_ctor_params :id, :pos, :size, :style, :name => 'listBook'
 end
 
 # Similar to notebook but using toolbar
-Wx::define_keyword_ctors('Toolbook') do
+Wx::define_keyword_ctors(Wx::Toolbook) do
   wx_ctor_params :id, :pos, :size, :style, :name => 'toolBook'
 end
 
 # Similar to notebook but using tree control
-Wx::define_keyword_ctors('Treebook') do
+Wx::define_keyword_ctors(Wx::Treebook) do
   wx_ctor_params :id, :pos, :size, :style, :name => 'treeBook'
 end
 
 # wxSashWindow:	Window with four optional sashes that can be dragged
-Wx::define_keyword_ctors('SashWindow') do
+Wx::define_keyword_ctors(Wx::SashWindow) do
   wx_ctor_params :id, :pos, :size
   wx_ctor_params :style =>  Wx::CLIP_CHILDREN|Wx::SW_3D
   wx_ctor_params :name => 'sashWindow'
@@ -141,7 +141,7 @@ end
 
 # wxSashLayoutWindow: Window that can be involved in an IDE-like layout
 # arrangement
-Wx::define_keyword_ctors('SashLayoutWindow') do
+Wx::define_keyword_ctors(Wx::SashLayoutWindow) do
   wx_ctor_params :id, :pos, :size
   wx_ctor_params :style =>  Wx::CLIP_CHILDREN|Wx::SW_3D
   wx_ctor_params :name => 'layoutWindow'
@@ -150,12 +150,12 @@ end
 # wxVScrolledWindow: As wxScrolledWindow but supports lines of variable height
 
 # wxWizardPage: A base class for the page in wizard dialog.
-Wx::define_keyword_ctors('WizardPage') do
+Wx::define_keyword_ctors(Wx::WizardPage) do
   wx_ctor_params :bitmap => Wx::NULL_BITMAP
 end
 
 # wxWizardPageSimple: A page in wizard dialog.
-Wx::define_keyword_ctors('WizardPageSimple') do
+Wx::define_keyword_ctors(Wx::WizardPageSimple) do
   wx_ctor_params :prev => nil
   wx_ctor_params :next => nil
   wx_ctor_params :bitmap
@@ -163,19 +163,19 @@ end
 
 ### DIALOGS
 # wxDialog 	Base class for common dialogs
-Wx::define_keyword_ctors('Dialog') do
+Wx::define_keyword_ctors(Wx::Dialog) do
   wx_ctor_params :id, :title => ''
   wx_ctor_params :pos, :size, :style => Wx::DEFAULT_DIALOG_STYLE
   wx_ctor_params :name => 'dialogBox'
 end
 
 # wxColourDialog 	Colour chooser dialog
-Wx::define_keyword_ctors('ColourDialog') do
+Wx::define_keyword_ctors(Wx::ColourDialog) do
   wx_ctor_params :colour_data => nil
 end
 
 # wxDirDialog 	Directory selector dialog
-Wx::define_keyword_ctors('DirDialog') do
+Wx::define_keyword_ctors(Wx::DirDialog) do
   wx_ctor_params :message => 'Choose a directory'
   wx_ctor_params :default_path => ''
   wx_ctor_params :style => Wx::DD_DEFAULT_STYLE
@@ -183,7 +183,7 @@ Wx::define_keyword_ctors('DirDialog') do
 end
 
 # wxFileDialog 	File selector dialog
-Wx::define_keyword_ctors('FileDialog') do
+Wx::define_keyword_ctors(Wx::FileDialog) do
   wx_ctor_params :message => 'Choose a file'
   wx_ctor_params :default_dir  => ''
   wx_ctor_params :default_file => ''
@@ -193,14 +193,14 @@ Wx::define_keyword_ctors('FileDialog') do
 end
 
 # wxFindReplaceDialog 	Text search/replace dialog
-Wx::define_keyword_ctors('FindReplaceDialog') do
+Wx::define_keyword_ctors(Wx::FindReplaceDialog) do
   wx_ctor_params :find_replace_data => Wx::FindReplaceData.new()
   wx_ctor_params :title => 'findReplaceDialog'
   wx_ctor_params :style
 end
 
 # Dialog to get one or more selections from a list
-Wx::define_keyword_ctors('MultiChoiceDialog') do
+Wx::define_keyword_ctors(Wx::MultiChoiceDialog) do
   wx_ctor_params :message => ''
   wx_ctor_params :caption => ''
   wx_ctor_params :choices => []
@@ -210,7 +210,7 @@ Wx::define_keyword_ctors('MultiChoiceDialog') do
 end
 
 # Dialog to get a single selection from a list and return the string
-Wx::define_keyword_ctors('SingleChoiceDialog') do
+Wx::define_keyword_ctors(Wx::SingleChoiceDialog) do
   wx_ctor_params :message => ''
   wx_ctor_params :caption => ''
   wx_ctor_params :choices => []
@@ -221,7 +221,7 @@ Wx::define_keyword_ctors('SingleChoiceDialog') do
 end
 
 # Dialog to get a single line of text from the user
-Wx::define_keyword_ctors('TextEntryDialog') do
+Wx::define_keyword_ctors(Wx::TextEntryDialog) do
   wx_ctor_params :message => ''
   wx_ctor_params :caption => 'Please enter text'
   wx_ctor_params :default_value => ''
@@ -230,22 +230,19 @@ Wx::define_keyword_ctors('TextEntryDialog') do
 end
 
 # wxPasswordEntryDialog 	Dialog to get a password from the user
-# Wx::define_keyword_ctors('PasswordEntryDialog') do
-#   wx_ctor_params :message => ''
-#   wx_ctor_params :caption => 'Enter password'
-#   wx_ctor_params :default_value => ''
-#   wx_ctor_params :style => Wx::OK|Wx::CANCEL|Wx::CENTRE
-#   wx_ctor_params :pos
-# end
+Wx::define_keyword_ctors(Wx::PasswordEntryDialog) do
+  wx_ctor_params :message => ''
+  wx_ctor_params :caption => 'Enter password'
+  wx_ctor_params :default_value => ''
+  wx_ctor_params :style => Wx::OK|Wx::CANCEL|Wx::CENTRE
+  wx_ctor_params :pos
+end
 
 # wxFontDialog 	Font chooser dialog
 # wxPageSetupDialog 	Standard page setup dialog
-Wx::define_keyword_ctors('PageSetupDialog') do
-  wx_ctor_params :data
-end
 
 # Simple message box dialog
-Wx::define_keyword_ctors('MessageDialog') do
+Wx::define_keyword_ctors(Wx::MessageDialog) do
   wx_ctor_params :message => ''
   wx_ctor_params :caption => 'Message box'
   wx_ctor_params :style => Wx::OK|Wx::CANCEL
@@ -253,7 +250,7 @@ Wx::define_keyword_ctors('MessageDialog') do
 end
 
 # Property editing dialog
-Wx::define_keyword_ctors('PropertySheetDialog') do
+Wx::define_keyword_ctors(Wx::PropertySheetDialog) do
   wx_ctor_params :id, :title
   wx_ctor_params :pos, :size, :style => Wx::DEFAULT_DIALOG_STYLE
   wx_ctor_params :name => 'propertySheetDialog'
@@ -262,14 +259,14 @@ end
 ### CONTROLS
 
 # Push button control, displaying text
-Wx::define_keyword_ctors('Button') do
+Wx::define_keyword_ctors(Wx::Button) do
   wx_ctor_params :id, :label => ''
   wx_ctor_params :pos, :size, :style
   wx_ctor_params :validator, :name => 'button'
 end
 
 # Push button control, displaying a bitmap
-Wx::define_keyword_ctors('BitmapButton') do
+Wx::define_keyword_ctors(Wx::BitmapButton) do
   wx_ctor_params :id
   wx_ctor_params :bitmap
   wx_ctor_params :pos, :size, :style => Wx::BU_AUTODRAW
@@ -277,39 +274,46 @@ Wx::define_keyword_ctors('BitmapButton') do
 end
 
 # A button which stays pressed when clicked by user.
-Wx::define_keyword_ctors('ToggleButton') do
+Wx::define_keyword_ctors(Wx::ToggleButton) do
   wx_ctor_params :id, :label, :pos, :size, :style
   wx_ctor_params :validator, :name => 'checkBox'
 end
 
 # Control showing an entire calendar month
-Wx::define_keyword_ctors('CalendarCtrl') do
+Wx::define_keyword_ctors(Wx::CalendarCtrl) do
   wx_ctor_params :id, :date => Time.now()
   wx_ctor_params :pos, :size, :style => Wx::CAL_SHOW_HOLIDAYS
   wx_ctor_params :name => 'calendar'
 end
 
 # 	Checkbox control
-Wx::define_keyword_ctors('CheckBox') do
+Wx::define_keyword_ctors(Wx::CheckBox) do
   wx_ctor_params :id, :label => ''
   wx_ctor_params :pos, :size, :style
   wx_ctor_params :validator, :name => 'checkBox'
 end
 
+# wxListBox 	A list of strings for single or multiple selection
+Wx::define_keyword_ctors(Wx::ListBox) do
+  wx_ctor_params :id, :pos, :size, :choices => []
+  wx_ctor_params :style
+  wx_ctor_params :validator, :name => 'listBox'
+end
+
 # A listbox with a checkbox to the left of each item
-Wx::define_keyword_ctors('CheckListBox') do
+Wx::define_keyword_ctors(Wx::CheckListBox) do
   wx_ctor_params :id, :pos, :size, :choices, :style
   wx_ctor_params :validator, :name => 'listBox'
 end
 
 # wxChoice 	Choice control (a combobox without the editable area)
-Wx::define_keyword_ctors('Choice') do
+Wx::define_keyword_ctors(Wx::Choice) do
   wx_ctor_params :id, :pos, :size, :choices, :style
   wx_ctor_params :validator, :name => 'choice'
 end
 
 # wxComboBox 	A choice with an editable area
-Wx::define_keyword_ctors('ComboBox') do
+Wx::define_keyword_ctors(Wx::ComboBox) do
   wx_ctor_params :id, :value => ''
   wx_ctor_params :pos, :size, :choices => []
   wx_ctor_params :style
@@ -317,7 +321,7 @@ Wx::define_keyword_ctors('ComboBox') do
 end
 
 # wxBitmapComboBox 	A choice with an editable area
-Wx::define_keyword_ctors('BitmapComboBox') do
+Wx::define_keyword_ctors(Wx::BitmapComboBox) do
   wx_ctor_params :id, :value => ''
   wx_ctor_params :pos, :size, :choices => []
   wx_ctor_params :style
@@ -328,13 +332,13 @@ end
 
 # wxGauge 	A control to represent a varying quantity, such as time
 # remaining
-Wx::define_keyword_ctors('Gauge') do
+Wx::define_keyword_ctors(Wx::Gauge) do
   wx_ctor_params :id, :range, :pos, :size, :style => Wx::GA_HORIZONTAL
   wx_ctor_params :validator, :name => 'gauge'
 end
 
 # wxGenericDirCtrl 	A control for displaying a directory tree
-Wx::define_keyword_ctors('GenericDirCtrl') do
+Wx::define_keyword_ctors(Wx::GenericDirCtrl) do
   # TODO :dir => Wx::DIR_DIALOG_DEFAULT_FOLDER_STR
   wx_ctor_params :id, :dir => ''
   wx_ctor_params :pos, :size,
@@ -345,7 +349,7 @@ Wx::define_keyword_ctors('GenericDirCtrl') do
 end
 
 # wxListCtrl 	A control for displaying lists of strings and/or icons, plus a multicolumn report view
-Wx::define_keyword_ctors('ListCtrl') do
+Wx::define_keyword_ctors(Wx::ListCtrl) do
   wx_ctor_params :id, :pos, :size, :style => Wx::LC_ICON
   wx_ctor_params :validator, :name => 'listCtrl'
 end
@@ -353,13 +357,13 @@ end
 # wxListView 	A simpler interface (facade for wxListCtrl in report mode
 
 # wxTreeCtrl 	Tree (hierarchy) control
-Wx::define_keyword_ctors('TreeCtrl') do
+Wx::define_keyword_ctors(Wx::TreeCtrl) do
   wx_ctor_params :id, :pos, :size, :style => Wx::TR_DEFAULT_STYLE
   wx_ctor_params :validator, :name => 'treeCtrl'
 end
 
 # wxSpinCtrl 	A spin control - i.e. spin button and text control
-Wx::define_keyword_ctors('SpinCtrl') do
+Wx::define_keyword_ctors(Wx::SpinCtrl) do
   wx_ctor_params :id, :value => ''
   wx_ctor_params :pos, :size, :style => Wx::SP_ARROW_KEYS
   wx_ctor_params :min => 0
@@ -369,21 +373,21 @@ Wx::define_keyword_ctors('SpinCtrl') do
 end
 
 # One or more lines of non-editable text
-Wx::define_keyword_ctors('StaticText') do
+Wx::define_keyword_ctors(Wx::StaticText) do
   wx_ctor_params :id, :label, :pos, :size, :style, :name => 'staticText'
 end
 
-Wx::define_keyword_ctors('StaticBox') do
+Wx::define_keyword_ctors(Wx::StaticBox) do
   wx_ctor_params :id, :label, :pos, :size, :style, :name => 'staticBox'
 end
 
-Wx::define_keyword_ctors('StaticLine') do
+Wx::define_keyword_ctors(Wx::StaticLine) do
   wx_ctor_params :id, :pos, :size, :style => Wx::LI_HORIZONTAL
   wx_ctor_params :name => 'staticBox'
 end
 
 # wxStaticBitmap 	A control to display a bitmap
-Wx::define_keyword_ctors('StaticBitmap') do
+Wx::define_keyword_ctors(Wx::StaticBitmap) do
   wx_ctor_params :id
   # autoconvert Bitmaps to BitmapBundles for downward compatibility
   wx_ctor_params :label
@@ -392,7 +396,7 @@ end
 
 
 # wxRadioBox 	A group of radio buttons
-Wx::define_keyword_ctors('RadioBox') do
+Wx::define_keyword_ctors(Wx::RadioBox) do
   wx_ctor_params :id, :label => ''
   wx_ctor_params :pos, :size, :choices => []
   wx_ctor_params :major_dimension => 0
@@ -401,14 +405,14 @@ Wx::define_keyword_ctors('RadioBox') do
 end
 
 # wxRadioButton: A round button used with others in a mutually exclusive way
-Wx::define_keyword_ctors('RadioButton') do
+Wx::define_keyword_ctors(Wx::RadioButton) do
   wx_ctor_params :id, :label => ''
   wx_ctor_params :pos, :size, :style => 0
   wx_ctor_params :validator, :name => 'radioButton'
 end
 
 # wxSlider 	A slider that can be dragged by the user
-Wx::define_keyword_ctors('Slider') do
+Wx::define_keyword_ctors(Wx::Slider) do
   wx_ctor_params :id, :value => 0
   wx_ctor_params :min_value, :max_value
   wx_ctor_params :pos, :size, :style => Wx::SL_HORIZONTAL
@@ -416,13 +420,13 @@ Wx::define_keyword_ctors('Slider') do
 end
 
 # wxSpinButton - Has two small up and down (or left and right) arrow buttons
-Wx::define_keyword_ctors('SpinButton') do
+Wx::define_keyword_ctors(Wx::SpinButton) do
    wx_ctor_params :id, :pos, :size, :style => Wx::SP_HORIZONTAL
    wx_ctor_params :name => 'spinButton'
 end
 
 # wxScrollBar - standalone scrollbar with arrows and thumb
-Wx::define_keyword_ctors('ScrollBar') do
+Wx::define_keyword_ctors(Wx::ScrollBar) do
    wx_ctor_params :id, :pos, :size, :style => Wx::SB_HORIZONTAL
    wx_ctor_params :validator, :name => 'scrollBar'
 end
@@ -431,57 +435,61 @@ end
 # wxVListBox 	A listbox supporting variable height rows
 
 # wxTextCtrl 	Single or multiline text editing control
-Wx::define_keyword_ctors('TextCtrl') do
+Wx::define_keyword_ctors(Wx::TextCtrl) do
   wx_ctor_params :id, :value => ''
   wx_ctor_params :pos, :size, :style
   wx_ctor_params :validator, :name => 'textCtrl'
 end
 
 # wxHyperTextCtrl - display a clickable URL
-Wx::define_keyword_ctors('HyperlinkCtrl') do
+Wx::define_keyword_ctors(Wx::HyperlinkCtrl) do
   wx_ctor_params :id, :label => ''
   wx_ctor_params :url => ''
   wx_ctor_params :pos, :size, :style => 0
   wx_ctor_params :name => 'hyperlink'
 end
 
-Wx::define_keyword_ctors('CollapsiblePane') do
+Wx::define_keyword_ctors(Wx::CollapsiblePane) do
   wx_ctor_params :id, :label => ''
   wx_ctor_params :pos, :size, :style => 0
   wx_ctor_params :validator, :name => 'collapsiblePane'
 end
 
-Wx::define_keyword_ctors('MediaCtrl') do
+Wx::define_keyword_ctors(Wx::MediaCtrl) do
   wx_ctor_params :id, :filename => ''
   wx_ctor_params :pos, :size, :style => 0
   wx_ctor_params :backend => ''
   wx_ctor_params :validator, :name => 'mediaCtrl'
-end
+end if Wx.has_feature?(:USE_MEDIACTRL)
 
-Wx::define_keyword_ctors('SearchCtrl') do
+Wx::define_keyword_ctors(Wx::SearchCtrl) do
   wx_ctor_params :id, :value => ''
   wx_ctor_params :pos, :size, :style => 0
   wx_ctor_params :validator, :name => 'searchCtrl'
 end
 
-
-Wx::define_keyword_ctors('AnimationCtrl') do
+Wx::define_keyword_ctors(Wx::AnimationCtrl) do
   wx_ctor_params :id, :anim
   wx_ctor_params :pos, :size, :style => Wx::AC_DEFAULT_STYLE
   wx_ctor_params :name => 'animationCtrl'
 end
 
-Wx::define_keyword_ctors('VScrolledWindow') do
+Wx::define_keyword_ctors(Wx::VScrolledWindow) do
   wx_ctor_params :id, :pos, :size, :style, :name => 'VScrolledWindowNameStr'
 end
 
-Wx::define_keyword_ctors('VListBox') do
+Wx::define_keyword_ctors(Wx::VListBox) do
   wx_ctor_params :id, :pos, :size, :style, :name => 'VListBoxNameStr'
 end
 
-Wx::define_keyword_ctors('DatePickerCtrl') do
+Wx::define_keyword_ctors(Wx::DatePickerCtrl) do
   wx_ctor_params :id, :dt, :pos, :size, :style, :validator, :name => 'dateCtrl'
 end
 
+Wx::define_keyword_ctors(Wx::ActivityIndicator) do
+  wx_ctor_params :id, :pos, :size, :style => Wx::AC_DEFAULT_STYLE
+  wx_ctor_params :name => 'activityIndicator'
+end
+
 # FIXME - SymbolPickerDialog is hard to because the parent argument is
 # in a strange place.

data/lib/wx/prt/keyword_defs.rb

@@ -3,6 +3,10 @@
 # Copyright (c) M.J.N. Corino, The Netherlands
 
 # wxPrintDialog 	Standard print dialog
-Wx::define_keyword_ctors('PrintDialog') do
+Wx::define_keyword_ctors(Wx::PRT::PrintDialog) do
+  wx_ctor_params :data
+end
+
+Wx::define_keyword_ctors(Wx::PRT::PageSetupDialog) do
   wx_ctor_params :data
 end

data/lib/wx/version.rb

@@ -1,3 +1,3 @@
 module Wx
-  WXRUBY_VERSION    = '0.9.0-beta.14'
+  WXRUBY_VERSION    = '0.9.0-rc.2'
 end

data/lib/wx/wxruby/cmd/test.rb

@@ -16,7 +16,7 @@ module WxRuby
           description
         else
           Dir[File.join(WxRuby::ROOT, 'tests', '*.rb')].each do |test|
-            system(RUBY, test)
+            exit(1) unless system(RUBY, test)
           end
         end
       end

data/rakelib/install.rb

@@ -34,12 +34,14 @@ module WXRuby3
                   grp_id = m[1]
                   lib_id = m[2]
                   ver = m[3].sub('.', '')
-                  lib = "wx#{grp_id.sub(/u\Z/, '')}#{ver}u#{lib_id}"
+                  # as of wxw 3.3 there seems to be an additional digit added to the version part of the dll name
+                  # so add a wildcard ('*') in that spot to match older and newer versions
+                  lib = "wx#{grp_id.sub(/u\Z/, '')}#{ver}*u#{lib_id}"
                   @wxwin_shlibs.include File.join(libdir, "#{lib}*.#{WXRuby3.config.dll_mask}")
                 end
               else
                 # match only wxWidgets libraries
-                if /\Awx_([a-z\d]+)(_[a-z]+)?-(.*)/.match(lib)
+                if /\Awx(_osx)?_([a-z\d]+)(_[a-z]+)?-(.*)/.match(lib)
                   @wxwin_shlibs.include File.join(libdir, "lib#{lib}*.#{WXRuby3.config.dll_mask}")
                 end
               end
@@ -53,6 +55,7 @@ module WXRuby3
       def install_wxwin_shlibs
         if WXRuby3.config.get_config('with-wxwin')
           # prepare required wxWidgets shared libs
+          wxwin_inshlibs = []
           WXRuby3::Install.wxwin_shlibs.each do |shlib|
             if File.symlink?(shlib)
               src_shlib = shlib
@@ -60,18 +63,28 @@ module WXRuby3
               FileUtils.ln_s(File.join('.', File.basename(src_shlib)), File.join('ext', File.basename(shlib)))
             else
               FileUtils.cp(shlib, inshlib = File.join('ext', File.basename(shlib)))
-              unless WXRuby3.config.patch_rpath(inshlib, '$ORIGIN')
+              unless WXRuby3.config.patch_rpath(inshlib, WXRuby3.config.get_rpath_origin)
                 # cleanup and exit
                 FileUtils.rm_f(Dir["ext/*.#{WXRuby3.config.dll_mask}"])
                 exit(1)
               end
+              wxwin_inshlibs << File.expand_path(inshlib)
             end
           end
           # prepare wxRuby shared libs
-          unless Dir["lib/*.#{WXRuby3.config.dll_mask}"].all? { |shlib| WXRuby3.config.patch_rpath(shlib, '$ORIGIN:$ORIGIN/../ext') }
-            # cleanup and exit
-            FileUtils.rm_f(Dir["ext/*.#{WXRuby3.config.dll_mask}"])
-            exit(1)
+          Dir["lib/*.#{WXRuby3.config.dll_mask}"].each do |shlib|
+            unless WXRuby3.config.patch_rpath(shlib, WXRuby3.config.get_rpath_origin, "#{WXRuby3.config.get_rpath_origin}/../ext")
+              # cleanup and exit
+              FileUtils.rm_f(Dir["ext/*.#{WXRuby3.config.dll_mask}"])
+              exit(1)
+            end
+          end
+          (wxwin_inshlibs + Dir["lib/*.#{WXRuby3.config.dll_mask}"]).each do |shlib|
+            unless WXRuby3.config.update_shlib_loadpaths(shlib, WXRuby3::Install.wxwin_shlibs)
+              # cleanup and exit
+              FileUtils.rm_f(Dir["ext/*.#{WXRuby3.config.dll_mask}"])
+              exit(1)
+            end
           end
         end
       end

data/rakelib/lib/config/linux.rb

@@ -38,9 +38,9 @@ module WXRuby3
             true
           end
 
-          def patch_rpath(shlib, rpath)
+          def patch_rpath(shlib, *rpath)
             if check_rpath_patch
-              sh("#{@rpath_patch} '#{rpath}' #{shlib}", verbose: false)
+              sh("#{@rpath_patch} '#{rpath.join(':')}' #{shlib}", verbose: false)
               return true
             end
             false
@@ -57,6 +57,8 @@ module WXRuby3
           @extra_cflags.concat %w[-Wno-unused-function -Wno-conversion-null -Wno-maybe-uninitialized]
           @extra_cflags << ' -Wno-deprecated-declarations' unless @no_deprecated
 
+          @ruby_ldflags << '-s' if @release_build  # strip debug symbols for release build
+
           # create a .so binary
           @extra_ldflags << '-shared'