diff options
Diffstat (limited to 'ext')
-rw-r--r-- | ext/extmk.rb | 2 | ||||
-rw-r--r-- | ext/tk/sample/tkextlib/treectrl/demo.rb | 8 | ||||
-rw-r--r-- | ext/tk/stubs.c | 33 |
3 files changed, 2 insertions, 41 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index a461b1d25f..ac497bbf20 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -39,7 +39,7 @@ load File.expand_path("lib/mkmf.rb", srcdir) require 'optparse/shellwords' def sysquote(x) - @quote ||= /os2|macos/ =~ (CROSS_COMPILING || RUBY_PLATFORM) + @quote ||= /os2/ =~ (CROSS_COMPILING || RUBY_PLATFORM) @quote ? x.quote : x end diff --git a/ext/tk/sample/tkextlib/treectrl/demo.rb b/ext/tk/sample/tkextlib/treectrl/demo.rb index eed95d0e1c..a1b4661197 100644 --- a/ext/tk/sample/tkextlib/treectrl/demo.rb +++ b/ext/tk/sample/tkextlib/treectrl/demo.rb @@ -156,8 +156,6 @@ class TkTreeCtrl_demo @src_top = TkToplevel.new f = TkFrame.new(@src_top, :borderwidth=>0) case @thisPlatform - when 'macintosh', 'macos' - font = TkFont.new(['Geneva', 9]) when 'unix' font = TkFont.new(['Courier', -12]) else @@ -198,10 +196,6 @@ class TkTreeCtrl_demo def tree_plus_scrollbars_in_a_frame(parent, h, v) f = TkFrame.new(parent, :borderwidth=>1, :relief=>:sunken) case @thisPlatform - when 'macintosh' - font = TkFont.new(['Geneva', 9]) - when 'macos' - font = TkFont.new(['Lucida Grande', 11]) when 'unix' font = TkFont.new(['Helvetica', -12]) else @@ -244,7 +238,7 @@ class TkTreeCtrl_demo Tk.root.title('Tk::TreeCtrl Demo') case @thisPlatform - when 'macintosh', 'macosx' + when 'macosx' Tk.root.geometry('+40+40') else Tk.root.geometry('+0+30') diff --git a/ext/tk/stubs.c b/ext/tk/stubs.c index 4388fb294d..e7ef79dda8 100644 --- a/ext/tk/stubs.c +++ b/ext/tk/stubs.c @@ -11,25 +11,6 @@ /*------------------------------*/ -#ifdef __MACOS__ -# include <tkMac.h> -# include <Quickdraw.h> - -static int call_macinit = 0; - -static void -_macinit() -{ - if (!call_macinit) { - tcl_macQdPtr = &qd; /* setup QuickDraw globals */ - Tcl_MacSetEventProc(TkMacConvertEvent); /* setup event handler */ - call_macinit = 1; - } -} -#endif - -/*------------------------------*/ - static int nativethread_checked = 0; static void @@ -320,10 +301,6 @@ ruby_tk_stubs_init(tcl_ip) if (!Tk_InitStubs(tcl_ip, (char *)"8.1", 0)) return FAIL_Tk_InitStubs; - -#ifdef __MACOS__ - _macinit(); -#endif } return TCLTK_STUBS_OK; @@ -359,10 +336,6 @@ ruby_tk_stubs_safeinit(tcl_ip) if (!Tk_InitStubs(tcl_ip, (char *)"8.1", 0)) return FAIL_Tk_InitStubs; - -#ifdef __MACOS__ - _macinit(); -#endif } return TCLTK_STUBS_OK; @@ -517,9 +490,6 @@ ruby_tk_stubs_init(tcl_ip) return FAIL_Tk_Init; if (!call_tk_stubs_init) { -#ifdef __MACOS__ - _macinit(); -#endif call_tk_stubs_init = 1; } @@ -539,9 +509,6 @@ ruby_tk_stubs_safeinit(tcl_ip) return FAIL_Tk_Init; if (!call_tk_stubs_init) { -#ifdef __MACOS__ - _macinit(); -#endif call_tk_stubs_init = 1; } |