diff options
| author | runge <runge> | 2006-11-13 15:33:00 +0000 |
|---|---|---|
| committer | runge <runge> | 2006-11-13 15:33:00 +0000 |
| commit | 4a83f87609b9d53b2983806be58ccd02498a5cd3 (patch) | |
| tree | a79c96930a97fb162edd1765adece43425f8db8a /x11vnc/tkx11vnc.h | |
| parent | 5f9693d4a2c511f8f2ea069373807c5f36ac1459 (diff) | |
| download | libtdevnc-4a83f87609b9d53b2983806be58ccd02498a5cd3.tar.gz libtdevnc-4a83f87609b9d53b2983806be58ccd02498a5cd3.zip | |
x11vnc: Native Mac OS X support.
Diffstat (limited to 'x11vnc/tkx11vnc.h')
| -rw-r--r-- | x11vnc/tkx11vnc.h | 37 |
1 files changed, 31 insertions, 6 deletions
diff --git a/x11vnc/tkx11vnc.h b/x11vnc/tkx11vnc.h index 37e54ce..3bf4e03 100644 --- a/x11vnc/tkx11vnc.h +++ b/x11vnc/tkx11vnc.h @@ -3618,11 +3618,14 @@ char gui_code[] = ""; "proc little_qs {m} {\n" " global bfont ffont beginner_mode\n" " global helpremote helptext helplabel\n" -" global tk_version\n" +" global tk_version osname\n" "\n" " if {$tk_version < 8.0} {\n" " return\n" " }\n" +" if {$osname == \"Darwin\"} {\n" +" return\n" +" }\n" "\n" " set n [$m index end]\n" "\n" @@ -3867,6 +3870,7 @@ char gui_code[] = ""; " }\n" "\n" " # Now make the little \"(?)\" help buttons\n" +" global osname\n" " foreach case [array names menu_m] {\n" " if {$case == \"Help\"} {\n" " continue;\n" @@ -5235,7 +5239,12 @@ char gui_code[] = ""; " }\n" " incr ul\n" " }\n" -" menubutton $menub -text \"$case\" -underline $ul \\\n" +" global osname\n" +" set tstr \"$case\"\n" +" if {$osname == \"Darwin\"} {\n" +" #set tstr \" $case \"\n" +" }\n" +" menubutton $menub -text \"$tstr\" -underline $ul \\\n" " -anchor w -menu $menu -background $fbg \\\n" " -font $bfont\n" " pack $menub -side top -fill x\n" @@ -5307,30 +5316,42 @@ char gui_code[] = ""; " bind $ef_entry <KeyPress-Return> {set entry_set 1}\n" " bind $ef_entry <KeyPress-Escape> {set entry_set 0}\n" "\n" +" set ok_s \"OK\"\n" +" set cancel_s \"Cancel\"\n" +" set help_s \"Help\"\n" +" set browse_s \"Browse...\"\n" +" global osname\n" +" if {$osname == \"Darwin\"} {\n" +" set ok_s \" OK \"\n" +" set cancel_s \" Cancel \"\n" +" set help_s \" Help \"\n" +" set browse_s \" Browse... \"\n" +" }\n" +"\n" " # Entry OK button\n" " set bpx \"1m\"\n" " set bpy \"1\"\n" " set hlt \"0\"\n" " set ef_ok \"$ef.ok\"\n" -" button $ef_ok -text OK -pady $bpy -padx $bpx -command {set entry_set 1} \\\n" +" button $ef_ok -text $ok_s -pady $bpy -padx $bpx -command {set entry_set 1} \\\n" " -highlightthickness $hlt \\\n" " -font $bfont\n" "\n" " # Entry Skip button\n" " set ef_skip \"$ef.skip\"\n" -" button $ef_skip -text Cancel -pady $bpy -padx $bpx -command {set entry_set 0} \\\n" +" button $ef_skip -text $cancel_s -pady $bpy -padx $bpx -command {set entry_set 0} \\\n" " -highlightthickness $hlt \\\n" " -font $bfont\n" "\n" " # Entry Help button\n" " set ef_help \"$ef.help\"\n" -" button $ef_help -text Help -pady $bpy -padx $bpx -command \\\n" +" button $ef_help -text $help_s -pady $bpy -padx $bpx -command \\\n" " {menu_help $entry_dialog_item} -font $bfont \\\n" " -highlightthickness $hlt\n" "\n" " # Entry Browse button\n" " set ef_browse \"$ef.browse\"\n" -" button $ef_browse -text \"Browse...\" -pady $bpy -padx $bpx -font $bfont \\\n" +" button $ef_browse -text $browse_s -pady $bpy -padx $bpx -font $bfont \\\n" " -highlightthickness $hlt \\\n" " -command {entry_insert [tk_getOpenFile]} \n" "\n" @@ -6464,6 +6485,10 @@ char gui_code[] = ""; " # IRIX \"fixed\" font is huge and doublespaced... \n" " set ffont $snfont\n" "}\n" +"if {[regexp -nocase {Darwin} $osname]} {\n" +" set ffont {Monaco 10}\n" +" set bfont {system}\n" +"}\n" "\n" "#puts [exec env]\n" "#puts \"x11vnc_xdisplay: $x11vnc_xdisplay\"\n" |