Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

porting ruby 1.9.2

  • Loading branch information...
commit 2f9f53a895ebfe187b6a437475d97df4f21aaa3f 1 parent b6c68c1
@angal authored
View
4 bin/arcadia
@@ -6,7 +6,7 @@
$pwd = Dir.pwd
Dir.chdir("#{File.dirname(__FILE__)}/..")
if FileTest.exist?('conf/arcadia.init.rb')
- require 'conf/arcadia.init'
+ require "#{Dir.pwd}/conf/arcadia.init"
end
-require "lib/a-core"
+require "#{Dir.pwd}/lib/a-core"
Arcadia.new.run
View
12 ext/ae-editor/ae-editor.rb
@@ -7,9 +7,9 @@
require 'tk'
require 'tktext'
-require 'lib/a-tkcommons'
+require "#{Dir.pwd}/lib/a-tkcommons"
#require 'lib/a-commons'
-require 'lib/a-core'
+require "#{Dir.pwd}/lib/a-core"
class TreeNode
attr_reader :sons
@@ -3912,9 +3912,11 @@ def tab_file_name(_filename="")
def raise_file(_filename=nil, _pos=nil)
if _filename && frame_def_visible?
tab_name=self.tab_file_name(_filename)
- @main_frame.enb.move(tab_name,_pos) if _pos
- @main_frame.enb.raise(tab_name)
- @main_frame.enb.see(tab_name)
+ if @main_frame.enb.index(tab_name) != -1
+ @main_frame.enb.move(tab_name,_pos) if _pos
+ @main_frame.enb.raise(tab_name)
+ @main_frame.enb.see(tab_name)
+ end
end
end
View
2  ext/ae-rad/ae-rad-inspector.rb
@@ -4,7 +4,7 @@
#
require 'tk'
-require 'lib/a-tkcommons'
+require "#{Dir.pwd}/lib/a-tkcommons"
require 'tkextlib/bwidget'
require "observer"
View
4 ext/ae-rad/ae-rad-palette.rb
@@ -3,8 +3,8 @@
# by Antonio Galeone <antonio-galeone@rubyforge.org>
#
-require 'ext/ae-rad/ae-rad-libs'
-require 'ext/ae-rad/lib/tk/al-tk'
+require "#{Dir.pwd}/ext/ae-rad/ae-rad-libs"
+require "#{Dir.pwd}/ext/ae-rad/lib/tk/al-tk"
require 'tk'
require 'tkmenubar'
require 'tkextlib/bwidget'
View
6 ext/ae-rad/ae-rad.rb
@@ -3,9 +3,9 @@
# by Antonio Galeone <antonio-galeone@rubyforge.org>
#
-require 'ext/ae-rad/ae-rad-libs'
-require 'ext/ae-rad/ae-rad-palette'
-require 'ext/ae-rad/ae-rad-inspector'
+require "#{Dir.pwd}/ext/ae-rad/ae-rad-libs"
+require "#{Dir.pwd}/ext/ae-rad/ae-rad-palette"
+require "#{Dir.pwd}/ext/ae-rad/ae-rad-inspector"
class Rad < ArcadiaExt
attr_reader :libs
View
6 ext/ae-rad/lib/tk/al-tk.rb
@@ -4,9 +4,9 @@
#
require 'tk'
-require 'ext/ae-rad/ae-rad-libs'
-require "lib/a-tkcommons"
-require "ext/ae-rad/lib/tk/al-tk.res"
+require "#{Dir.pwd}/ext/ae-rad/ae-rad-libs"
+require "#{Dir.pwd}/lib/a-tkcommons"
+require "#{Dir.pwd}/ext/ae-rad/lib/tk/al-tk.res"
TkAllPhotoImage = TkPhotoImage
View
1  ext/ae-ruby-debug/ae-ruby-debug.conf
@@ -43,4 +43,3 @@ user_toolbar.debug.debugquit.name=debugquit
user_toolbar.debug.debugquit.hint=Quit debug
user_toolbar.debug.debugquit.image_data=!DEBUG_QUIT_GIF
user_toolbar.debug.debugquit.event_class=!StopDebugEvent
-
View
2  lib/a-commons.rb
@@ -849,7 +849,7 @@ def load_theme(_name=nil)
self['conf_theme'] = self.properties_file2hash(_theme_file)
self['conf'].update(self['conf_theme'])
self['conf_without_local'].update(self['conf_theme'])
- _theme_res_file = "conf/theme-#{_name}.res.rb"
+ _theme_res_file = "#{Dir.pwd}/conf/theme-#{_name}.res.rb"
if _theme_res_file && File.exist?(_theme_res_file)
begin
require _theme_res_file
View
8 lib/a-core.rb
@@ -8,10 +8,10 @@
# &require_omissis=tk/label
# &require_omissis=tk/toplevel
-require "conf/arcadia.res"
+require "#{Dir.pwd}/conf/arcadia.res"
require 'tkextlib/bwidget'
-require "lib/a-tkcommons"
-require "lib/a-contracts"
+require "#{Dir.pwd}/lib/a-tkcommons"
+require "#{Dir.pwd}/lib/a-contracts"
require "observer"
class Arcadia < TkApplication
@@ -310,7 +310,7 @@ def ext_load(_extension)
begin
source = self['conf'][_extension+'.require']
if source.strip.length > 0
- require source
+ require "#{Dir.pwd}/#{source}"
end
@exts_loaded << _extension
rescue Exception,LoadError
View
2  lib/a-tkcommons.rb
@@ -3,7 +3,7 @@
# by Antonio Galeone <antonio-galeone@rubyforge.org>
#
-require "lib/a-commons"
+require "#{Dir.pwd}/lib/a-commons"
require "tk/menu"
class BWidgetTreePatched < Tk::BWidget::Tree
Please sign in to comment.
Something went wrong with that request. Please try again.