Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-02 07:26:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed Demo for OS X to use the correct command to launch other applications from the right current directory.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7133 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher
2010-02-21 22:46:13 +00:00
parent 47ed5a1ddd
commit 3b65dcead9
1 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/demo.cxx
+25 -10
View File
@@ -38,7 +38,7 @@ const char *default_menu[] = {
"#\n", "#\n",
"\n", "\n",
"@main:Widget\\nTests:@x\n", "@main:Widget\\nTests:@x\n",
"@x:Fl_Browser:browser\n", "@x:Fl_Browser:browser browser.cxx\n",
"@x:Fl_Input:input\n", "@x:Fl_Input:input\n",
"@x:Fl_Output:output\n", "@x:Fl_Output:output\n",
"@x:Fl_Button:radio\n", "@x:Fl_Button:radio\n",
@@ -377,18 +377,33 @@ void dobut(Fl_Widget *, long arg)
char *cmd = strdup(menus[men].icommand[bn]); char *cmd = strdup(menus[men].icommand[bn]);
char *arg = strchr(cmd, ' '); char *arg = strchr(cmd, ' ');
char command[2048]; char command[2048], path[2048], app_path[2048];
// this neat litle block of cose ensures that the current directory is set
// to the location of the Demo application.
CFBundleRef app = CFBundleGetMainBundle();
CFURLRef url = CFBundleCopyBundleURL(app);
CFStringRef cc_app_path = CFURLCopyFileSystemPath(url, kCFURLPOSIXPathStyle);
CFStringGetCString(cc_app_path, app_path, 2048, kCFStringEncodingUTF8);
if (*app_path) {
char *n = strrchr(app_path, '/');
if (n) {
*n = 0;
chdir(app_path);
}
}
if (arg) { if (arg) {
*arg = 0; *arg = 0;
if (strcmp(cmd, "../fluid/fluid")==0) if (strcmp(cmd, "../fluid/fluid")==0) {
// sprintf(command, "open ../../../Fluid.app --args %s", arg+1); fl_filename_absolute(path, 2048, "../../../../test/");
sprintf(command, "../../../Fluid.app/Contents/MacOS/Fluid ../../../../../../../test/%s", arg+1); sprintf(command, "open Fluid.app --args %s%s", path, arg+1);
else } else {
// sprintf(command, "open ../../../%s.app --args %s", cmd, arg+1); fl_filename_absolute(path, 2048, "../../../../test/");
sprintf(command, "../../../%s.app/Contents/MacOS/%s ../../../../../../../test/%s", cmd, cmd, arg+1); sprintf(command, "open %s.app --args %s%s", cmd, path, arg+1);
}
} else { } else {
// sprintf(command, "open ../../../%s.app", cmd); sprintf(command, "open %s.app", cmd);
sprintf(command, "../../../%s.app/Contents/MacOS/%s", cmd, cmd);
} }
// puts(command); // puts(command);
system(command); system(command);