diff fox-1.1.41/src/FXApp.cpp fox-1.1.41i/src/FXApp.cpp
1278c1278
<         remaining=t->due-now;
---
>         remaining=FXuint(t->due-now);
1310c1310
<         remaining=t->due-now;
---
>         remaining=FXuint(t->due-now);
3050c3050
<   const FXchar *d;
---
> //  const FXchar *d;
diff fox-1.1.41/src/FXColorSelector.cpp fox-1.1.41i/src/FXColorSelector.cpp
158c158,181
< 
---
> FXString FXColorSelector::Accept("&Accept");
> FXString FXColorSelector::Cancel("&Cancel");
> FXString FXColorSelector::Pick("\tPick color");
> FXString FXColorSelector::HSVType("\tHue, Saturation, Value");
> FXString FXColorSelector::RGBType("\tRed, Green, Blue");
> FXString FXColorSelector::Red("&Red:");
> FXString FXColorSelector::Green("&Green:");
> FXString FXColorSelector::Blue("&Blue:");
> FXString FXColorSelector::Alpha("&Alpha:");
> FXString FXColorSelector::Hue("Hue:");
> FXString FXColorSelector::Saturation("Saturation:");
> FXString FXColorSelector::Value("Value:");
> FXString FXColorSelector::CMYType("\tCyan, Magenta, Yellow");
> FXString FXColorSelector::Cyan("Cyan:");
> FXString FXColorSelector::Magenta("Magenta:");
> FXString FXColorSelector::Yellow("Yellow:");
> FXString FXColorSelector::ByName("\tBy Name");
> 
> FXGenericIcon FXColorSelector::Eyedropper = {GIF, eyedrop};
> FXGenericIcon FXColorSelector::DialMode = {GIF, dialmode};
> FXGenericIcon FXColorSelector::RGBMode = {GIF, rgbmode};
> FXGenericIcon FXColorSelector::HSVMode = {GIF, hsvmode};
> FXGenericIcon FXColorSelector::CMYMode = {GIF, cmymode};
> FXGenericIcon FXColorSelector::TXTMode = {GIF, listmode};
169,170c192,193
<   accept=new FXButton(buttons,"&Accept",NULL,NULL,0,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT,0,0,0,0,20,20);
<   cancel=new FXButton(buttons,"&Cancel",NULL,NULL,0,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT,0,0,0,0,20,20);
---
>   accept=new FXButton(buttons,Accept,NULL,NULL,0,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT,0,0,0,0,20,20);
>   cancel=new FXButton(buttons,Cancel,NULL,NULL,0,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT,0,0,0,0,20,20);
176,181c199,204
<   eyedropicon=new FXGIFIcon(getApp(),eyedrop);
<   dialmodeicon=new FXGIFIcon(getApp(),dialmode);
<   rgbmodeicon=new FXGIFIcon(getApp(),rgbmode);
<   hsvmodeicon=new FXGIFIcon(getApp(),hsvmode);
<   cmymodeicon=new FXGIFIcon(getApp(),cmymode);
<   txtmodeicon=new FXGIFIcon(getApp(),listmode);
---
>   eyedropicon=FXCreateIcon(getApp(),Eyedropper);
>   dialmodeicon=FXCreateIcon(getApp(),DialMode);
>   rgbmodeicon=FXCreateIcon(getApp(),RGBMode);
>   hsvmodeicon=FXCreateIcon(getApp(),HSVMode);
>   cmymodeicon=FXCreateIcon(getApp(),CMYMode);
>   txtmodeicon=FXCreateIcon(getApp(),TXTMode);
221c244
<   new FXPicker(wellframe,"\tPick color",eyedropicon,this,ID_COLORPICK,JUSTIFY_CENTER_X|JUSTIFY_CENTER_Y|FRAME_RAISED|FRAME_THICK|LAYOUT_CENTER_X|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT,0,0,56,32,0,0,0,0);
---
>   new FXPicker(wellframe,Pick,eyedropicon,this,ID_COLORPICK,JUSTIFY_CENTER_X|JUSTIFY_CENTER_Y|FRAME_RAISED|FRAME_THICK|LAYOUT_CENTER_X|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT,0,0,56,32,0,0,0,0);
230c253
<   new FXTabItem(panels,"\tHue, Saturation, Value",dialmodeicon,TAB_TOP_NORMAL,0,0,0,0, 6,6,0,0);
---
>   new FXTabItem(panels,HSVType,dialmodeicon,TAB_TOP_NORMAL,0,0,0,0, 6,6,0,0);
240c263
<   new FXTabItem(panels,"\tRed, Green, Blue",rgbmodeicon,TAB_TOP_NORMAL,0,0,0,0, 6,6,0,0);
---
>   new FXTabItem(panels,RGBType,rgbmodeicon,TAB_TOP_NORMAL,0,0,0,0, 6,6,0,0);
246c269
<     new FXLabel(rgbblock,"&Red:",NULL,LAYOUT_FILL_ROW|LAYOUT_CENTER_Y|LAYOUT_RIGHT);
---
>     new FXLabel(rgbblock,Red,NULL,LAYOUT_FILL_ROW|LAYOUT_CENTER_Y|LAYOUT_RIGHT);
251c274
<     new FXLabel(rgbblock,"&Green:",NULL,LAYOUT_FILL_ROW|LAYOUT_CENTER_Y|LAYOUT_RIGHT);
---
>     new FXLabel(rgbblock,Green,NULL,LAYOUT_FILL_ROW|LAYOUT_CENTER_Y|LAYOUT_RIGHT);
256c279
<     new FXLabel(rgbblock,"&Blue:",NULL,LAYOUT_FILL_ROW|LAYOUT_CENTER_Y|LAYOUT_RIGHT);
---
>     new FXLabel(rgbblock,Blue,NULL,LAYOUT_FILL_ROW|LAYOUT_CENTER_Y|LAYOUT_RIGHT);
261c284
<     label=new FXLabel(rgbblock,"&Alpha:",NULL,LAYOUT_FILL_ROW|LAYOUT_CENTER_Y|LAYOUT_RIGHT);
---
>     label=new FXLabel(rgbblock,Alpha,NULL,LAYOUT_FILL_ROW|LAYOUT_CENTER_Y|LAYOUT_RIGHT);
275c298
<   new FXTabItem(panels,"\tHue, Saturation, Value",hsvmodeicon,TAB_TOP_NORMAL,0,0,0,0, 6,6,0,0);
---
>   new FXTabItem(panels,HSVType,hsvmodeicon,TAB_TOP_NORMAL,0,0,0,0, 6,6,0,0);
281c304
<     new FXLabel(hsvblock,"Hue:",NULL,LAYOUT_FILL_ROW|LAYOUT_CENTER_Y|LAYOUT_RIGHT);
---
>     new FXLabel(hsvblock,Hue,NULL,LAYOUT_FILL_ROW|LAYOUT_CENTER_Y|LAYOUT_RIGHT);
286c309
<     new FXLabel(hsvblock,"Saturation:",NULL,LAYOUT_FILL_ROW|LAYOUT_CENTER_Y|LAYOUT_RIGHT);
---
>     new FXLabel(hsvblock,Saturation,NULL,LAYOUT_FILL_ROW|LAYOUT_CENTER_Y|LAYOUT_RIGHT);
291c314
<     new FXLabel(hsvblock,"Value:",NULL,LAYOUT_FILL_ROW|LAYOUT_CENTER_Y|LAYOUT_RIGHT);
---
>     new FXLabel(hsvblock,Value,NULL,LAYOUT_FILL_ROW|LAYOUT_CENTER_Y|LAYOUT_RIGHT);
296c319
<     label=new FXLabel(hsvblock,"Alpha:",NULL,LAYOUT_FILL_ROW|LAYOUT_CENTER_Y|LAYOUT_RIGHT);
---
>     label=new FXLabel(hsvblock,Alpha,NULL,LAYOUT_FILL_ROW|LAYOUT_CENTER_Y|LAYOUT_RIGHT);
310c333
<   new FXTabItem(panels,"\tCyan, Magenta, Yellow",cmymodeicon,TAB_TOP_NORMAL,0,0,0,0, 6,6,0,0);
---
>   new FXTabItem(panels,CMYType,cmymodeicon,TAB_TOP_NORMAL,0,0,0,0, 6,6,0,0);
316c339
<     new FXLabel(cmyblock,"Cyan:",NULL,LAYOUT_FILL_ROW|LAYOUT_CENTER_Y|LAYOUT_RIGHT);
---
>     new FXLabel(cmyblock,Cyan,NULL,LAYOUT_FILL_ROW|LAYOUT_CENTER_Y|LAYOUT_RIGHT);
321c344
<     new FXLabel(cmyblock,"Magenta:",NULL,LAYOUT_FILL_ROW|LAYOUT_CENTER_Y|LAYOUT_RIGHT);
---
>     new FXLabel(cmyblock,Magenta,NULL,LAYOUT_FILL_ROW|LAYOUT_CENTER_Y|LAYOUT_RIGHT);
326c349
<     new FXLabel(cmyblock,"Yellow:",NULL,LAYOUT_FILL_ROW|LAYOUT_CENTER_Y|LAYOUT_RIGHT);
---
>     new FXLabel(cmyblock,Yellow,NULL,LAYOUT_FILL_ROW|LAYOUT_CENTER_Y|LAYOUT_RIGHT);
331c354
<     label=new FXLabel(cmyblock,"Alpha:",NULL,LAYOUT_FILL_ROW|LAYOUT_CENTER_Y|LAYOUT_RIGHT);
---
>     label=new FXLabel(cmyblock,Alpha,NULL,LAYOUT_FILL_ROW|LAYOUT_CENTER_Y|LAYOUT_RIGHT);
345c368
<   new FXTabItem(panels,"\tBy Name",txtmodeicon,TAB_TOP_NORMAL,0,0,0,0, 6,6,0,0);
---
>   new FXTabItem(panels,ByName,txtmodeicon,TAB_TOP_NORMAL,0,0,0,0, 6,6,0,0);
diff fox-1.1.41/src/FXColorWell.cpp fox-1.1.41i/src/FXColorWell.cpp
115a116
> FXString FXColorWell::ColorDialog("Color Dialog");
629c630
<   FXColorDialog colordialog(this,"Color Dialog");
---
>   FXColorDialog colordialog(this,ColorDialog);
diff fox-1.1.41/src/FXColorWheel.cpp fox-1.1.41i/src/FXColorWheel.cpp
337c337
<   FXfloat amount=((FXEvent*)ptr)->code/12;
---
>   FXfloat amount=FXfloat(((FXEvent*)ptr)->code/12);
340c340
<     setHue(fmod(hsv[0]+amount+360.0,360.0));
---
>     setHue(FXfloat(fmod(hsv[0]+amount+360.0,360.0)));
diff fox-1.1.41/src/FXDirBox.cpp fox-1.1.41i/src/FXDirBox.cpp
92a93,101
> FXGenericIcon FXDirBox::Folder = {GIF, minifolder};
> FXGenericIcon FXDirBox::CDRom = {GIF, minicdrom};
> FXGenericIcon FXDirBox::HardDisk = {GIF, miniharddisk};
> FXGenericIcon FXDirBox::NetDrive = {GIF, mininetdrive};
> FXGenericIcon FXDirBox::Floppy = {GIF, minifloppy};
> FXGenericIcon FXDirBox::NetHood = {GIF, mininethood};
> FXGenericIcon FXDirBox::ZipDrive = {GIF, minizipdrive};
> 
> 
98,104c107,113
<   foldericon=new FXGIFIcon(getApp(),minifolder);
<   cdromicon=new FXGIFIcon(getApp(),minicdrom);
<   harddiskicon=new FXGIFIcon(getApp(),miniharddisk);
<   netdriveicon=new FXGIFIcon(getApp(),mininetdrive);
<   floppyicon=new FXGIFIcon(getApp(),minifloppy);
<   nethoodicon=new FXGIFIcon(getApp(),mininethood);
<   zipdiskicon=new FXGIFIcon(getApp(),minizipdrive);
---
>   foldericon=FXCreateIcon(getApp(),Folder);
>   cdromicon=FXCreateIcon(getApp(),CDRom);
>   harddiskicon=FXCreateIcon(getApp(),HardDisk);
>   netdriveicon=FXCreateIcon(getApp(),NetDrive);
>   floppyicon=FXCreateIcon(getApp(),Floppy);
>   nethoodicon=FXCreateIcon(getApp(),NetHood);
>   zipdiskicon=FXCreateIcon(getApp(),ZipDrive);
diff fox-1.1.41/src/FXDirList.cpp fox-1.1.41i/src/FXDirList.cpp
121a122,130
> FXGenericIcon FXDirList::Folder = {GIF, minifolder};
> FXGenericIcon FXDirList::CDRom = {GIF, minicdrom};
> FXGenericIcon FXDirList::HardDisk = {GIF, miniharddisk};
> FXGenericIcon FXDirList::NetDrive = {GIF, mininetdrive};
> FXGenericIcon FXDirList::Floppy = {GIF, minifloppy};
> FXGenericIcon FXDirList::ZipDrive = {GIF, minizipdrive};
> FXGenericIcon FXDirList::OpenFolder = {GIF, minifolderopen};
> FXGenericIcon FXDirList::Doc = {GIF, minidoc};
> FXGenericIcon FXDirList::App = {GIF, miniapp};
148,156c157,166
<   open_folder=new FXGIFIcon(getApp(),minifolderopen);
<   closed_folder=new FXGIFIcon(getApp(),minifolder);
<   mini_doc=new FXGIFIcon(getApp(),minidoc);
<   mini_app=new FXGIFIcon(getApp(),miniapp);
<   cdromicon=new FXGIFIcon(getApp(),minicdrom);
<   harddiskicon=new FXGIFIcon(getApp(),miniharddisk);
<   networkicon=new FXGIFIcon(getApp(),mininetdrive);
<   floppyicon=new FXGIFIcon(getApp(),minifloppy);
<   zipdiskicon=new FXGIFIcon(getApp(),minizipdrive);
---
>   open_folder=FXCreateIcon(getApp(),OpenFolder);
>   mini_doc=FXCreateIcon(getApp(),Doc);
>   mini_app=FXCreateIcon(getApp(),App);
>   closed_folder=FXCreateIcon(getApp(),Folder);
>   cdromicon=FXCreateIcon(getApp(),CDRom);
>   networkicon=FXCreateIcon(getApp(),NetDrive);
>   harddiskicon=FXCreateIcon(getApp(),HardDisk);
>   floppyicon=FXCreateIcon(getApp(),Floppy);
>   zipdiskicon=FXCreateIcon(getApp(),ZipDrive);
> 
diff fox-1.1.41/src/FXDirSelector.cpp fox-1.1.41i/src/FXDirSelector.cpp
92a93,96
> FXString FXDirSelector::Accept("&Accept");
> FXString FXDirSelector::Cancel("&Cancel");
> FXString FXDirSelector::DirectoryName("&Directory name:");
> 
102,104c106,108
<   accept=new FXButton(buttons,"&Accept",NULL,NULL,0,LAYOUT_RIGHT|FRAME_RAISED|FRAME_THICK,0,0,0,0,20,20);
<   cancel=new FXButton(buttons,"&Cancel",NULL,NULL,0,LAYOUT_RIGHT|FRAME_RAISED|FRAME_THICK,0,0,0,0,20,20);
<   new FXLabel(this,"&Directory name:",NULL,JUSTIFY_LEFT|LAYOUT_SIDE_TOP|LAYOUT_FILL_X);
---
>   accept=new FXButton(buttons,Accept,NULL,NULL,0,LAYOUT_RIGHT|FRAME_RAISED|FRAME_THICK,0,0,0,0,20,20);
>   cancel=new FXButton(buttons,Cancel,NULL,NULL,0,LAYOUT_RIGHT|FRAME_RAISED|FRAME_THICK,0,0,0,0,20,20);
>   new FXLabel(this,DirectoryName,NULL,JUSTIFY_LEFT|LAYOUT_SIDE_TOP|LAYOUT_FILL_X);
diff fox-1.1.41/src/FXDriveBox.cpp fox-1.1.41i/src/FXDriveBox.cpp
101a102,108
> FXGenericIcon FXDriveBox::Folder = {GIF, minifolder};
> FXGenericIcon FXDriveBox::CDRom = {GIF, minicdrom};
> FXGenericIcon FXDriveBox::HardDisk = {GIF, miniharddisk};
> FXGenericIcon FXDriveBox::NetDrive = {GIF, mininetdrive};
> FXGenericIcon FXDriveBox::Floppy = {GIF, minifloppy};
> FXGenericIcon FXDriveBox::NetHood = {GIF, mininethood};
> FXGenericIcon FXDriveBox::ZipDrive = {GIF, minizipdrive};
108,114c115,121
<   foldericon=new FXGIFIcon(getApp(),minifolder);
<   cdromicon=new FXGIFIcon(getApp(),minicdrom);
<   harddiskicon=new FXGIFIcon(getApp(),miniharddisk);
<   netdriveicon=new FXGIFIcon(getApp(),mininetdrive);
<   floppyicon=new FXGIFIcon(getApp(),minifloppy);
<   nethoodicon=new FXGIFIcon(getApp(),mininethood);
<   zipdiskicon=new FXGIFIcon(getApp(),minizipdrive);
---
>   foldericon=FXCreateIcon(getApp(),Folder);
>   cdromicon=FXCreateIcon(getApp(),CDRom);
>   harddiskicon=FXCreateIcon(getApp(),HardDisk);
>   netdriveicon=FXCreateIcon(getApp(),NetDrive);
>   floppyicon=FXCreateIcon(getApp(),Floppy);
>   nethoodicon=FXCreateIcon(getApp(),NetHood);
>   zipdiskicon=FXCreateIcon(getApp(),ZipDrive);
diff fox-1.1.41/src/FXFile.cpp fox-1.1.41i/src/FXFile.cpp
1284,1286c1284,1286
<   DWORD nCount,nSize,i,j;
<   HANDLE hFindFile,hEnum;
<   FXchar server[200];
---
> //  DWORD nCount,nSize,i,j;
>   HANDLE hFindFile/*,hEnum*/;
> //  FXchar server[200];
diff fox-1.1.41/src/FXFileList.cpp fox-1.1.41i/src/FXFileList.cpp
139a140,160
> FXString FXFileList::Name("Name");
> FXString FXFileList::Type("Type");
> FXString FXFileList::Size("Size");
> FXString FXFileList::ModifiedDate("Modified Date");
> FXString FXFileList::User("User");
> FXString FXFileList::Group("Group");
> FXString FXFileList::Attributes("Attributes");
> #ifndef WIN32
> FXString FXFileList::Link("Link");
> #endif
> FXString FXFileList::FileFolder("File Folder");
> FXString FXFileList::Application("Application");
> FXString FXFileList::ExtensionFile("%s File");
> 
> FXGenericIcon FXFileList::BigFolder = {GIF,bigfolder};
> FXGenericIcon FXFileList::MiniFolder = {GIF,minifolder};
> FXGenericIcon FXFileList::BigDoc = {GIF,bigdoc};
> FXGenericIcon FXFileList::MiniDoc = {GIF,minidoc};
> FXGenericIcon FXFileList::BigApp = {GIF,bigapp};
> FXGenericIcon FXFileList::MiniApp = {GIF,miniapp};
> 
159,165c180,186
<   appendHeader("Name",NULL,200);
<   appendHeader("Type",NULL,100);
<   appendHeader("Size",NULL,60);
<   appendHeader("Modified Date",NULL,150);
<   appendHeader("User",NULL,50);
<   appendHeader("Group",NULL,50);
<   appendHeader("Attributes",NULL,100);
---
>   appendHeader(Name,NULL,200);
>   appendHeader(Type,NULL,100);
>   appendHeader(Size,NULL,60);
>   appendHeader(ModifiedDate,NULL,150);
>   appendHeader(User,NULL,50);
>   appendHeader(Group,NULL,50);
>   appendHeader(Attributes,NULL,100);
167c188
<   appendHeader("Link",NULL,100);
---
>   appendHeader(Link,NULL,100);
169,174c190,195
<   big_folder=new FXGIFIcon(getApp(),bigfolder);
<   mini_folder=new FXGIFIcon(getApp(),minifolder);
<   big_doc=new FXGIFIcon(getApp(),bigdoc);
<   mini_doc=new FXGIFIcon(getApp(),minidoc);
<   big_app=new FXGIFIcon(getApp(),bigapp);
<   mini_app=new FXGIFIcon(getApp(),miniapp);
---
>   big_folder=FXCreateIcon(getApp(),BigFolder);
>   mini_folder=FXCreateIcon(getApp(),MiniFolder);
>   big_doc=FXCreateIcon(getApp(),BigDoc);
>   mini_doc=FXCreateIcon(getApp(),MiniDoc);
>   big_app=FXCreateIcon(getApp(),BigApp);
>   mini_app=FXCreateIcon(getApp(),MiniApp);
1214c1235
<         extension="File Folder";
---
>         extension=FileFolder;
1220c1241
<         extension="Application";
---
>         extension=Application;
1227c1248
<         if(!extension.empty()) extension+=" File";
---
>         if(!extension.empty()) extension = extension.format(ExtensionFile.text(), extension.text()); //extension+=" File";
diff fox-1.1.41/src/FXFileSelector.cpp fox-1.1.41i/src/FXFileSelector.cpp
175c175,265
< static const FXchar allfiles[]="All Files (*)";
---
> FXString FXFileSelector::AllFiles("All Files (*)");
> FXString FXFileSelector::FileName("&File Name:");
> FXString FXFileSelector::OK("&OK");
> FXString FXFileSelector::FileFilter("File F&ilter:");
> FXString FXFileSelector::Directory("Directory:");
> FXString FXFileSelector::Cancel("&Cancel");
> FXString FXFileSelector::ReadOnly("Read Only");
> FXString FXFileSelector::SetBookmark("&Set bookmark\t\tBookmark current directory.");
> FXString FXFileSelector::ClearBookmark("&Clear bookmarks\t\tClear bookmarks.");
> FXString FXFileSelector::GoUp("\tGo up one directory\tMove up to higher directory.");
> FXString FXFileSelector::GoHome("\tGo to home directory\tBack to home directory.");
> FXString FXFileSelector::GoToWork("\tGo to work directory\tBack to working directory.");
> FXString FXFileSelector::Bookmarks("\tBookmarks\tVisit bookmarked directories.");
> FXString FXFileSelector::CreateNewDirectory("\tCreate new directory\tCreate new directory.");
> FXString FXFileSelector::ShowList("\tShow list\tDisplay directory with small icons.");
> FXString FXFileSelector::ShowIcons("\tShow icons\tDisplay directory with big icons.");
> FXString FXFileSelector::ShowDetails("\tShow details\tDisplay detailed directory listing.");
> FXString FXFileSelector::ShowHidden("\tShow hidden files\tShow hidden files and directories.");
> FXString FXFileSelector::HideHidden("\tHide Hidden Files\tHide hidden files and directories.");
> FXString FXFileSelector::DirectoryName("DirectoryName");
> FXString FXFileSelector::NewDirectoryCaption("Create New Directory");
> FXString FXFileSelector::CreateNewDirectoryIn("Create new directory in: %s");
> FXString FXFileSelector::AlreadyExists("Already Exists");
> FXString FXFileSelector::FileAlreadyExists("File or directory %s already exists.\n");
> FXString FXFileSelector::CannotCreate("Cannot Create");
> FXString FXFileSelector::CannotCreateDirectory("Cannot create directory %s.\n");
> FXString FXFileSelector::CopyFileCaption("Copy File");
> FXString FXFileSelector::CopyOf("CopyOf");
> FXString FXFileSelector::CopyFileBetween("Copy file from location:\n\n%s\n\nto location:");
> FXString FXFileSelector::ErrorCopyingFile("Error Copying File");
> FXString FXFileSelector::UnableToCopy("Unable to copy file:\n\n%s  to:  %s\n\nContinue with operation?");
> FXString FXFileSelector::MoveFileCaption("Move File");
> FXString FXFileSelector::MoveFileBetween("Move file from location:\n\n%s\n\nto location:");
> FXString FXFileSelector::ErrorMovingFile("Error Moving File");
> FXString FXFileSelector::UnableToMove("Unable to move file:\n\n%s  to:  %s\n\nContinue with operation?");
> FXString FXFileSelector::LinkFile("Link File");
> FXString FXFileSelector::LinkTo("LinkTo");
> FXString FXFileSelector::LinkFileBetween("Link file from location:\n\n%s\n\nto location:");
> FXString FXFileSelector::ErrorLinkingFile("Error Linking File");
> FXString FXFileSelector::UnableToLink("Unable to link file:\n\n%s  to:  %s\n\nContinue with operation?");
> FXString FXFileSelector::DeleteFileCaption("Deleting files");
> FXString FXFileSelector::DeleteFileAt("Are you sure you want to delete the file:\n\n%s");
> FXString FXFileSelector::ErrorDeletingFile("Error Deleting File");
> FXString FXFileSelector::UnableToDelete("Unable to delete file:\n\n%s\n\nContinue with operation?");
> 
> FXString FXFileSelector::UpOneLevel("Up one level");
> FXString FXFileSelector::HomeDirectory("Home directory");
> FXString FXFileSelector::WorkDirectory("Work directory");
> FXString FXFileSelector::SelectAll("Select all");
> FXString FXFileSelector::SortBy("Sort by");
> FXString FXFileSelector::Name("Name");
> FXString FXFileSelector::Type("Type");
> FXString FXFileSelector::Size("Size");
> FXString FXFileSelector::Time("Time");
> FXString FXFileSelector::User("User");
> FXString FXFileSelector::Group("Group");
> FXString FXFileSelector::Reverse("Reverse");
> FXString FXFileSelector::IgnoreCase("Ignore case");
> FXString FXFileSelector::View("View");
> FXString FXFileSelector::SmallIcons("Small icons");
> FXString FXFileSelector::BigIcons("Big icons");
> FXString FXFileSelector::Details("Details");
> FXString FXFileSelector::Rows("Rows");
> FXString FXFileSelector::Columns("Columns");
> FXString FXFileSelector::HiddenFiles("Hidden files");
> FXString FXFileSelector::BookmarksMenu("Bookmarks");
> FXString FXFileSelector::SetBookmarkMenu("Set bookmark");
> FXString FXFileSelector::ClearBookmarkMenu("Clear bookmarks");
> FXString FXFileSelector::NewDirectory("New directory...");
> FXString FXFileSelector::Copy("Copy...");
> FXString FXFileSelector::Move("Move...");
> FXString FXFileSelector::Link("Link...");
> FXString FXFileSelector::Delete("Delete...");
> 
> 
> FXGenericIcon FXFileSelector::Dirupicon = {GIF, dirupicon};
> FXGenericIcon FXFileSelector::Foldernew = {GIF, foldernew};
> FXGenericIcon FXFileSelector::Bigfolder = {GIF, bigfolder};
> FXGenericIcon FXFileSelector::Showsmallicons = {GIF, showsmallicons};
> FXGenericIcon FXFileSelector::Showbigicons = {GIF, showbigicons};
> FXGenericIcon FXFileSelector::Showdetails = {GIF, showdetails};
> FXGenericIcon FXFileSelector::Gotohome = {GIF, gotohome};
> FXGenericIcon FXFileSelector::Gotowork = {GIF, gotowork};
> FXGenericIcon FXFileSelector::Fileshown = {GIF, fileshown};
> FXGenericIcon FXFileSelector::Filehidden = {GIF, filehidden};
> FXGenericIcon FXFileSelector::Bookset = {GIF, bookset};
> FXGenericIcon FXFileSelector::Bookclr = {GIF, bookclr};
> FXGenericIcon FXFileSelector::Filedelete = {GIF, filedelete};
> FXGenericIcon FXFileSelector::Filemove = {GIF, filemove};
> FXGenericIcon FXFileSelector::Filecopy = {GIF, filecopy};
> FXGenericIcon FXFileSelector::Filelink = {GIF, filelink};
189c279
<   new FXLabel(fields,"&File Name:",NULL,JUSTIFY_LEFT|LAYOUT_CENTER_Y);
---
>   new FXLabel(fields,FileName,NULL,JUSTIFY_LEFT|LAYOUT_CENTER_Y);
191c281
<   new FXButton(fields,"&OK",NULL,this,ID_ACCEPT,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_X,0,0,0,0,20,20);
---
>   new FXButton(fields,OK,NULL,this,ID_ACCEPT,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_X,0,0,0,0,20,20);
193c283
<   new FXLabel(fields,"File F&ilter:",NULL,JUSTIFY_LEFT|LAYOUT_CENTER_Y);
---
>   new FXLabel(fields,FileFilter,NULL,JUSTIFY_LEFT|LAYOUT_CENTER_Y);
196,197c286,287
<   readonly=new FXCheckButton(filterframe,"Read Only",NULL,0,ICON_BEFORE_TEXT|JUSTIFY_LEFT|LAYOUT_CENTER_Y);
<   cancel=new FXButton(fields,"&Cancel",NULL,NULL,0,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_X,0,0,0,0,20,20);
---
>   readonly=new FXCheckButton(filterframe,ReadOnly,NULL,0,ICON_BEFORE_TEXT|JUSTIFY_LEFT|LAYOUT_CENTER_Y);
>   cancel=new FXButton(fields,Cancel,NULL,NULL,0,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_X,0,0,0,0,20,20);
200,215c290,305
<   new FXLabel(buttons,"Directory:",NULL,LAYOUT_CENTER_Y);
<   updiricon=new FXGIFIcon(getApp(),dirupicon);
<   newdiricon=new FXGIFIcon(getApp(),foldernew);
<   listicon=new FXGIFIcon(getApp(),showsmallicons);
<   iconsicon=new FXGIFIcon(getApp(),showbigicons);
<   detailicon=new FXGIFIcon(getApp(),showdetails);
<   homeicon=new FXGIFIcon(getApp(),gotohome);
<   workicon=new FXGIFIcon(getApp(),gotowork);
<   shownicon=new FXGIFIcon(getApp(),fileshown);
<   hiddenicon=new FXGIFIcon(getApp(),filehidden);
<   markicon=new FXGIFIcon(getApp(),bookset);
<   clearicon=new FXGIFIcon(getApp(),bookclr);
<   deleteicon=new FXGIFIcon(getApp(),filedelete);
<   moveicon=new FXGIFIcon(getApp(),filemove);
<   copyicon=new FXGIFIcon(getApp(),filecopy);
<   linkicon=new FXGIFIcon(getApp(),filelink);
---
>   new FXLabel(buttons,Directory,NULL,LAYOUT_CENTER_Y);
>   updiricon=FXCreateIcon(getApp(),Dirupicon);
>   newdiricon=FXCreateIcon(getApp(),Foldernew);
>   listicon=FXCreateIcon(getApp(),Showsmallicons);
>   iconsicon=FXCreateIcon(getApp(),Showbigicons);
>   detailicon=FXCreateIcon(getApp(),Showdetails);
>   homeicon=FXCreateIcon(getApp(),Gotohome);
>   workicon=FXCreateIcon(getApp(),Gotowork);
>   shownicon=FXCreateIcon(getApp(),Fileshown);
>   hiddenicon=FXCreateIcon(getApp(),Filehidden);
>   markicon=FXCreateIcon(getApp(),Bookset);
>   clearicon=FXCreateIcon(getApp(),Bookclr);
>   deleteicon=FXCreateIcon(getApp(),Filedelete);
>   moveicon=FXCreateIcon(getApp(),Filemove);
>   copyicon=FXCreateIcon(getApp(),Filecopy);
>   linkicon=FXCreateIcon(getApp(),Filelink);
219,220c309,310
<   new FXMenuCommand(bookmarks,"&Set bookmark\t\tBookmark current directory.",markicon,this,ID_BOOKMARK);
<   new FXMenuCommand(bookmarks,"&Clear bookmarks\t\tClear bookmarks.",clearicon,&mrufiles,FXRecentFiles::ID_CLEAR);
---
>   new FXMenuCommand(bookmarks,SetBookmark,markicon,this,ID_BOOKMARK);
>   new FXMenuCommand(bookmarks,ClearBookmark,clearicon,&mrufiles,FXRecentFiles::ID_CLEAR);
235,243c325,333
<   new FXButton(buttons,"\tGo up one directory\tMove up to higher directory.",updiricon,this,ID_DIRECTORY_UP,BUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
<   new FXButton(buttons,"\tGo to home directory\tBack to home directory.",homeicon,this,ID_HOME,BUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
<   new FXButton(buttons,"\tGo to work directory\tBack to working directory.",workicon,this,ID_WORK,BUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
<   new FXMenuButton(buttons,"\tBookmarks\tVisit bookmarked directories.",markicon,bookmarks,MENUBUTTON_NOARROWS|MENUBUTTON_ATTACH_LEFT|MENUBUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
<   new FXButton(buttons,"\tCreate new directory\tCreate new directory.",newdiricon,this,ID_NEW,BUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
<   new FXButton(buttons,"\tShow list\tDisplay directory with small icons.",listicon,filebox,FXFileList::ID_SHOW_MINI_ICONS,BUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
<   new FXButton(buttons,"\tShow icons\tDisplay directory with big icons.",iconsicon,filebox,FXFileList::ID_SHOW_BIG_ICONS,BUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
<   new FXButton(buttons,"\tShow details\tDisplay detailed directory listing.",detailicon,filebox,FXFileList::ID_SHOW_DETAILS,BUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
<   new FXToggleButton(buttons,"\tShow hidden files\tShow hidden files and directories.","\tHide Hidden Files\tHide hidden files and directories.",hiddenicon,shownicon,filebox,FXFileList::ID_TOGGLE_HIDDEN,TOGGLEBUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
---
>   new FXButton(buttons,GoUp,updiricon,this,ID_DIRECTORY_UP,BUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
>   new FXButton(buttons,GoHome,homeicon,this,ID_HOME,BUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
>   new FXButton(buttons,GoToWork,workicon,this,ID_WORK,BUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
>   new FXMenuButton(buttons,Bookmarks,markicon,bookmarks,MENUBUTTON_NOARROWS|MENUBUTTON_ATTACH_LEFT|MENUBUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
>   new FXButton(buttons,CreateNewDirectory,newdiricon,this,ID_NEW,BUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
>   new FXButton(buttons,ShowList,listicon,filebox,FXFileList::ID_SHOW_MINI_ICONS,BUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
>   new FXButton(buttons,ShowIcons,iconsicon,filebox,FXFileList::ID_SHOW_BIG_ICONS,BUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
>   new FXButton(buttons,ShowDetails,detailicon,filebox,FXFileList::ID_SHOW_DETAILS,BUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
>   new FXToggleButton(buttons,ShowHidden,HideHidden,hiddenicon,shownicon,filebox,FXFileList::ID_TOGGLE_HIDDEN,TOGGLEBUTTON_TOOLBAR|FRAME_RAISED,0,0,0,0, 3,3,3,3);
259c349
<   setPatternList(allfiles);
---
>   setPatternList(AllFiles);
510d599
< 
514,516c603,607
<   FXString name="DirectoryName";
<   FXGIFIcon newdiricon(getApp(),bigfolder);
<   if(FXInputDialog::getString(name,this,"Create New Directory","Create new directory in: "+dir,&newdiricon)){
---
>   FXString name=DirectoryName;
>   FXIcon * newdiricon = FXCreateIcon(getApp(),Bigfolder);
>   FXString where;
>   where.format(CreateNewDirectoryIn.text(), dir.text());
>   if(FXInputDialog::getString(name,this,NewDirectoryCaption,where,newdiricon)){
519c610
<       FXMessageBox::error(this,MBOX_OK,"Already Exists","File or directory %s already exists.\n",dirname.text());
---
>       FXMessageBox::error(this,MBOX_OK,AlreadyExists.text(),FileAlreadyExists.text(),dirname.text());
522c613
<       FXMessageBox::error(this,MBOX_OK,"Cannot Create","Cannot create directory %s.\n",dirname.text());
---
>       FXMessageBox::error(this,MBOX_OK,CannotCreate.text(),CannotCreateDirectory.text(),dirname.text());
524a616
>   delete newdiricon;
546c638
<       newname=FXFile::absolute(dir,"CopyOf"+name);
---
>       newname=FXFile::absolute(dir,CopyOf+name);
548c640,642
<       FXInputDialog inputdialog(this,"Copy File","Copy file from location:\n\n"+oldname+"\n\nto location:",NULL,INPUTDIALOG_STRING,0,0,0,0);
---
>       FXString location;
>       location.format(CopyFileBetween.text(), oldname.text());
>       FXInputDialog inputdialog(this,CopyFileCaption,location,NULL,INPUTDIALOG_STRING,0,0,0,0);
554c648
<           if(MBOX_CLICKED_NO==FXMessageBox::error(this,MBOX_YES_NO,"Error Copying File","Unable to copy file:\n\n%s  to:  %s\n\nContinue with operation?",oldname.text(),newname.text())){
---
>           if(MBOX_CLICKED_NO==FXMessageBox::error(this,MBOX_YES_NO,ErrorCopyingFile.text(),UnableToCopy.text(),oldname.text(),newname.text())){
576c670,672
<       FXInputDialog inputdialog(this,"Move File","Move file from location:\n\n"+oldname+"\n\nto location:",NULL,INPUTDIALOG_STRING,0,0,0,0);
---
>       FXString location;
>       location.format(MoveFileBetween.text(), oldname.text());
>       FXInputDialog inputdialog(this,MoveFileCaption,location,NULL,INPUTDIALOG_STRING,0,0,0,0);
582c678
<           if(MBOX_CLICKED_NO==FXMessageBox::error(this,MBOX_YES_NO,"Error Moving File","Unable to move file:\n\n%s  to:  %s\n\nContinue with operation?",oldname.text(),newname.text())){
---
>           if(MBOX_CLICKED_NO==FXMessageBox::error(this,MBOX_YES_NO,ErrorMovingFile.text(),UnableToMove.text(),oldname.text(),newname.text())){
602c698
<       newname=FXFile::absolute(dir,"LinkTo"+name);
---
>       newname=FXFile::absolute(dir,LinkTo+name);
604c700,702
<       FXInputDialog inputdialog(this,"Link File","Link file from location:\n\n"+oldname+"\n\nto location:",NULL,INPUTDIALOG_STRING,0,0,0,0);
---
>       FXString location;
>       location.format(LinkFileBetween.text(), oldname.text());
>       FXInputDialog inputdialog(this,LinkFile,location,NULL,INPUTDIALOG_STRING,0,0,0,0);
610c708
<           if(MBOX_CLICKED_NO==FXMessageBox::error(this,MBOX_YES_NO,"Error Linking File","Unable to link file:\n\n%s  to:  %s\n\nContinue with operation?",oldname.text(),newname.text())){
---
>           if(MBOX_CLICKED_NO==FXMessageBox::error(this,MBOX_YES_NO,ErrorLinkingFile.text(),UnableToLink.text(),oldname.text(),newname.text())){
631c729
<       answer=FXMessageBox::warning(this,MBOX_YES_NO_CANCEL,"Deleting files","Are you sure you want to delete the file:\n\n%s",fullname.text());
---
>       answer=FXMessageBox::warning(this,MBOX_YES_NO_CANCEL,DeleteFileCaption.text(),DeleteFileAt.text(),fullname.text());
635c733
<         if(MBOX_CLICKED_NO==FXMessageBox::error(this,MBOX_YES_NO,"Error Deleting File","Unable to delete file:\n\n%s\n\nContinue with operation?",fullname.text())){
---
>         if(MBOX_CLICKED_NO==FXMessageBox::error(this,MBOX_YES_NO,ErrorDeletingFile.text(),UnableToDelete.text(),fullname.text())){
664,667c762,765
<   new FXMenuCommand(&filemenu,"Up one level",updiricon,this,ID_DIRECTORY_UP);
<   new FXMenuCommand(&filemenu,"Home directory",homeicon,this,ID_HOME);
<   new FXMenuCommand(&filemenu,"Work directory",workicon,this,ID_WORK);
<   new FXMenuCommand(&filemenu,"Select all",NULL,filebox,FXFileList::ID_SELECT_ALL);
---
>   new FXMenuCommand(&filemenu,UpOneLevel,updiricon,this,ID_DIRECTORY_UP);
>   new FXMenuCommand(&filemenu,HomeDirectory,homeicon,this,ID_HOME);
>   new FXMenuCommand(&filemenu,WorkDirectory,workicon,this,ID_WORK);
>   new FXMenuCommand(&filemenu,SelectAll,NULL,filebox,FXFileList::ID_SELECT_ALL);
671,677c769,775
<   new FXMenuCascade(&filemenu,"Sort by",NULL,&sortmenu);
<   new FXMenuRadio(&sortmenu,"Name",filebox,FXFileList::ID_SORT_BY_NAME);
<   new FXMenuRadio(&sortmenu,"Type",filebox,FXFileList::ID_SORT_BY_TYPE);
<   new FXMenuRadio(&sortmenu,"Size",filebox,FXFileList::ID_SORT_BY_SIZE);
<   new FXMenuRadio(&sortmenu,"Time",filebox,FXFileList::ID_SORT_BY_TIME);
<   new FXMenuRadio(&sortmenu,"User",filebox,FXFileList::ID_SORT_BY_USER);
<   new FXMenuRadio(&sortmenu,"Group",filebox,FXFileList::ID_SORT_BY_GROUP);
---
>   new FXMenuCascade(&filemenu,SortBy,NULL,&sortmenu);
>   new FXMenuRadio(&sortmenu,Name,filebox,FXFileList::ID_SORT_BY_NAME);
>   new FXMenuRadio(&sortmenu,Type,filebox,FXFileList::ID_SORT_BY_TYPE);
>   new FXMenuRadio(&sortmenu,Size,filebox,FXFileList::ID_SORT_BY_SIZE);
>   new FXMenuRadio(&sortmenu,Time,filebox,FXFileList::ID_SORT_BY_TIME);
>   new FXMenuRadio(&sortmenu,User,filebox,FXFileList::ID_SORT_BY_USER);
>   new FXMenuRadio(&sortmenu,Group,filebox,FXFileList::ID_SORT_BY_GROUP);
679,680c777,778
<   new FXMenuCheck(&sortmenu,"Reverse",filebox,FXFileList::ID_SORT_REVERSE);
<   new FXMenuCheck(&sortmenu,"Ignore case",filebox,FXFileList::ID_SORT_CASE);
---
>   new FXMenuCheck(&sortmenu,Reverse,filebox,FXFileList::ID_SORT_REVERSE);
>   new FXMenuCheck(&sortmenu,IgnoreCase,filebox,FXFileList::ID_SORT_CASE);
683,686c781,784
<   new FXMenuCascade(&filemenu,"View",NULL,&viewmenu);
<   new FXMenuRadio(&viewmenu,"Small icons",filebox,FXFileList::ID_SHOW_MINI_ICONS);
<   new FXMenuRadio(&viewmenu,"Big icons",filebox,FXFileList::ID_SHOW_BIG_ICONS);
<   new FXMenuRadio(&viewmenu,"Details",filebox,FXFileList::ID_SHOW_DETAILS);
---
>   new FXMenuCascade(&filemenu,View,NULL,&viewmenu);
>   new FXMenuRadio(&viewmenu,SmallIcons,filebox,FXFileList::ID_SHOW_MINI_ICONS);
>   new FXMenuRadio(&viewmenu,BigIcons,filebox,FXFileList::ID_SHOW_BIG_ICONS);
>   new FXMenuRadio(&viewmenu,Details,filebox,FXFileList::ID_SHOW_DETAILS);
688,689c786,787
<   new FXMenuRadio(&viewmenu,"Rows",filebox,FXFileList::ID_ARRANGE_BY_ROWS);
<   new FXMenuRadio(&viewmenu,"Columns",filebox,FXFileList::ID_ARRANGE_BY_COLUMNS);
---
>   new FXMenuRadio(&viewmenu,Rows,filebox,FXFileList::ID_ARRANGE_BY_ROWS);
>   new FXMenuRadio(&viewmenu,Columns,filebox,FXFileList::ID_ARRANGE_BY_COLUMNS);
691c789
<   new FXMenuCheck(&viewmenu,"Hidden files",filebox,FXFileList::ID_TOGGLE_HIDDEN);
---
>   new FXMenuCheck(&viewmenu,HiddenFiles,filebox,FXFileList::ID_TOGGLE_HIDDEN);
694,696c792,794
<   new FXMenuCascade(&filemenu,"Bookmarks",NULL,&bookmarks);
<   new FXMenuCommand(&bookmarks,"Set bookmark",markicon,this,ID_BOOKMARK);
<   new FXMenuCommand(&bookmarks,"Clear bookmarks",clearicon,&mrufiles,FXRecentFiles::ID_CLEAR);
---
>   new FXMenuCascade(&filemenu,BookmarksMenu,NULL,&bookmarks);
>   new FXMenuCommand(&bookmarks,SetBookmarkMenu,markicon,this,ID_BOOKMARK);
>   new FXMenuCommand(&bookmarks,ClearBookmarkMenu,clearicon,&mrufiles,FXRecentFiles::ID_CLEAR);
712,716c810,814
<   new FXMenuCommand(&filemenu,"New directory...",newdiricon,this,ID_NEW);
<   new FXMenuCommand(&filemenu,"Copy...",copyicon,this,ID_COPY);
<   new FXMenuCommand(&filemenu,"Move...",moveicon,this,ID_MOVE);
<   new FXMenuCommand(&filemenu,"Link...",linkicon,this,ID_LINK);
<   new FXMenuCommand(&filemenu,"Delete...",deleteicon,this,ID_DELETE);
---
>   new FXMenuCommand(&filemenu,NewDirectory,newdiricon,this,ID_NEW);
>   new FXMenuCommand(&filemenu,Copy,copyicon,this,ID_COPY);
>   new FXMenuCommand(&filemenu,Move,moveicon,this,ID_MOVE);
>   new FXMenuCommand(&filemenu,Link,linkicon,this,ID_LINK);
>   new FXMenuCommand(&filemenu,Delete,deleteicon,this,ID_DELETE);
873c971
<   if(!filefilter->getNumItems()) filefilter->appendItem(allfiles);
---
>   if(!filefilter->getNumItems()) filefilter->appendItem(AllFiles);
diff fox-1.1.41/src/FXFontSelector.cpp fox-1.1.41i/src/FXFontSelector.cpp
101a102,156
> FXString FXFontSelector::Accept("&Accept");
> FXString FXFontSelector::Cancel("&Cancel");
> FXString FXFontSelector::Family("&Family:");
> FXString FXFontSelector::Weight("&Weight:");
> FXString FXFontSelector::Style("&Style:");
> FXString FXFontSelector::Size("Si&ze:");
> FXString FXFontSelector::CharacterSet("Character Set:");
> FXString FXFontSelector::Any("Any");
> FXString FXFontSelector::WestEuropean("West European");
> FXString FXFontSelector::EastEuropean("East European");
> FXString FXFontSelector::SouthEuropean("South European");
> FXString FXFontSelector::NorthEuropean("North European");
> FXString FXFontSelector::Cyrillic("Cyrillic");
> FXString FXFontSelector::Arabic("Arabic");
> FXString FXFontSelector::Greek("Greek");
> FXString FXFontSelector::Hebrew("Hebrew");
> FXString FXFontSelector::Turkish("Turkish");
> FXString FXFontSelector::Nordic("Nordic");
> FXString FXFontSelector::Thai("Thai");
> FXString FXFontSelector::Baltic("Baltic");
> FXString FXFontSelector::Celtic("Celtic");
> FXString FXFontSelector::Russian("Russian");
> FXString FXFontSelector::SetWidth("Set Width:");
> FXString FXFontSelector::UltraCondensed("Ultra condensed");
> FXString FXFontSelector::ExtraCondensed("Extra condensed");
> FXString FXFontSelector::Condensed("Condensed");
> FXString FXFontSelector::SemiCondensed("Semi condensed");
> FXString FXFontSelector::Normal("Normal");
> FXString FXFontSelector::NormalLC("normal");
> FXString FXFontSelector::SemiExpanded("Semi expanded");
> FXString FXFontSelector::Expanded("Expanded");
> FXString FXFontSelector::ExtraExpanded("Extra expanded");
> FXString FXFontSelector::UltraExpanded("Ultra expanded");
> FXString FXFontSelector::Pitch("Pitch:");
> FXString FXFontSelector::Fixed("Fixed");
> FXString FXFontSelector::Variable("Variable");
> FXString FXFontSelector::Scalable("Scalable:");
> #ifndef WIN32
> FXString FXFontSelector::AllFonts("All Fonts:");
> #endif
> FXString FXFontSelector::Preview("Preview:");
> FXString FXFontSelector::Thin("thin");
> FXString FXFontSelector::ExtraLight("extra light");
> FXString FXFontSelector::Light("light");
> FXString FXFontSelector::Medium("medium");
> FXString FXFontSelector::Demibold("demibold");
> FXString FXFontSelector::Bold("bold");
> FXString FXFontSelector::ExtraBold("extra bold");
> FXString FXFontSelector::Black("black");
> FXString FXFontSelector::Regular("regular");
> FXString FXFontSelector::Italic("italic");
> FXString FXFontSelector::Oblique("oblique");
> FXString FXFontSelector::ReverseItalic("reverse italic");
> FXString FXFontSelector::ReverseOblique("reverse oblique");
> 
111,112c166,167
<   accept=new FXButton(buttons,"&Accept",NULL,NULL,0,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT,0,0,0,0,20,20);
<   cancel=new FXButton(buttons,"&Cancel",NULL,NULL,0,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT,0,0,0,0,20,20);
---
>   accept=new FXButton(buttons,Accept,NULL,NULL,0,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT,0,0,0,0,20,20);
>   cancel=new FXButton(buttons,Cancel,NULL,NULL,0,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT,0,0,0,0,20,20);
118c173
<   new FXLabel(controls,"&Family:",NULL,JUSTIFY_LEFT|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN);
---
>   new FXLabel(controls,Family,NULL,JUSTIFY_LEFT|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN);
127c182
<   new FXLabel(controls,"&Weight:",NULL,JUSTIFY_LEFT|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN);
---
>   new FXLabel(controls,Weight,NULL,JUSTIFY_LEFT|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN);
133c188
<   new FXLabel(controls,"&Style:",NULL,JUSTIFY_LEFT|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN);
---
>   new FXLabel(controls,Style,NULL,JUSTIFY_LEFT|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN);
139c194
<   new FXLabel(controls,"Si&ze:",NULL,JUSTIFY_LEFT|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN);
---
>   new FXLabel(controls,Size,NULL,JUSTIFY_LEFT|LAYOUT_FILL_X|LAYOUT_FILL_COLUMN);
147c202
<   new FXLabel(attributes,"Character Set:",NULL,LAYOUT_CENTER_Y|LAYOUT_FILL_COLUMN);
---
>   new FXLabel(attributes,CharacterSet,NULL,LAYOUT_CENTER_Y|LAYOUT_FILL_COLUMN);
149,163c204,218
<   charset->appendItem("Any",(void*)FONTENCODING_DEFAULT);
<   charset->appendItem("West European",(void*)FONTENCODING_WESTEUROPE);
<   charset->appendItem("East European",(void*)FONTENCODING_EASTEUROPE);
<   charset->appendItem("South European",(void*)FONTENCODING_SOUTHEUROPE);
<   charset->appendItem("North European",(void*)FONTENCODING_NORTHEUROPE);
<   charset->appendItem("Cyrillic",(void*)FONTENCODING_CYRILLIC);
<   charset->appendItem("Arabic",(void*)FONTENCODING_ARABIC);
<   charset->appendItem("Greek",(void*)FONTENCODING_GREEK);
<   charset->appendItem("Hebrew",(void*)FONTENCODING_HEBREW);
<   charset->appendItem("Turkish",(void*)FONTENCODING_TURKISH);
<   charset->appendItem("Nordic",(void*)FONTENCODING_NORDIC);
<   charset->appendItem("Thai",(void*)FONTENCODING_THAI);
<   charset->appendItem("Baltic",(void*)FONTENCODING_BALTIC);
<   charset->appendItem("Celtic",(void*)FONTENCODING_CELTIC);
<   charset->appendItem("Russian",(void*)FONTENCODING_KOI8);
---
>   charset->appendItem(Any,(void*)FONTENCODING_DEFAULT);
>   charset->appendItem(WestEuropean,(void*)FONTENCODING_WESTEUROPE);
>   charset->appendItem(EastEuropean,(void*)FONTENCODING_EASTEUROPE);
>   charset->appendItem(SouthEuropean,(void*)FONTENCODING_SOUTHEUROPE);
>   charset->appendItem(NorthEuropean,(void*)FONTENCODING_NORTHEUROPE);
>   charset->appendItem(Cyrillic,(void*)FONTENCODING_CYRILLIC);
>   charset->appendItem(Arabic,(void*)FONTENCODING_ARABIC);
>   charset->appendItem(Greek,(void*)FONTENCODING_GREEK);
>   charset->appendItem(Hebrew,(void*)FONTENCODING_HEBREW);
>   charset->appendItem(Turkish,(void*)FONTENCODING_TURKISH);
>   charset->appendItem(Nordic,(void*)FONTENCODING_NORDIC);
>   charset->appendItem(Thai,(void*)FONTENCODING_THAI);
>   charset->appendItem(Baltic,(void*)FONTENCODING_BALTIC);
>   charset->appendItem(Celtic,(void*)FONTENCODING_CELTIC);
>   charset->appendItem(Russian,(void*)FONTENCODING_KOI8);
167c222
<   new FXLabel(attributes,"Set Width:",NULL,LAYOUT_CENTER_Y|LAYOUT_FILL_COLUMN);
---
>   new FXLabel(attributes,SetWidth,NULL,LAYOUT_CENTER_Y|LAYOUT_FILL_COLUMN);
169,178c224,233
<   setwidth->appendItem("Any",(void*)FONTSETWIDTH_DONTCARE);
<   setwidth->appendItem("Ultra condensed",(void*)FONTSETWIDTH_ULTRACONDENSED);
<   setwidth->appendItem("Extra condensed",(void*)FONTSETWIDTH_EXTRACONDENSED);
<   setwidth->appendItem("Condensed",(void*)FONTSETWIDTH_CONDENSED);
<   setwidth->appendItem("Semi condensed",(void*)FONTSETWIDTH_SEMICONDENSED);
<   setwidth->appendItem("Normal",(void*)FONTSETWIDTH_MEDIUM);
<   setwidth->appendItem("Semi expanded",(void*)FONTSETWIDTH_SEMIEXPANDED);
<   setwidth->appendItem("Expanded",(void*)FONTSETWIDTH_EXPANDED);
<   setwidth->appendItem("Extra expanded",(void*)FONTSETWIDTH_EXTRAEXPANDED);
<   setwidth->appendItem("Ultra expanded",(void*)FONTSETWIDTH_ULTRAEXPANDED);
---
>   setwidth->appendItem(Any,(void*)FONTSETWIDTH_DONTCARE);
>   setwidth->appendItem(UltraCondensed,(void*)FONTSETWIDTH_ULTRACONDENSED);
>   setwidth->appendItem(ExtraCondensed,(void*)FONTSETWIDTH_EXTRACONDENSED);
>   setwidth->appendItem(Condensed,(void*)FONTSETWIDTH_CONDENSED);
>   setwidth->appendItem(SemiCondensed,(void*)FONTSETWIDTH_SEMICONDENSED);
>   setwidth->appendItem(Normal,(void*)FONTSETWIDTH_MEDIUM);
>   setwidth->appendItem(SemiExpanded,(void*)FONTSETWIDTH_SEMIEXPANDED);
>   setwidth->appendItem(Expanded,(void*)FONTSETWIDTH_EXPANDED);
>   setwidth->appendItem(ExtraExpanded,(void*)FONTSETWIDTH_EXTRAEXPANDED);
>   setwidth->appendItem(UltraExpanded,(void*)FONTSETWIDTH_ULTRAEXPANDED);
182c237
<   new FXLabel(attributes,"Pitch:",NULL,LAYOUT_CENTER_Y|LAYOUT_FILL_COLUMN);
---
>   new FXLabel(attributes,Pitch,NULL,LAYOUT_CENTER_Y|LAYOUT_FILL_COLUMN);
184,186c239,241
<   pitch->appendItem("Any",(void*)0);
<   pitch->appendItem("Fixed",(void*)FONTPITCH_FIXED);
<   pitch->appendItem("Variable",(void*)FONTPITCH_VARIABLE);
---
>   pitch->appendItem(Any,(void*)0);
>   pitch->appendItem(Fixed,(void*)FONTPITCH_FIXED);
>   pitch->appendItem(Variable,(void*)FONTPITCH_VARIABLE);
191c246
<   scalable=new FXCheckButton(attributes,"Scalable:",this,ID_SCALABLE,JUSTIFY_NORMAL|TEXT_BEFORE_ICON|LAYOUT_CENTER_Y|LAYOUT_FILL_COLUMN);
---
>   scalable=new FXCheckButton(attributes,Scalable,this,ID_SCALABLE,JUSTIFY_NORMAL|TEXT_BEFORE_ICON|LAYOUT_CENTER_Y|LAYOUT_FILL_COLUMN);
196c251
<   allfonts=new FXCheckButton(attributes,"All Fonts:",this,ID_ALLFONTS,JUSTIFY_NORMAL|TEXT_BEFORE_ICON|LAYOUT_CENTER_Y|LAYOUT_FILL_COLUMN);
---
>   allfonts=new FXCheckButton(attributes,AllFonts,this,ID_ALLFONTS,JUSTIFY_NORMAL|TEXT_BEFORE_ICON|LAYOUT_CENTER_Y|LAYOUT_FILL_COLUMN);
203c258
<   new FXLabel(bottom,"Preview:",NULL,JUSTIFY_LEFT|LAYOUT_FILL_X);
---
>   new FXLabel(bottom,Preview,NULL,JUSTIFY_LEFT|LAYOUT_FILL_X);
271,280c326,335
<           case FONTWEIGHT_THIN: wgt="thin"; break;
<           case FONTWEIGHT_EXTRALIGHT: wgt="extra light"; break;
<           case FONTWEIGHT_LIGHT: wgt="light"; break;
<           case FONTWEIGHT_NORMAL: wgt="normal"; break;
<           case FONTWEIGHT_MEDIUM: wgt="medium"; break;
<           case FONTWEIGHT_DEMIBOLD: wgt="demibold"; break;
<           case FONTWEIGHT_BOLD: wgt="bold"; break;
<           case FONTWEIGHT_EXTRABOLD: wgt="extra bold"; break;
<           case FONTWEIGHT_BLACK: wgt="black"; break;
<           default: wgt="normal"; break;
---
>           case FONTWEIGHT_THIN: wgt=Thin.text(); break;
>           case FONTWEIGHT_EXTRALIGHT: wgt=ExtraLight.text(); break;
>           case FONTWEIGHT_LIGHT: wgt=Light.text(); break;
>           case FONTWEIGHT_NORMAL: wgt=NormalLC.text(); break;
>           case FONTWEIGHT_MEDIUM: wgt=Medium.text(); break;
>           case FONTWEIGHT_DEMIBOLD: wgt=Demibold.text(); break;
>           case FONTWEIGHT_BOLD: wgt=Bold.text(); break;
>           case FONTWEIGHT_EXTRABOLD: wgt=ExtraBold.text(); break;
>           case FONTWEIGHT_BLACK: wgt=Black.text(); break;
>           default: wgt=NormalLC.text(); break;
319,324c374,379
<           case FONTSLANT_REGULAR: slt="regular"; break;
<           case FONTSLANT_ITALIC: slt="italic"; break;
<           case FONTSLANT_OBLIQUE: slt="oblique"; break;
<           case FONTSLANT_REVERSE_ITALIC: slt="reverse italic"; break;
<           case FONTSLANT_REVERSE_OBLIQUE: slt="reverse oblique"; break;
<           default: slt="normal"; break;
---
>           case FONTSLANT_REGULAR: slt=Regular.text(); break;
>           case FONTSLANT_ITALIC: slt=Italic.text(); break;
>           case FONTSLANT_OBLIQUE: slt=Oblique.text(); break;
>           case FONTSLANT_REVERSE_ITALIC: slt=ReverseItalic.text(); break;
>           case FONTSLANT_REVERSE_OBLIQUE: slt=ReverseOblique.text(); break;
>           default: slt=NormalLC.text(); break;
diff fox-1.1.41/src/FXGLViewer.cpp fox-1.1.41i/src/FXGLViewer.cpp
271a272,275
> FXString FXGLViewer::PrintScene("Print Scene");
> FXString FXGLViewer::PrinterError("Printer Error");
> FXString FXGLViewer::UnableToPrint("Unable to print");
> 
2431c2435
<     FXPrintDialog dlg(this,"Print Scene");
---
>     FXPrintDialog dlg(this,PrintScene);
2445c2449
<         FXMessageBox::error(this,MBOX_OK,"Printer Error","Unable to print");
---
>         FXMessageBox::error(this,MBOX_OK,PrinterError.text(),UnableToPrint.text());
2610c2614
<   FXPrintDialog dlg(this,"Print Scene");
---
>   FXPrintDialog dlg(this,PrintScene);
2620c2624
<       FXMessageBox::error(this,MBOX_OK,"Printer Error","Unable to print");
---
>       FXMessageBox::error(this,MBOX_OK,PrinterError.text(),UnableToPrint.text());
diff fox-1.1.41/src/FXIcon.cpp fox-1.1.41i/src/FXIcon.cpp
581a582,645
> 
> //Genericity
> #ifndef CORE_IMAGE_FORMATS
> #ifdef HAVE_JPEG_H
> #include "FXJPGIcon.h"
> #endif
> #ifdef HAVE_PNG_H
> #include "FXPNGIcon.h"
> #endif
> #ifdef HAVE_TIFF_H
> #include "FXTIFIcon.h"
> #endif
> #endif
> 
> #include "FXBMPIcon.h"
> #include "FXGIFIcon.h"
> #include "FXICOIcon.h"
> #include "FXPCXIcon.h"
> #include "FXPPMIcon.h"
> #include "FXRGBIcon.h"
> #include "FXTGAIcon.h"
> #include "FXXBMIcon.h"
> #include "FXXPMIcon.h"
> 
> namespace FX {
> FXIcon * FXCreateIcon(FXApp* a, const FXGenericIcon & icon) {
>     switch(icon.type)
>     {
>     case BMP:
>         return new FXBMPIcon(a, icon.buffer);
>     case GIF:
>         return new FXGIFIcon(a, icon.buffer);
>     case ICO:
>         return new FXICOIcon(a, icon.buffer);
>     case PCX:
>         return new FXPCXIcon(a, icon.buffer);
>     case PPM:
>         return new FXPPMIcon(a, icon.buffer);
>     case RGB:
>         return new FXRGBIcon(a, icon.buffer);
>     case TGA:
>         return new FXTGAIcon(a, icon.buffer);
>     case XBM:
>         return new FXXBMIcon(a, icon.buffer);
>     case XPM:
>         return new FXXPMIcon(a, (const FXchar**) &icon.buffer);
> #ifndef CORE_IMAGE_FORMATS
> #ifdef HAVE_JPEG_H
>     case JPG:
>         return new FXJPGIcon(a, icon.buffer);
> #endif
> #ifdef HAVE_PNG_H
>     case PNG:
>         return new FXPNGIcon(a, icon.buffer);
> #endif
> #ifdef HAVE_TIFF_H
>     case TIF:
>         return new FXTIFIcon(a, icon.buffer);
> #endif
> #endif
>     }
>     return NULL;
>   }
> }
diff fox-1.1.41/src/FXInputDialog.cpp fox-1.1.41i/src/FXInputDialog.cpp
71a72,73
> FXString FXInputDialog::OK("&OK");
> FXString FXInputDialog::Cancel("&Cancel");
79,80c81,82
<   new FXButton(buttons,"&OK",NULL,this,ID_ACCEPT,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_CENTER_Y|LAYOUT_RIGHT,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
<   new FXButton(buttons,"&Cancel",NULL,this,ID_CANCEL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_CENTER_Y|LAYOUT_RIGHT,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
---
>   new FXButton(buttons,OK,NULL,this,ID_ACCEPT,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_CENTER_Y|LAYOUT_RIGHT,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
>   new FXButton(buttons,Cancel,NULL,this,ID_CANCEL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_CENTER_Y|LAYOUT_RIGHT,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
diff fox-1.1.41/src/FXMDIButton.cpp fox-1.1.41i/src/FXMDIButton.cpp
75a76
> FXString FXMDIDeleteButton::Close("\tClose\tClose Window.");
80c81
<   FXButton(p,"\tClose\tClose Window.",NULL,tgt,sel,opts,x,y,w,h,3,3,2,2){
---
>   FXButton(p,Close,NULL,tgt,sel,opts,x,y,w,h,3,3,2,2){
148c149
< 
---
> FXString FXMDIRestoreButton::Restore("\tRestore\tRestore Window.");
152c153
<   FXButton(p,"\tRestore\tRestore Window.",NULL,tgt,sel,opts,x,y,w,h,3,3,2,2){
---
>   FXButton(p,Restore,NULL,tgt,sel,opts,x,y,w,h,3,3,2,2){
215c216
< 
---
> FXString FXMDIMaximizeButton::Maximise("\tMaximize\tMaximize Window.");
219c220
<   FXButton(p,"\tMaximize\tMaximize Window.",NULL,tgt,sel,opts,x,y,w,h,3,3,2,2){
---
>   FXButton(p,Maximise,NULL,tgt,sel,opts,x,y,w,h,3,3,2,2){
272a274
> FXString FXMDIMinimizeButton::Minimise("\tMinimize\tMinimize Window.");
277c279
<   FXButton(p,"\tMinimize\tMinimize Window.",NULL,tgt,sel,opts,x,y,w,h,3,3,2,2){
---
>   FXButton(p,Minimise,NULL,tgt,sel,opts,x,y,w,h,3,3,2,2){
331a334
> FXString FXMDIWindowButton::Menu("Menu");
337c340
<   tip="Menu";
---
>   tip=Menu;
408a412,422
> FXString FXMDIMenu::Next("&Next\t\tNext window.");
> FXString FXMDIMenu::Previous("&Previous\t\tPrevious window.");
> FXString FXMDIMenu::Restore("&Restore\t\tRestore window.");
> FXString FXMDIMenu::Minimise("&Minimize\t\tMinimize window.");
> FXString FXMDIMenu::Maximise("&Maximize\t\tMaximize window.");
> FXString FXMDIMenu::Close("&Close\t\tClose window.");
> 
> FXGenericIcon FXMDIMenu::MaxIcon = {GIF, winmaximize};
> FXGenericIcon FXMDIMenu::MinIcon = {GIF, winminimize};
> FXGenericIcon FXMDIMenu::ResIcon = {GIF, winrestore};
> FXGenericIcon FXMDIMenu::CloIcon = {GIF, winclose};
412,421c426,435
<   closeicon=new FXGIFIcon(getApp(),winclose);
<   maximizeicon=new FXGIFIcon(getApp(),winmaximize);
<   minimizeicon=new FXGIFIcon(getApp(),winminimize);
<   restoreicon=new FXGIFIcon(getApp(),winrestore);
<   new FXMenuCommand(this,"&Next\t\tNext window.",NULL,tgt,FXWindow::ID_MDI_NEXT,0);
<   new FXMenuCommand(this,"&Previous\t\tPrevious window.",NULL,tgt,FXWindow::ID_MDI_PREV,0);
<   new FXMenuCommand(this,"&Restore\t\tRestore window.",restoreicon,tgt,FXWindow::ID_MDI_RESTORE,0);
<   new FXMenuCommand(this,"&Minimize\t\tMinimize window.",minimizeicon,tgt,FXWindow::ID_MDI_MINIMIZE,0);
<   new FXMenuCommand(this,"&Maximize\t\tMaximize window.",maximizeicon,tgt,FXWindow::ID_MDI_MAXIMIZE,0);
<   new FXMenuCommand(this,"&Close\t\tClose window.",closeicon,tgt,FXWindow::ID_MDI_CLOSE,0);
---
>   closeicon=FXCreateIcon(getApp(),CloIcon);
>   maximizeicon=FXCreateIcon(getApp(),MaxIcon);
>   minimizeicon=FXCreateIcon(getApp(),MinIcon);
>   restoreicon=FXCreateIcon(getApp(),ResIcon);
>   new FXMenuCommand(this,Next,NULL,tgt,FXWindow::ID_MDI_NEXT,0);
>   new FXMenuCommand(this,Previous,NULL,tgt,FXWindow::ID_MDI_PREV,0);
>   new FXMenuCommand(this,Restore,restoreicon,tgt,FXWindow::ID_MDI_RESTORE,0);
>   new FXMenuCommand(this,Minimise,minimizeicon,tgt,FXWindow::ID_MDI_MINIMIZE,0);
>   new FXMenuCommand(this,Maximise,maximizeicon,tgt,FXWindow::ID_MDI_MAXIMIZE,0);
>   new FXMenuCommand(this,Close,closeicon,tgt,FXWindow::ID_MDI_CLOSE,0);
diff fox-1.1.41/src/FXMDIClient.cpp fox-1.1.41i/src/FXMDIClient.cpp
133a134,136
> FXString FXMDIClient::SelectWindow("Select Window");
> FXString FXMDIClient::OK("&OK");
> FXString FXMDIClient::Cancel("&Cancel");
327c330
<   FXDialogBox choose(this,"Select Window",DECOR_TITLE|DECOR_BORDER|DECOR_RESIZE,0,0,300,200,10,10,10,10, 10,10);
---
>   FXDialogBox choose(this,SelectWindow,DECOR_TITLE|DECOR_BORDER|DECOR_RESIZE,0,0,300,200,10,10,10,10, 10,10);
329,330c332,333
<   new FXButton(buttons,"&OK",NULL,&choose,FXDialogBox::ID_ACCEPT,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
<   new FXButton(buttons,"&Cancel",NULL,&choose,FXDialogBox::ID_CANCEL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
---
>   new FXButton(buttons,OK,NULL,&choose,FXDialogBox::ID_ACCEPT,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
>   new FXButton(buttons,Cancel,NULL,&choose,FXDialogBox::ID_CANCEL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
diff fox-1.1.41/src/FXMessageBox.cpp fox-1.1.41i/src/FXMessageBox.cpp
74a75,87
> FXString FXMessageBox::OK("&OK");
> FXString FXMessageBox::Cancel("&Cancel");
> FXString FXMessageBox::Yes("&Yes");
> FXString FXMessageBox::No("&No");
> FXString FXMessageBox::Quit("&Quit");
> FXString FXMessageBox::Save("&Save");
> FXString FXMessageBox::Skip("&Skip");
> FXString FXMessageBox::SkipAll("Skip &All");
> 
> FXGenericIcon FXMessageBox::Error = {GIF, erroricon};
> FXGenericIcon FXMessageBox::Info = {GIF, infoicon};
> FXGenericIcon FXMessageBox::Question = {GIF, questionicon};
> FXGenericIcon FXMessageBox::Warning = {GIF, warningicon};
100c113
<     initial=new FXButton(buttons,"&OK",NULL,this,ID_CLICKED_OK,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
---
>     initial=new FXButton(buttons,OK,NULL,this,ID_CLICKED_OK,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
104,105c117,118
<     initial=new FXButton(buttons,"&OK",NULL,this,ID_CLICKED_OK,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
<     new FXButton(buttons,"&Cancel",NULL,this,ID_CLICKED_CANCEL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
---
>     initial=new FXButton(buttons,OK,NULL,this,ID_CLICKED_OK,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
>     new FXButton(buttons,Cancel,NULL,this,ID_CLICKED_CANCEL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
109,110c122,123
<     initial=new FXButton(buttons,"&Yes",NULL,this,ID_CLICKED_YES,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
<     new FXButton(buttons,"&No",NULL,this,ID_CLICKED_NO,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
---
>     initial=new FXButton(buttons,Yes,NULL,this,ID_CLICKED_YES,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
>     new FXButton(buttons,No,NULL,this,ID_CLICKED_NO,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
114,116c127,129
<     initial=new FXButton(buttons,"&Yes",NULL,this,ID_CLICKED_YES,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
<     new FXButton(buttons,"&No",NULL,this,ID_CLICKED_NO,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
<     new FXButton(buttons,"&Cancel",NULL,this,ID_CLICKED_CANCEL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
---
>     initial=new FXButton(buttons,Yes,NULL,this,ID_CLICKED_YES,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
>     new FXButton(buttons,No,NULL,this,ID_CLICKED_NO,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
>     new FXButton(buttons,Cancel,NULL,this,ID_CLICKED_CANCEL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
120,121c133,134
<     initial=new FXButton(buttons,"&Quit",NULL,this,ID_CLICKED_QUIT,BUTTON_INITIAL|BUTTON_DEFAULT|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
<     new FXButton(buttons,"&Cancel",NULL,this,ID_CLICKED_CANCEL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
---
>     initial=new FXButton(buttons,Quit,NULL,this,ID_CLICKED_QUIT,BUTTON_INITIAL|BUTTON_DEFAULT|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
>     new FXButton(buttons,Cancel,NULL,this,ID_CLICKED_CANCEL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
125,127c138,140
<     new FXButton(buttons,"&Quit",NULL,this,ID_CLICKED_QUIT,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
<     initial=new FXButton(buttons,"&Save",NULL,this,ID_CLICKED_SAVE,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
<     new FXButton(buttons,"&Cancel",NULL,this,ID_CLICKED_CANCEL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
---
>     new FXButton(buttons,Quit,NULL,this,ID_CLICKED_QUIT,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
>     initial=new FXButton(buttons,Save,NULL,this,ID_CLICKED_SAVE,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
>     new FXButton(buttons,Cancel,NULL,this,ID_CLICKED_CANCEL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
131,133c144,146
<     initial=new FXButton(buttons,"&Skip",NULL,this,ID_CLICKED_SKIP,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
<     new FXButton(buttons,"Skip &All",NULL,this,ID_CLICKED_SKIPALL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
<     new FXButton(buttons,"&Cancel",NULL,this,ID_CLICKED_CANCEL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
---
>     initial=new FXButton(buttons,Skip,NULL,this,ID_CLICKED_SKIP,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
>     new FXButton(buttons,SkipAll,NULL,this,ID_CLICKED_SKIPALL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
>     new FXButton(buttons,Cancel,NULL,this,ID_CLICKED_CANCEL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
157c170
<   FXGIFIcon icon(owner->getApp(),erroricon);
---
>   FXIcon * icon=FXCreateIcon(owner->getApp(),Error);
160c173
<   FXMessageBox box(owner,caption,FXStringVFormat(message,arguments),&icon,opts|DECOR_TITLE|DECOR_BORDER);
---
>   FXMessageBox box(owner,caption,FXStringVFormat(message,arguments),icon,opts|DECOR_TITLE|DECOR_BORDER);
162c175,177
<   return box.execute();
---
>   FXuint v = box.execute();
>   delete icon;
>   return v;
168c183
<   FXGIFIcon icon(owner->getApp(),warningicon);
---
>   FXIcon * icon=FXCreateIcon(owner->getApp(),Warning);
171c186
<   FXMessageBox box(owner,caption,FXStringVFormat(message,arguments),&icon,opts|DECOR_TITLE|DECOR_BORDER);
---
>   FXMessageBox box(owner,caption,FXStringVFormat(message,arguments),icon,opts|DECOR_TITLE|DECOR_BORDER);
173c188,190
<   return box.execute();
---
>   FXuint v = box.execute();
>   delete icon;
>   return v;
179c196
<   FXGIFIcon icon(owner->getApp(),questionicon);
---
>   FXIcon * icon=FXCreateIcon(owner->getApp(),Question);
182c199
<   FXMessageBox box(owner,caption,FXStringVFormat(message,arguments),&icon,opts|DECOR_TITLE|DECOR_BORDER);
---
>   FXMessageBox box(owner,caption,FXStringVFormat(message,arguments),icon,opts|DECOR_TITLE|DECOR_BORDER);
184c201,203
<   return box.execute();
---
>   FXuint v = box.execute();
>   delete icon;
>   return v;
190c209
<   FXGIFIcon icon(owner->getApp(),infoicon);
---
>   FXIcon * icon=FXCreateIcon(owner->getApp(),Info);
193c212
<   FXMessageBox box(owner,caption,FXStringVFormat(message,arguments),&icon,opts|DECOR_TITLE|DECOR_BORDER);
---
>   FXMessageBox box(owner,caption,FXStringVFormat(message,arguments),icon,opts|DECOR_TITLE|DECOR_BORDER);
195c214,216
<   return box.execute();
---
>   FXuint v = box.execute();
>   delete icon;
>   return v;
diff fox-1.1.41/src/FXPrintDialog.cpp fox-1.1.41i/src/FXPrintDialog.cpp
226a227,267
> FXString FXPrintDialog::Print("&Print");
> FXString FXPrintDialog::Cancel("&Cancel");
> #ifdef HAVE_CUPS_H
> FXString FXPrintDialog::UsingCUPS("Using CUPS");
> #endif
> FXString FXPrintDialog::PrintDestination("Print Destination");
> FXString FXPrintDialog::Printer("Pr&inter:");
> FXString FXPrintDialog::Properties("Properties...");
> FXString FXPrintDialog::File("&File:");
> FXString FXPrintDialog::Browse("&Browse...");
> FXString FXPrintDialog::Pages("Pages");
> FXString FXPrintDialog::PrintAll("Print &All");
> FXString FXPrintDialog::EvenPages("&Even Pages");
> FXString FXPrintDialog::OddPages("&Odd Pages");
> FXString FXPrintDialog::PrintRange("Print &Range:");
> FXString FXPrintDialog::From("From:");
> FXString FXPrintDialog::To("To:");
> FXString FXPrintDialog::Colours("Colors");
> FXString FXPrintDialog::PrintInColour("Print in Color");
> FXString FXPrintDialog::PrintInMonochrome("Print in Black and White");
> FXString FXPrintDialog::Copies("Copies");
> FXString FXPrintDialog::NumberOfCopies("Number of copies to print:");
> FXString FXPrintDialog::CollateOrder("Collate Order");
> FXString FXPrintDialog::FirstPageFirst("First Page First");
> FXString FXPrintDialog::LastPageFirst("Last Page First");
> FXString FXPrintDialog::Layout("Layout");
> FXString FXPrintDialog::Portrait("Portrait");
> FXString FXPrintDialog::Landscape("Landscape");
> FXString FXPrintDialog::PaperSize("Paper Size");
> FXString FXPrintDialog::OverwriteFile("Overwrite file?");
> FXString FXPrintDialog::OverwriteExistingFile("Overwrite existing file %s?");
> FXString FXPrintDialog::SelectOutputFile("Select Output File");
> FXString FXPrintDialog::FileSelectionPatterns("All Files (*)\nPostscript Files (*.ps,*.eps)");
> #ifndef WIN32
> FXString FXPrintDialog::PrinterCommand("Printer Command");
> FXString FXPrintDialog::SpecifyPrinterCommand("Specify the printer command, for example:\n\n  \"lpr -P%s -#%d\" or \"lp -d%s -n%d\"\n\nThis will print \"%d\" copies to printer \"%s\".");
> #endif
> 
> FXGenericIcon FXPrintDialog::IPortrait = {GIF, portrait};
> FXGenericIcon FXPrintDialog::ILandscape = {GIF, landscape};
> 
238,239c279,280
<   new FXButton(buttons,"&Print",NULL,this,ID_ACCEPT,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_CENTER_Y|LAYOUT_RIGHT,0,0,0,0,20,20);
<   new FXButton(buttons,"&Cancel",NULL,this,ID_CANCEL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_CENTER_Y|LAYOUT_RIGHT,0,0,0,0,20,20);
---
>   new FXButton(buttons,Print,NULL,this,ID_ACCEPT,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_CENTER_Y|LAYOUT_RIGHT,0,0,0,0,20,20);
>   new FXButton(buttons,Cancel,NULL,this,ID_CANCEL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_CENTER_Y|LAYOUT_RIGHT,0,0,0,0,20,20);
241c282
<   FXLabel *label=new FXLabel(buttons,"Using CUPS",NULL,LAYOUT_CENTER_Y|LAYOUT_LEFT,0,0,0,0,0,0);
---
>   FXLabel *label=new FXLabel(buttons,UsingCUPS,NULL,LAYOUT_CENTER_Y|LAYOUT_LEFT,0,0,0,0,0,0);
246c287
<   FXGroupBox *dest=new FXGroupBox(contents,"Print Destination",GROUPBOX_TITLE_LEFT|FRAME_RIDGE|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_FILL_Y,0,0,0,0, 10,10,5,5, 10,5);
---
>   FXGroupBox *dest=new FXGroupBox(contents,PrintDestination,GROUPBOX_TITLE_LEFT|FRAME_RIDGE|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_FILL_Y,0,0,0,0, 10,10,5,5, 10,5);
248c289
<   sendtoprinter=new FXRadioButton(dest,"Pr&inter:",this,ID_TO_PRINTER,LAYOUT_SIDE_TOP|ICON_BEFORE_TEXT);
---
>   sendtoprinter=new FXRadioButton(dest,Printer,this,ID_TO_PRINTER,LAYOUT_SIDE_TOP|ICON_BEFORE_TEXT);
251c292
<   new FXButton(printdest,"Properties...",NULL,this,ID_PROPERTIES,FRAME_RAISED|FRAME_THICK|LAYOUT_CENTER_Y|LAYOUT_RIGHT|LAYOUT_FIX_WIDTH,0,0,100,0, 10,10);
---
>   new FXButton(printdest,Properties,NULL,this,ID_PROPERTIES,FRAME_RAISED|FRAME_THICK|LAYOUT_CENTER_Y|LAYOUT_RIGHT|LAYOUT_FIX_WIDTH,0,0,100,0, 10,10);
255c296
<   sendtofile=new FXRadioButton(dest,"&File:",this,ID_TO_FILE,LAYOUT_SIDE_TOP|ICON_BEFORE_TEXT);
---
>   sendtofile=new FXRadioButton(dest,File,this,ID_TO_FILE,LAYOUT_SIDE_TOP|ICON_BEFORE_TEXT);
258c299
<   new FXButton(filedest,"&Browse...",NULL,this,ID_BROWSE_FILE,FRAME_RAISED|FRAME_THICK|LAYOUT_CENTER_Y|LAYOUT_RIGHT|LAYOUT_FIX_WIDTH,0,0,100,0, 10,10);
---
>   new FXButton(filedest,Browse,NULL,this,ID_BROWSE_FILE,FRAME_RAISED|FRAME_THICK|LAYOUT_CENTER_Y|LAYOUT_RIGHT|LAYOUT_FIX_WIDTH,0,0,100,0, 10,10);
266,270c307,311
<   FXGroupBox *pages=new FXGroupBox(left,"Pages",GROUPBOX_TITLE_LEFT|FRAME_RIDGE|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_FILL_Y,0,0,0,0, 10,10,5,5);
<   printall=new FXRadioButton(pages,"Print &All",this,ID_PAGES_ALL,LAYOUT_SIDE_TOP|ICON_BEFORE_TEXT);
<   printeven=new FXRadioButton(pages,"&Even Pages",this,ID_PAGES_EVEN,LAYOUT_SIDE_TOP|ICON_BEFORE_TEXT);
<   printodd=new FXRadioButton(pages,"&Odd Pages",this,ID_PAGES_ODD,LAYOUT_SIDE_TOP|ICON_BEFORE_TEXT);
<   printrange=new FXRadioButton(pages,"Print &Range:",this,ID_PAGES_RANGE,LAYOUT_SIDE_TOP|ICON_BEFORE_TEXT);
---
>   FXGroupBox *pages=new FXGroupBox(left,Pages,GROUPBOX_TITLE_LEFT|FRAME_RIDGE|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_FILL_Y,0,0,0,0, 10,10,5,5);
>   printall=new FXRadioButton(pages,PrintAll,this,ID_PAGES_ALL,LAYOUT_SIDE_TOP|ICON_BEFORE_TEXT);
>   printeven=new FXRadioButton(pages,EvenPages,this,ID_PAGES_EVEN,LAYOUT_SIDE_TOP|ICON_BEFORE_TEXT);
>   printodd=new FXRadioButton(pages,OddPages,this,ID_PAGES_ODD,LAYOUT_SIDE_TOP|ICON_BEFORE_TEXT);
>   printrange=new FXRadioButton(pages,PrintRange,this,ID_PAGES_RANGE,LAYOUT_SIDE_TOP|ICON_BEFORE_TEXT);
272,273c313,314
<   new FXLabel(pagerange,"From:",NULL,LAYOUT_CENTER_Y|LAYOUT_RIGHT|JUSTIFY_RIGHT);
<   new FXLabel(pagerange,"To:",NULL,LAYOUT_CENTER_Y|LAYOUT_RIGHT|JUSTIFY_RIGHT);
---
>   new FXLabel(pagerange,From,NULL,LAYOUT_CENTER_Y|LAYOUT_RIGHT|JUSTIFY_RIGHT);
>   new FXLabel(pagerange,To,NULL,LAYOUT_CENTER_Y|LAYOUT_RIGHT|JUSTIFY_RIGHT);
279,281c320,322
<   FXGroupBox *colors=new FXGroupBox(left,"Colors",GROUPBOX_TITLE_LEFT|FRAME_RIDGE|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_FILL_Y,0,0,0,0, 10,10,5,5);
<   printincolor=new FXRadioButton(colors,"Print in Color",this,ID_COLOR_PRINTER,LAYOUT_SIDE_TOP|ICON_BEFORE_TEXT);
<   printinblacknwhite=new FXRadioButton(colors,"Print in Black and White",this,ID_GRAY_PRINTER,LAYOUT_SIDE_TOP|ICON_BEFORE_TEXT);
---
>   FXGroupBox *colors=new FXGroupBox(left,Colours,GROUPBOX_TITLE_LEFT|FRAME_RIDGE|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_FILL_Y,0,0,0,0, 10,10,5,5);
>   printincolor=new FXRadioButton(colors,PrintInColour,this,ID_COLOR_PRINTER,LAYOUT_SIDE_TOP|ICON_BEFORE_TEXT);
>   printinblacknwhite=new FXRadioButton(colors,PrintInMonochrome,this,ID_GRAY_PRINTER,LAYOUT_SIDE_TOP|ICON_BEFORE_TEXT);
287,288c328,329
<   landscapeIcon=new FXGIFIcon(getApp(),landscape);
<   portraitIcon=new FXGIFIcon(getApp(),portrait);
---
>   landscapeIcon=FXCreateIcon(getApp(),ILandscape);
>   portraitIcon=FXCreateIcon(getApp(),IPortrait);
291,292c332,333
<   FXGroupBox *copies=new FXGroupBox(right,"Copies",GROUPBOX_TITLE_LEFT|FRAME_RIDGE|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_FILL_Y,0,0,0,0, 10,10,5,5);
<   new FXLabel(copies,"Number of copies to print:",NULL,LAYOUT_CENTER_Y|LAYOUT_RIGHT|JUSTIFY_RIGHT|LAYOUT_SIDE_LEFT);
---
>   FXGroupBox *copies=new FXGroupBox(right,Copies,GROUPBOX_TITLE_LEFT|FRAME_RIDGE|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_FILL_Y,0,0,0,0, 10,10,5,5);
>   new FXLabel(copies,NumberOfCopies,NULL,LAYOUT_CENTER_Y|LAYOUT_RIGHT|JUSTIFY_RIGHT|LAYOUT_SIDE_LEFT);
297,299c338,340
<   FXGroupBox *collate=new FXGroupBox(right,"Collate Order",GROUPBOX_TITLE_LEFT|FRAME_RIDGE|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_FILL_Y,0,0,0,0, 10,10,5,5);
<   firstpagefirst=new FXRadioButton(collate,"First Page First",this,ID_COLLATE_NORMAL,LAYOUT_SIDE_TOP|ICON_BEFORE_TEXT);
<   lastpagefirst=new FXRadioButton(collate,"Last Page First",this,ID_COLLATE_REVERSED,LAYOUT_SIDE_TOP|ICON_BEFORE_TEXT);
---
>   FXGroupBox *collate=new FXGroupBox(right,CollateOrder,GROUPBOX_TITLE_LEFT|FRAME_RIDGE|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_FILL_Y,0,0,0,0, 10,10,5,5);
>   firstpagefirst=new FXRadioButton(collate,FirstPageFirst,this,ID_COLLATE_NORMAL,LAYOUT_SIDE_TOP|ICON_BEFORE_TEXT);
>   lastpagefirst=new FXRadioButton(collate,LastPageFirst,this,ID_COLLATE_REVERSED,LAYOUT_SIDE_TOP|ICON_BEFORE_TEXT);
302c343
<   FXGroupBox *orientation=new FXGroupBox(right,"Layout",GROUPBOX_TITLE_LEFT|FRAME_RIDGE|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_FILL_Y,0,0,0,0, 10,10,5,5);
---
>   FXGroupBox *orientation=new FXGroupBox(right,Layout,GROUPBOX_TITLE_LEFT|FRAME_RIDGE|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_FILL_Y,0,0,0,0, 10,10,5,5);
304,305c345,346
<   orientportrait=new FXRadioButton(orientation,"Portrait",this,ID_PORTRAIT,LAYOUT_SIDE_LEFT|ICON_BEFORE_TEXT|JUSTIFY_CENTER_Y|LAYOUT_CENTER_Y);
<   orientlanscape=new FXRadioButton(orientation,"Landscape",this,ID_LANDSCAPE,LAYOUT_SIDE_RIGHT|ICON_BEFORE_TEXT|JUSTIFY_CENTER_Y|LAYOUT_CENTER_Y);
---
>   orientportrait=new FXRadioButton(orientation,Portrait,this,ID_PORTRAIT,LAYOUT_SIDE_LEFT|ICON_BEFORE_TEXT|JUSTIFY_CENTER_Y|LAYOUT_CENTER_Y);
>   orientlanscape=new FXRadioButton(orientation,Landscape,this,ID_LANDSCAPE,LAYOUT_SIDE_RIGHT|ICON_BEFORE_TEXT|JUSTIFY_CENTER_Y|LAYOUT_CENTER_Y);
309c350
<   FXGroupBox *paperdims=new FXGroupBox(right,"Paper Size",GROUPBOX_TITLE_LEFT|FRAME_RIDGE|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_FILL_Y,0,0,0,0, 10,10,5,5);
---
>   FXGroupBox *paperdims=new FXGroupBox(right,PaperSize,GROUPBOX_TITLE_LEFT|FRAME_RIDGE|LAYOUT_FILL_X|LAYOUT_TOP|LAYOUT_FILL_Y,0,0,0,0, 10,10,5,5);
603c644
<       FXuint answer=FXMessageBox::question(this,MBOX_YES_NO_CANCEL,"Overwrite file?","Overwrite existing file %s?",printer.name.text());
---
>       FXuint answer=FXMessageBox::question(this,MBOX_YES_NO_CANCEL,OverwriteFile.text(),OverwriteExistingFile.text(),printer.name.text());
617c658
<   name=FXFileDialog::getSaveFilename(this,"Select Output File",name,"All Files (*)\nPostscript Files (*.ps,*.eps)",0);
---
>   name=FXFileDialog::getSaveFilename(this,SelectOutputFile,name,FileSelectionPatterns,0);
639c680
<   if(FXInputDialog::getString(command,this,"Printer Command","Specify the printer command, for example:\n\n  \"lpr -P%s -#%d\" or \"lp -d%s -n%d\"\n\nThis will print \"%d\" copies to printer \"%s\".")){
---
>   if(FXInputDialog::getString(command,this,PrinterCommand,SpecifyPrinterCommand)){
diff fox-1.1.41/src/FXProgressDialog.cpp fox-1.1.41i/src/FXProgressDialog.cpp
76a77
> FXString FXProgressDialog::Cancel("&Cancel");
87c88
<   cancel=new FXButton(this,"&Cancel",NULL,this,ID_CANCEL,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_SIDE_BOTTOM|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
---
>   cancel=new FXButton(this,Cancel,NULL,this,ID_CANCEL,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_SIDE_BOTTOM|LAYOUT_CENTER_X,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
diff fox-1.1.41/src/FXReplaceDialog.cpp fox-1.1.41i/src/FXReplaceDialog.cpp
104a105,115
> FXString FXReplaceDialog::Replace("&Replace");
> FXString FXReplaceDialog::ReplaceAll("Re&place All");
> FXString FXReplaceDialog::Cancel("&Cancel");
> FXString FXReplaceDialog::SearchFor("S&earch for:");
> FXString FXReplaceDialog::ReplaceWith("Replace &with:");
> FXString FXReplaceDialog::Exact("Ex&act");
> FXString FXReplaceDialog::IgnoreCase("&Ignore Case");
> FXString FXReplaceDialog::Expression("E&xpression");
> FXString FXReplaceDialog::Backward("&Backward");
> FXString FXReplaceDialog::SearchLastCtlBTip("Ctl-B");
> FXString FXReplaceDialog::SearchNextCtlFTip("Ctl-F");
110,112c121,123
<   accept=new FXButton(buttons,"&Replace",NULL,this,ID_ACCEPT,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_Y|LAYOUT_RIGHT,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
<   every=new FXButton(buttons,"Re&place All",NULL,this,ID_ALL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_CENTER_Y|LAYOUT_RIGHT,0,0,0,0,6,6,VERT_PAD,VERT_PAD);
<   cancel=new FXButton(buttons,"&Cancel",NULL,this,ID_CANCEL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_Y|LAYOUT_RIGHT,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
---
>   accept=new FXButton(buttons,Replace,NULL,this,ID_ACCEPT,BUTTON_INITIAL|BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_Y|LAYOUT_RIGHT,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
>   every=new FXButton(buttons,ReplaceAll,NULL,this,ID_ALL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_CENTER_Y|LAYOUT_RIGHT,0,0,0,0,6,6,VERT_PAD,VERT_PAD);
>   cancel=new FXButton(buttons,Cancel,NULL,this,ID_CANCEL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_Y|LAYOUT_RIGHT,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
120c131
<   searchlabel=new FXLabel(entry,"S&earch for:",NULL,JUSTIFY_LEFT|ICON_BEFORE_TEXT|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FILL_X);
---
>   searchlabel=new FXLabel(entry,SearchFor,NULL,JUSTIFY_LEFT|ICON_BEFORE_TEXT|LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FILL_X);
128c139
<   replacelabel=new FXLabel(entry,"Replace &with:",NULL,LAYOUT_LEFT);
---
>   replacelabel=new FXLabel(entry,ReplaceWith,NULL,LAYOUT_LEFT);
137,142c148,153
<   new FXRadioButton(options1,"Ex&act",this,ID_MODE+SEARCH_EXACT,ICON_BEFORE_TEXT|LAYOUT_CENTER_X);
<   new FXRadioButton(options1,"&Ignore Case",this,ID_MODE+SEARCH_IGNORECASE,ICON_BEFORE_TEXT|LAYOUT_CENTER_X);
<   new FXRadioButton(options1,"E&xpression",this,ID_MODE+SEARCH_REGEX,ICON_BEFORE_TEXT|LAYOUT_CENTER_X);
<   new FXCheckButton(options1,"&Backward",this,ID_DIR,ICON_BEFORE_TEXT|LAYOUT_CENTER_X);
<   searchlast->setTipText("Ctl-B");
<   searchnext->setTipText("Ctl-F");
---
>   new FXRadioButton(options1,Exact,this,ID_MODE+SEARCH_EXACT,ICON_BEFORE_TEXT|LAYOUT_CENTER_X);
>   new FXRadioButton(options1,IgnoreCase,this,ID_MODE+SEARCH_IGNORECASE,ICON_BEFORE_TEXT|LAYOUT_CENTER_X);
>   new FXRadioButton(options1,Expression,this,ID_MODE+SEARCH_REGEX,ICON_BEFORE_TEXT|LAYOUT_CENTER_X);
>   new FXCheckButton(options1,Backward,this,ID_DIR,ICON_BEFORE_TEXT|LAYOUT_CENTER_X);
>   searchlast->setTipText(SearchLastCtlBTip);
>   searchnext->setTipText(SearchNextCtlFTip);
diff fox-1.1.41/src/FXRex.cpp fox-1.1.41i/src/FXRex.cpp
2257c2257
< const FXchar *const FXRex::errors[]={
---
> FXString FXRex::errors[]={
diff fox-1.1.41/src/FXSearchDialog.cpp fox-1.1.41i/src/FXSearchDialog.cpp
65c65
< 
---
> FXString FXSearchDialog::Search("&Search");
70c70
<   accept->setText("&Search");
---
>   accept->setText(Search);
diff fox-1.1.41/src/FXStatusLine.cpp fox-1.1.41i/src/FXStatusLine.cpp
66c66
< const FXchar FXStatusLine::defaultMessage[]="Ready.";
---
> FXString FXStatusLine::defaultMessage("Ready.");
diff fox-1.1.41/src/FXText.cpp fox-1.1.41i/src/FXText.cpp
279a280,287
> FXString FXText::Search("Search");
> FXString FXText::Replace("Replace");
> FXString FXText::GotoLine("Goto Line");
> FXString FXText::GotoLineNumber("&Goto line number:");
> 
> FXGenericIcon FXText::ISearch = {GIF, searchicon};
> FXGenericIcon FXText::IGoto = {GIF, gotoicon};
> 
3897,3898c3905,3906
<   FXGIFIcon icon(getApp(),searchicon);
<   FXSearchDialog searchdialog(this,"Search",&icon);
---
>   FXIcon * icon = FXCreateIcon(getApp(),ISearch);
>   FXSearchDialog searchdialog(this,Search,icon);
3905c3913
<     if(code==FXSearchDialog::DONE) return 1;
---
>     if(code==FXSearchDialog::DONE) {delete icon; return 1;}
3920a3929
>   delete icon;
3927,3928c3936,3937
<   FXGIFIcon icon(getApp(),searchicon);
<   FXReplaceDialog replacedialog(this,"Replace",&icon);
---
>   FXIcon * icon = FXCreateIcon(getApp(),ISearch);
>   FXReplaceDialog replacedialog(this,Replace,icon);
3936c3945
<     if(code==FXReplaceDialog::DONE) return 1;
---
>     if(code==FXReplaceDialog::DONE) {delete icon; return 1;}
3974a3984
>   delete icon;
4002c4012
<   FXGIFIcon icon(getApp(),gotoicon);
---
>   FXIcon * icon = FXCreateIcon(getApp(),IGoto);
4004c4014
<   if(FXInputDialog::getInteger(row,this,"Goto Line","&Goto line number:",&icon,1,2147483647)){
---
>   if(FXInputDialog::getInteger(row,this,GotoLine,GotoLineNumber,icon,1,2147483647)){
4008a4019
>   delete icon;
diff fox-1.1.41/src/FXUndoList.cpp fox-1.1.41i/src/FXUndoList.cpp
99a100,101
> FXString FXCommand::UndoStr("Undo");
> FXString FXCommand::RedoStr("Redo");
106c108
< FXString FXCommand::undoName() const { return "Undo"; }
---
> FXString FXCommand::undoName() const { return UndoStr; }
110c112
< FXString FXCommand::redoName() const { return "Redo"; }
---
> FXString FXCommand::redoName() const { return RedoStr; }
diff fox-1.1.41/src/FXWizard.cpp fox-1.1.41i/src/FXWizard.cpp
86a87,95
> FXString FXWizard::Next("&Next");
> FXString FXWizard::Finish("&Finish");
> FXString FXWizard::Back("&Back");
> FXString FXWizard::Cancel("&Cancel");
> 
> FXGenericIcon FXWizard::INext = {GIF, arrownext};
> FXGenericIcon FXWizard::IPrevious = {GIF, arrowprev};
> FXGenericIcon FXWizard::IEnter = {GIF, entericon};
> 
106,108c115,117
<   nexticon=new FXGIFIcon(getApp(),arrownext);
<   backicon=new FXGIFIcon(getApp(),arrowprev);
<   finishicon=new FXGIFIcon(getApp(),entericon);
---
>   nexticon=FXCreateIcon(getApp(),INext);
>   backicon=FXCreateIcon(getApp(),IPrevious);
>   finishicon=FXCreateIcon(getApp(),IEnter);
110,112c119,121
<   finish=new FXButton(buttons,"&Finish",finishicon,this,ID_ACCEPT,ICON_AFTER_TEXT|FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_Y|LAYOUT_RIGHT,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
<   advance=new FXButton(buttons,"&Next",nexticon,this,ID_NEXT,BUTTON_INITIAL|BUTTON_DEFAULT|ICON_AFTER_TEXT|FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_Y|LAYOUT_RIGHT,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
<   retreat=new FXButton(buttons,"&Back",backicon,this,ID_BACK,ICON_BEFORE_TEXT|FRAME_RAISED|FRAME_THICK|LAYOUT_CENTER_Y|LAYOUT_RIGHT,0,0,0,0,HORZ_PAD+10,HORZ_PAD+10,VERT_PAD,VERT_PAD);
---
>   finish=new FXButton(buttons,Finish,finishicon,this,ID_ACCEPT,ICON_AFTER_TEXT|FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_Y|LAYOUT_RIGHT,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
>   advance=new FXButton(buttons,Next,nexticon,this,ID_NEXT,BUTTON_INITIAL|BUTTON_DEFAULT|ICON_AFTER_TEXT|FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_Y|LAYOUT_RIGHT,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
>   retreat=new FXButton(buttons,Back,backicon,this,ID_BACK,ICON_BEFORE_TEXT|FRAME_RAISED|FRAME_THICK|LAYOUT_CENTER_Y|LAYOUT_RIGHT,0,0,0,0,HORZ_PAD+10,HORZ_PAD+10,VERT_PAD,VERT_PAD);
114c123
<   cancel=new FXButton(buttons,"&Cancel",NULL,this,ID_CANCEL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_Y|LAYOUT_RIGHT,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
---
>   cancel=new FXButton(buttons,Cancel,NULL,this,ID_CANCEL,BUTTON_DEFAULT|FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_Y|LAYOUT_RIGHT,0,0,0,0,HORZ_PAD,HORZ_PAD,VERT_PAD,VERT_PAD);
Only in fox-1.1.41i/src/: Icon_FOX.cpp
Only in fox-1.1.41i/src/: Language_EN_US.cpp
Only in fox-1.1.41i/src/: baseicons.html
diff fox-1.1.41/src/fxquantize.cpp fox-1.1.41i/src/fxquantize.cpp
220c220
<     dst[i]=mapindex[p];
---
>     dst[i]=FXuchar(mapindex[p]);
diff fox-1.1.41/src/icons.h fox-1.1.41i/src/icons.h
184a185
> 
Only in fox-1.1.41i/src/: version.aps
