From: <ni...@us...> - 2008-09-27 09:10:33
|
Revision: 7 http://wxdevide.svn.sourceforge.net/wxdevide/?rev=7&view=rev Author: ninjanl Date: 2008-09-27 09:10:25 +0000 (Sat, 27 Sep 2008) Log Message: ----------- Modified Paths: -------------- trunk/wxdevide/source/AboutDlg.cpp trunk/wxdevide/source/AboutDlg.h trunk/wxdevide/source/AboutDlg.wxform trunk/wxdevide/source/DevCpp.dev trunk/wxdevide/source/DevCpp.layout trunk/wxdevide/source/MainFrm.cpp trunk/wxdevide/source/Makefile.win Added Paths: ----------- trunk/wxdevide/source/EnviroFrm.cpp trunk/wxdevide/source/EnviroFrm.h trunk/wxdevide/source/EnviroFrm.wxform Modified: trunk/wxdevide/source/AboutDlg.cpp =================================================================== --- trunk/wxdevide/source/AboutDlg.cpp 2008-09-27 08:44:49 UTC (rev 6) +++ trunk/wxdevide/source/AboutDlg.cpp 2008-09-27 09:10:25 UTC (rev 7) @@ -28,6 +28,7 @@ ////Manual Code End EVT_CLOSE(AboutDlg::OnClose) + EVT_ACTIVATE(AboutDlg::AboutDlgActivate) EVT_BUTTON(ID_BTNUPDATECHECK,AboutDlg::BtnUpdateCheckClick) EVT_HYPERLINK(ID_HLKBOOK,AboutDlg::HlkwxdevcppWebsiteHyperLink) EVT_HYPERLINK(ID_HLKWXWEBSITE,AboutDlg::HlkwxdevcppWebsiteHyperLink) @@ -55,50 +56,58 @@ ////GUI Items Creation Start wxBitmap ImgBanner_BITMAP(AboutDlg_ImgBanner_XPM); - ImgBanner = new wxStaticBitmap(this, ID_IMGBANNER, ImgBanner_BITMAP, wxPoint(8,4), wxSize(376,61)); + ImgBanner = new wxStaticBitmap(this, ID_IMGBANNER, ImgBanner_BITMAP, wxDefaultPosition, wxDefaultSize); ImgBanner->Enable(false); + ImgBanner->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - NbkContainer = new wxNotebook(this, ID_NBKCONTAINER, wxPoint(5,76),wxSize(385,267)); + NbkContainer = new wxNotebook(this, ID_NBKCONTAINER, wxDefaultPosition, wxDefaultSize, wxNB_DEFAULT); + NbkContainer->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - NpgVersion = new wxPanel(NbkContainer, ID_NPGVERSION, wxPoint(4,24), wxSize(377,239)); + NpgVersion = new wxPanel(NbkContainer, ID_NPGVERSION, wxDefaultPosition, wxDefaultSize); NpgVersion->SetBackgroundColour(wxColour(*wxWHITE)); + NpgVersion->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); NbkContainer->AddPage(NpgVersion, _("Version Information")); - LblDevCppCopyright = new wxStaticText(NpgVersion, ID_LBLDEVCPPCOPYRIGHT, _("Dev-C++ Code Base Copyright (c) Bloodshed Software"), wxPoint(4,4), wxDefaultSize, 0, _("LblDevCppCopyright")); - LblDevCppCopyright->SetFont(wxFont(8, wxSWISS, wxNORMAL,wxBOLD, false)); + LblDevCppCopyright = new wxStaticText(NpgVersion, ID_LBLDEVCPPCOPYRIGHT, _("Dev-C++ Code Base Copyright (c) Bloodshed Software"), wxDefaultPosition, wxDefaultSize, 0, _("LblDevCppCopyright")); + LblDevCppCopyright->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxBOLD, false, _("MS Sans Serif"))); - LblwxDevCppCopyright = new wxStaticText(NpgVersion, ID_LBLWXDEVCPPCOPYRIGHT, _("Form Designer Copyright (c) wxDev-C++ Development Team"), wxPoint(4,18), wxDefaultSize, 0, _("LblwxDevCppCopyright")); - LblwxDevCppCopyright->SetFont(wxFont(8, wxSWISS, wxNORMAL,wxBOLD, false)); + LblwxDevCppCopyright = new wxStaticText(NpgVersion, ID_LBLWXDEVCPPCOPYRIGHT, _("Form Designer Copyright (c) wxDev-C++ Development Team"), wxDefaultPosition, wxDefaultSize, 0, _("LblwxDevCppCopyright")); + LblwxDevCppCopyright->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxBOLD, false, _("MS Sans Serif"))); - LblwxdevcppWebsite = new wxStaticText(NpgVersion, ID_LBLWXDEVCPPWEBSITE, _("wxDev-C++ Website:"), wxPoint(4,45), wxDefaultSize, 0, _("LblwxdevcppWebsite")); + LblwxdevcppWebsite = new wxStaticText(NpgVersion, ID_LBLWXDEVCPPWEBSITE, _("wxDev-C++ Website:"), wxDefaultPosition, wxDefaultSize, 0, _("LblwxdevcppWebsite")); + LblwxdevcppWebsite->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - LblForum = new wxStaticText(NpgVersion, ID_LBLFORUM, _("wxDev-C++ Support Forum:"), wxPoint(4,64), wxDefaultSize, 0, _("LblForum")); + LblForum = new wxStaticText(NpgVersion, ID_LBLFORUM, _("wxDev-C++ Support Forum:"), wxDefaultPosition, wxDefaultSize, 0, _("LblForum")); + LblForum->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - LblwxWeb = new wxStaticText(NpgVersion, ID_LBLWXWEB, _("wxWidget Site"), wxPoint(4,83), wxDefaultSize, 0, _("LblwxWeb")); + LblwxWeb = new wxStaticText(NpgVersion, ID_LBLWXWEB, _("wxWidget Site"), wxDefaultPosition, wxDefaultSize, 0, _("LblwxWeb")); + LblwxWeb->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - LblBook = new wxStaticText(NpgVersion, ID_LBLBOOK, _("wxDev-C++ Book :"), wxPoint(4,102), wxDefaultSize, 0, _("LblBook")); + LblBook = new wxStaticText(NpgVersion, ID_LBLBOOK, _("wxDev-C++ Book :"), wxDefaultPosition, wxDefaultSize, 0, _("LblBook")); + LblBook->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - HlkwxdevcppWebsite = new wxHyperlinkCtrl(NpgVersion, ID_HLKWXDEVCPPWEBSITE, _("http://wxdsgn.sourceforge.net/"), _("http://wxdsgn.sourceforge.net/"), wxPoint(155,45), wxSize(160, 17), wxNO_BORDER | wxHL_CONTEXTMENU, _("HlkwxdevcppWebsite")); + HlkwxdevcppWebsite = new wxHyperlinkCtrl(NpgVersion, ID_HLKWXDEVCPPWEBSITE, _("http://wxdsgn.sourceforge.net/"), _("http://wxdsgn.sourceforge.net/"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER | wxHL_CONTEXTMENU, _("HlkwxdevcppWebsite")); HlkwxdevcppWebsite->SetNormalColour(*wxBLUE); - HlkwxdevcppWebsite->SetFont(wxFont(8, wxSWISS, wxNORMAL,wxNORMAL, true)); + HlkwxdevcppWebsite->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, true, _("MS Sans Serif"))); - HlkForumSite = new wxHyperlinkCtrl(NpgVersion, ID_HLKFORUMSITE, _("http://wxforum.shadonet.com/viewforum.php?f=28"), _("http://wxforum.shadonet.com/viewforum.php?f=28"), wxPoint(155,64), wxSize(216, 17), wxNO_BORDER | wxHL_CONTEXTMENU, _("HlkForumSite")); + HlkForumSite = new wxHyperlinkCtrl(NpgVersion, ID_HLKFORUMSITE, _("http://wxforum.shadonet.com/viewforum.php?f=28"), _("http://wxforum.shadonet.com/viewforum.php?f=28"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER | wxHL_CONTEXTMENU, _("HlkForumSite")); HlkForumSite->SetNormalColour(*wxBLUE); - HlkForumSite->SetFont(wxFont(8, wxSWISS, wxNORMAL,wxNORMAL, true)); + HlkForumSite->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, true, _("MS Sans Serif"))); - HlkwxWebsite = new wxHyperlinkCtrl(NpgVersion, ID_HLKWXWEBSITE, _("http://wxwidgets.org"), _("http://wxwidgets.org"), wxPoint(155,83), wxSize(166, 17), wxNO_BORDER | wxHL_CONTEXTMENU, _("HlkwxWebsite")); + HlkwxWebsite = new wxHyperlinkCtrl(NpgVersion, ID_HLKWXWEBSITE, _("http://wxwidgets.org"), _("http://wxwidgets.org"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER | wxHL_CONTEXTMENU, _("HlkwxWebsite")); HlkwxWebsite->SetNormalColour(*wxBLUE); - HlkwxWebsite->SetFont(wxFont(8, wxSWISS, wxNORMAL,wxNORMAL, true)); + HlkwxWebsite->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, true, _("MS Sans Serif"))); - HlkBook = new wxHyperlinkCtrl(NpgVersion, ID_HLKBOOK, _("http://wxdevcpp-book.sourceforge.net/"), _("http://wxdevcpp-book.sourceforge.net/"), wxPoint(155,102), wxSize(193, 17), wxNO_BORDER | wxHL_CONTEXTMENU, _("HlkBook")); + HlkBook = new wxHyperlinkCtrl(NpgVersion, ID_HLKBOOK, _("http://wxdevcpp-book.sourceforge.net/"), _("http://wxdevcpp-book.sourceforge.net/"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER | wxHL_CONTEXTMENU, _("HlkBook")); HlkBook->SetNormalColour(*wxBLUE); - HlkBook->SetFont(wxFont(8, wxSWISS, wxNORMAL,wxNORMAL, true)); + HlkBook->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, true, _("MS Sans Serif"))); - NpgLicense = new wxPanel(NbkContainer, ID_NPGLICENSE, wxPoint(4,24), wxSize(377,239)); + NpgLicense = new wxPanel(NbkContainer, ID_NPGLICENSE, wxDefaultPosition, wxDefaultSize); NpgLicense->SetBackgroundColour(wxColour(*wxWHITE)); + NpgLicense->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); NbkContainer->AddPage(NpgLicense, _("GNU General Public License")); - MmoLicense = new wxTextCtrl(NpgLicense, ID_MMOLICENSE, _(""), wxPoint(3,5), wxSize(366,232), wxTE_MULTILINE, wxDefaultValidator, _("MmoLicense")); + MmoLicense = new wxTextCtrl(NpgLicense, ID_MMOLICENSE, _(" GNU GENERAL PUBLIC LICENSE\r\n Version 2, June 1991\r\n\r\nCopyright (C) 1989, 1991 Free Software Foundation, Inc.\r\n675 Mass Ave, Cambridge, MA 02139, USA\r\nEveryone is permitted to copy and distribute verbatim copies of this \r\nlicense document, but changing it is not allowed.\r\n\r\nPreamble\r\n\r\nThe licenses for most software are designed to take away your freedom \r\nto share and change it. By contrast, the GNU General Public License is \r\nintended to guarantee your freedom to share and change free software--\r\nto make sure the software is free for all its users. This General Public \r\nLicense applies to most of the Free Software Foundation's software and\r\nto any other program whose authors commit to using it. (Some other Free\r\nSoftware Foundation software is covered by the GNU Library General \r\nPublic License instead.) You can apply it to your programs, too.\r\n\r\nWhen we speak of free software, we are referring to freedom, not price. \r\nOur General Public Licenses are designed to make sure that you have \r\nthe freedom to distribute copies of free software (and charge for this \r\nservice if you wish), that you receive source code or can get it if you\r\nwant it, that you can change the software or use pieces of it in new free\r\nprograms; and that you know you can do these things.\r\n\r\nTo protect your rights, we need to make restrictions that forbid anyone to \r\ndeny you these rights or to ask you to surrender the rights. These \r\nrestrictions translate to certain responsibilities for you if you distribute \r\ncopies of the software, or if you modify it.\r\n\r\nFor example, if you distribute copies of such a program, whether gratis or \r\nfor a fee, you must give the recipients all the rights that you have. You \r\nmust make sure that they, too, receive or can get the source code. And \r\nyou must show them these terms so they know their rights.\r\n\r\nWe protect your rights with two steps: (1) copyright the software, and (2) \r\noffer you this license which gives you legal permission to copy, distribute \r\nand/or modify the software.\r\n\r\nAlso, for each author's protection and ours, we want to make certain that\r\neveryone understands that there is no warranty for this free software. If \r\nthe software is modified by someone else and passed on, we want its \r\nrecipients to know that what they have is not the original, so that any \r\nproblems introduced by others will not reflect on the original authors'\r\nreputations.\r\n\r\nFinally, any free program is threatened constantly by software patents. \r\nWe wish to avoid the danger that redistributors of a free program will \r\nindividually obtain patent licenses, in effect making the program \r\nproprietary. To prevent this, we have made it clear that any patent must\r\nbe licensed for everyone's free use or not licensed at all.\r\n\r\nThe precise terms and conditions for copying, distribution and\r\nmodification follow.\r\n\r\n GNU GENERAL PUBLIC LICENSE\r\nTERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND \r\nMODIFICATION\r\n\r\n 0. This License applies to any program or other work which contains a \r\nnotice placed by the copyright holder saying it may be distributed under \r\nthe terms of this General Public License. The \"Program\", below, refers \r\nto \r\nany such program or work, and a \"work based on the Program\" means \r\neither the Program or any derivative work under copyright law: that is to \r\nsay, a work containing the Program or a portion of it, either verbatim or \r\nwith modifications and/or translated into another language. (Hereinafter, \r\ntranslation is included without limitation in the term \"modification\".) Each \r\nlicensee is addressed as \"you\".\r\n\r\nActivities other than copying, distribution and modification are not \r\ncovered by this License; they are outside its scope. The act of running \r\nthe Program is not restricted, and the output from the Program is covered \r\nonly if its contents constitute a work based on the Program (independent \r\nof having been made by running the Program). Whether that is true \r\ndepends on what the Program does.\r\n\r\n 1. You may copy and distribute verbatim copies of the Program's source \r\ncode as you receive it, in any medium, provided that you conspicuously \r\nand appropriately publish on each copy an appropriate copyright notice \r\nand disclaimer of warranty; keep intact all the notices that refer to this \r\nLicense and to the absence of any warranty; and give any other \r\nrecipients of the Program a copy of this License along with the Program.\r\n\r\nYou may charge a fee for the physical act of transferring a copy, and you \r\nmay at your option offer warranty protection in exchange for a fee.\r\n\r\n 2. You may modify your copy or copies of the Program or any portion of \r\nit, thus forming a work based on the Program, and copy and distribute \r\nsuch modifications or work under the terms of Section 1 above, provided \r\nthat you also meet all of these conditions:\r\n\r\n a) You must cause the modified files to carry prominent notices stating\r\n that you changed the files and the date of any change.\r\n\r\n b) You must cause any work that you distribute or publish, that in \r\n whole or in part contains or is derived from the Program or any part\r\n thereof, to be licensed as a whole at no charge to all third parties \r\n under the terms of this License.\r\n\r\n c) If the modified program normally reads commands interactively when\r\n run, you must cause it, when started running for such interactive use\r\n in the most ordinary way, to print or display an announcement \r\nincluding\r\n an appropriate copyright notice and a notice that there is no warranty\r\n (or else, saying that you provide a warranty) and that users may\r\n redistribute the program under these conditions, and telling the user \r\n how to view a copy of this License. (Exception: if the Program itself is \r\n interactive but does not normally print such an announcement, your \r\n work based on the Program is not required to print an announcement.)\r\n\r\nThese requirements apply to the modified work as a whole. If identifiable\r\nsections of that work are not derived from the Program, and can be \r\nreasonably considered independent and separate works in themselves,\r\nthen this License, and its terms, do not apply to those sections when you\r\ndistribute them as separate works. But when you distribute the same \r\nsections as part of a whole which is a work based on the Program, the\r\ndistribution of the whole must be on the terms of this License, whose\r\npermissions for other licensees extend to the entire whole, and thus to\r\neach and every part regardless of who wrote it.\r\n\r\nThus, it is not the intent of this section to claim rights or contest your \r\nrights to work written entirely by you; rather, the intent is to exercise the\r\nright to control the distribution of derivative or collective works based on\r\nthe Program.\r\n\r\nIn addition, mere aggregation of another work not based on the Program\r\nwith the Program (or with a work based on the Program) on a volume of\r\na storage or distribution medium does not bring the other work under the\r\nscope of this License.\r\n\r\n 3. You may copy and distribute the Program (or a work based on it, \r\nunder Section 2) in object code or executable form under the terms of\r\nSections 1 and 2 above provided that you also do one of the following:\r\n\r\n a) Accompany it with the complete corresponding machine-readable \r\n source code, which must be distributed under the terms of Sections 1\r\n and 2 above on a medium customarily used for software interchange; \r\n or,\r\n\r\n b) Accompany it with a written offer, valid for at least three years, to\r\n give any third party, for a charge no more than your cost of physically\r\n performing source distribution, a complete machine-readable copy of\r\n the corresponding source code, to be distributed under the terms of\r\n Sections 1 and 2 above on a medium customarily used for software\r\n interchange; or,\r\n\r\n c) Accompany it with the information you received as to the offer to \r\n distribute corresponding source code. (This alternative is allowed\r\n only for noncommercial distribution and only if you received the\r\n program in object code or executable form with such an offer, in\r\n accord with Subsection b above.)\r\n\r\nThe source code for a work means the preferred form of the work for \r\nmaking modifications to it. For an executable work, complete source\r\ncode means all the source code for all modules it contains, plus any\r\nassociated interface definition files, plus the scripts used to control\r\ncompilation and installation of the executable. However, as a special\r\nexception, the source code distributed need not include anything that\r\nis normally distributed (in either source or binary form) with the major\r\ncomponents (compiler, kernel, and so on) of the operating system on\r\nwhich the executable runs, unless that component itself accompanies\r\nthe executable.\r\n\r\nIf distribution of executable or object code is made by offering access\r\nto copy from a designated place, then offering equivalent access to\r\ncopy the source code from the same place counts as distribution of\r\nthe source code, even though third parties are not compelled to copy\r\nthe source along with the object code.\r\n\r\n 4. You may not copy, modify, sublicense, or distribute the Program\r\nexcept as expressly provided under this License. Any attempt otherwise\r\nto copy, modify, sublicense or distribute the Program is void, and will\r\nautomatically terminate your rights under this License. However, parties\r\nwho have received copies, or rights, from you under this License will\r\nnot have their licenses terminated so long as such parties remain in\r\nfull compliance.\r\n\r\n 5. You are not required to accept this License, since you have not\r\nsigned it. However, nothing else grants you permission to modify or\r\ndistribute the Program or its derivative works. These actions are\r\nprohibited by law if you do not accept this License. Therefore, by\r\nmodifying or distributing the Program (or any work based on the Program),\r\nyou indicate your acceptance of this License to do so, and all its terms\r\nand conditions for copying, distributing or modifying the Program or works\r\nbased on it.\r\n\r\n 6. Each time you redistribute the Program (or any work based on the \r\nProgram), the recipient automatically receives a license from the original\r\nlicensor to copy, distribute or modify the Program subject to these terms\r\nand conditions. You may not impose any further restrictions on the\r\nrecipients' exercise of the rights granted herein. You are not responsible\r\nfor enforcing compliance by third parties to this License.\r\n\r\n 7. If, as a consequence of a court judgment or allegation of patent\r\ninfringement or for any other reason (not limited to patent issues), \r\nconditions are imposed on you (whether by court order, agreement or \r\notherwise) that contradict the conditions of this License, they do not\r\nexcuse you from the conditions of this License. If you cannot distribute\r\nso as to satisfy simultaneously your obligations under this License and\r\nany other pertinent obligations, then as a consequence you may not\r\ndistribute the Program at all. For example, if a patent license would not\r\npermit royalty-free redistribution of the Program by all those who receive\r\ncopies directly or indirectly through you, then the only way you could\r\nsatisfy both it and this License would be to refrain entirely from\r\ndistribution of the Program.\r\n\r\nIf any portion of this section is held invalid or unenforceable under any\r\nparticular circumstance, the balance of the section is intended to apply\r\nand the section as a whole is intended to apply in other circumstances.\r\n\r\nIt is not the purpose of this section to induce you to infringe any patents\r\nor other property right claims or to contest validity of any such claims;\r\nthis section has the sole purpose of protecting the integrity of the free\r\nsoftware distribution system, which is implemented by public license\r\npractices. Many people have made generous contributions to the wide\r\nrange of software distributed through that system in reliance on\r\nconsistent application of that system; it is up to the author/donor to\r\ndecide if he or she is willing to distribute software through any other\r\nsystem and a licensee cannot impose that choice.\r\n\r\nThis section is intended to make thoroughly clear what is believed to be \r\na\r\nconsequence of the rest of this License.\r\n\r\n 8. If the distribution and/or use of the Program is restricted in certain\r\ncountries either by patents or by copyrighted interfaces, the original\r\ncopyright holder who places the Program under this License may add an\r\nexplicit geographical distribution limitation excluding those countries, so\r\nthat distribution is permitted only in or among countries not thus excluded.\r\n In such case, this License incorporates the limitation as if written in the\r\nbody of this License.\r\n\r\n 9. The Free Software Foundation may publish revised and/or new \r\nversions of the General Public License from time to time. Such new \r\nversions will be similar in spirit to the present version, but may differ in\r\ndetail to address new problems or concerns.\r\n\r\nEach version is given a distinguishing version number. If the Program\r\nspecifies a version number of this License which applies to it and \"any \r\nlater version\", you have the option of following the terms and conditions\r\neither of that version or of any later version published by the Free \r\nSoftware Foundation. If the Program does not specify a version number\r\nof this License, you may choose any version ever published by the Free\r\nSoftware Foundation.\r\n\r\n 10. If you wish to incorporate parts of the Program into other free\r\nprograms whose distribution conditions are different, write to the author\r\nto ask for permission. For software which is copyrighted by the Free\r\nSoftware Foundation, write to the Free Software Foundation; we \r\nsometimes make exceptions for this. Our decision will be guided by the \r\ntwo goals of preserving the free status of all derivatives of our free \r\nsoftware and of promoting the sharing and reuse of software generally.\r\n\r\n NO WARRANTY\r\n\r\n 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, \r\nTHERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT \r\nPERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE \r\nSTATED IN WRITING THE COPYRIGHT HOLDERS AND/OR \r\nOTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT \r\nWARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, \r\nINCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\r\nOF MERCHANTABILITY AND FITNESS FOR A PARTICULAR \r\nPURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND\r\nPERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE\r\nPROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL\r\nNECESSARY SERVICING, REPAIR OR CORRECTION.\r\n\r\n 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR \r\nAGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR \r\nANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE \r\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR \r\nDAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR \r\nCONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR \r\nINABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\r\nTO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR\r\nLOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE\r\nOF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\r\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED \r\nOF\r\nTHE POSSIBILITY OF SUCH DAMAGES.\r\n\r\n END OF TERMS AND CONDITIONS\r\n"), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE, wxDefaultValidator, _("MmoLicense")); MmoLicense->SetMaxLength(0); MmoLicense->AppendText(_(" GNU GENERAL PUBLIC LICENSE")); MmoLicense->AppendText(_(" Version 2, June 1991")); @@ -162,7 +171,8 @@ MmoLicense->AppendText(_("")); MmoLicense->AppendText(_(" 0. This License applies to any program or other work which contains a ")); MmoLicense->AppendText(_("notice placed by the copyright holder saying it may be distributed under ")); - MmoLicense->AppendText(_("the terms of this General Public License. The \"Program\", below, refers to ")); + MmoLicense->AppendText(_("the terms of this General Public License. The \"Program\", below, refers ")); + MmoLicense->AppendText(_("to ")); MmoLicense->AppendText(_("any such program or work, and a \"work based on the Program\" means ")); MmoLicense->AppendText(_("either the Program or any derivative work under copyright law: that is to ")); MmoLicense->AppendText(_("say, a work containing the Program or a portion of it, either verbatim or ")); @@ -202,7 +212,8 @@ MmoLicense->AppendText(_("")); MmoLicense->AppendText(_(" c) If the modified program normally reads commands interactively when")); MmoLicense->AppendText(_(" run, you must cause it, when started running for such interactive use")); - MmoLicense->AppendText(_(" in the most ordinary way, to print or display an announcement including")); + MmoLicense->AppendText(_(" in the most ordinary way, to print or display an announcement ")); + MmoLicense->AppendText(_("including")); MmoLicense->AppendText(_(" an appropriate copyright notice and a notice that there is no warranty")); MmoLicense->AppendText(_(" (or else, saying that you provide a warranty) and that users may")); MmoLicense->AppendText(_(" redistribute the program under these conditions, and telling the user ")); @@ -320,7 +331,8 @@ MmoLicense->AppendText(_("decide if he or she is willing to distribute software through any other")); MmoLicense->AppendText(_("system and a licensee cannot impose that choice.")); MmoLicense->AppendText(_("")); - MmoLicense->AppendText(_("This section is intended to make thoroughly clear what is believed to be a")); + MmoLicense->AppendText(_("This section is intended to make thoroughly clear what is believed to be ")); + MmoLicense->AppendText(_("a")); MmoLicense->AppendText(_("consequence of the rest of this License.")); MmoLicense->AppendText(_("")); MmoLicense->AppendText(_(" 8. If the distribution and/or use of the Program is restricted in certain")); @@ -377,60 +389,83 @@ MmoLicense->AppendText(_("TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR")); MmoLicense->AppendText(_("LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE")); MmoLicense->AppendText(_("OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),")); - MmoLicense->AppendText(_("EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF")); + MmoLicense->AppendText(_("EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED ")); + MmoLicense->AppendText(_("OF")); MmoLicense->AppendText(_("THE POSSIBILITY OF SUCH DAMAGES.")); MmoLicense->AppendText(_("")); MmoLicense->AppendText(_(" END OF TERMS AND CONDITIONS")); MmoLicense->SetFocus(); MmoLicense->SetInsertionPointEnd(); + MmoLicense->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - NpgAuthors = new wxPanel(NbkContainer, ID_NPGAUTHORS, wxPoint(4,24), wxSize(377,239)); + NpgAuthors = new wxPanel(NbkContainer, ID_NPGAUTHORS, wxDefaultPosition, wxDefaultSize); NpgAuthors->SetBackgroundColour(wxColour(*wxWHITE)); + NpgAuthors->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); NbkContainer->AddPage(NpgAuthors, _("Authors")); - lblAuthors_wxDevCpp = new wxStaticText(NpgAuthors, ID_LBLAUTHORS_WXDEVCPP, _("wxDev-C++ Development:"), wxPoint(4,4), wxDefaultSize, 0, _("lblAuthors_wxDevCpp")); + lblAuthors_wxDevCpp = new wxStaticText(NpgAuthors, ID_LBLAUTHORS_WXDEVCPP, _("wxDev-C++ Development:"), wxDefaultPosition, wxDefaultSize, 0, _("lblAuthors_wxDevCpp")); + lblAuthors_wxDevCpp->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - lblAuthors_DevCpp = new wxStaticText(NpgAuthors, ID_LBLAUTHORS_DEVCPP, _("Dev-C++ Development:"), wxPoint(4,35), wxDefaultSize, 0, _("lblAuthors_DevCpp")); + lblAuthors_DevCpp = new wxStaticText(NpgAuthors, ID_LBLAUTHORS_DEVCPP, _("Dev-C++ Development:"), wxDefaultPosition, wxDefaultSize, 0, _("lblAuthors_DevCpp")); + lblAuthors_DevCpp->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - LblAuthors_MingW = new wxStaticText(NpgAuthors, ID_LBLAUTHORS_MINGW, _("MingW Compiler System:"), wxPoint(4,78), wxDefaultSize, 0, _("LblAuthors_MingW")); + LblAuthors_MingW = new wxStaticText(NpgAuthors, ID_LBLAUTHORS_MINGW, _("MingW Compiler System:"), wxDefaultPosition, wxDefaultSize, 0, _("LblAuthors_MingW")); + LblAuthors_MingW->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - LblAuthor_Splash = new wxStaticText(NpgAuthors, ID_LBLAUTHOR_SPLASH, _("Splash Screen:"), wxPoint(4,108), wxDefaultSize, 0, _("LblAuthor_Splash")); + LblAuthor_Splash = new wxStaticText(NpgAuthors, ID_LBLAUTHOR_SPLASH, _("Splash Screen:"), wxDefaultPosition, wxDefaultSize, 0, _("LblAuthor_Splash")); + LblAuthor_Splash->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - LblAuthor_NewLook = new wxStaticText(NpgAuthors, ID_LBLAUTHOR_NEWLOOK, _("New Look Theme:"), wxPoint(4,125), wxDefaultSize, 0, _("LblAuthor_NewLook")); + LblAuthor_NewLook = new wxStaticText(NpgAuthors, ID_LBLAUTHOR_NEWLOOK, _("New Look Theme:"), wxDefaultPosition, wxDefaultSize, 0, _("LblAuthor_NewLook")); + LblAuthor_NewLook->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - LblAuthor_Blue = new wxStaticText(NpgAuthors, ID_LBLAUTHOR_BLUE, _("Blue Theme:"), wxPoint(4,142), wxDefaultSize, 0, _("LblAuthor_Blue")); + LblAuthor_Blue = new wxStaticText(NpgAuthors, ID_LBLAUTHOR_BLUE, _("Blue Theme:"), wxDefaultPosition, wxDefaultSize, 0, _("LblAuthor_Blue")); + LblAuthor_Blue->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - WxStaticText1 = new wxStaticText(NpgAuthors, ID_WXSTATICTEXT1, _("Gnome Theme:"), wxPoint(4,159), wxDefaultSize, 0, _("WxStaticText1")); + WxStaticText1 = new wxStaticText(NpgAuthors, ID_WXSTATICTEXT1, _("Gnome Theme:"), wxDefaultPosition, wxDefaultSize, 0, _("WxStaticText1")); + WxStaticText1->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - WxStaticText2 = new wxStaticText(NpgAuthors, ID_WXSTATICTEXT2, _("Guru Kathiresan, Tony Reina, Malcolm Nealon,"), wxPoint(150,4), wxDefaultSize, 0, _("WxStaticText2")); + WxStaticText2 = new wxStaticText(NpgAuthors, ID_WXSTATICTEXT2, _("Guru Kathiresan, Tony Reina, Malcolm Nealon,"), wxDefaultPosition, wxDefaultSize, 0, _("WxStaticText2")); + WxStaticText2->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - WxStaticText3 = new wxStaticText(NpgAuthors, ID_WXSTATICTEXT3, _("Joel Low"), wxPoint(150,16), wxDefaultSize, 0, _("WxStaticText3")); + WxStaticText3 = new wxStaticText(NpgAuthors, ID_WXSTATICTEXT3, _("Joel Low"), wxDefaultPosition, wxDefaultSize, 0, _("WxStaticText3")); + WxStaticText3->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - WxStaticText4 = new wxStaticText(NpgAuthors, ID_WXSTATICTEXT4, _("Colin Laplace, Mike Berg, Hongli Lai,"), wxPoint(150,35), wxDefaultSize, 0, _("WxStaticText4")); + WxStaticText4 = new wxStaticText(NpgAuthors, ID_WXSTATICTEXT4, _("Colin Laplace, Mike Berg, Hongli Lai,"), wxDefaultPosition, wxDefaultSize, 0, _("WxStaticText4")); + WxStaticText4->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - WxStaticText5 = new wxStaticText(NpgAuthors, ID_WXSTATICTEXT5, _(" Yiannis Mandravellos; "), wxPoint(150,48), wxDefaultSize, 0, _("WxStaticText5")); + WxStaticText5 = new wxStaticText(NpgAuthors, ID_WXSTATICTEXT5, _(" Yiannis Mandravellos; "), wxDefaultPosition, wxDefaultSize, 0, _("WxStaticText5")); + WxStaticText5->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - WxStaticText6 = new wxStaticText(NpgAuthors, ID_WXSTATICTEXT6, _("Contibutors: Peter Schraut, Marek Januszewski"), wxPoint(150,60), wxDefaultSize, 0, _("WxStaticText6")); + WxStaticText6 = new wxStaticText(NpgAuthors, ID_WXSTATICTEXT6, _("Contibutors: Peter Schraut, Marek Januszewski"), wxDefaultPosition, wxDefaultSize, 0, _("WxStaticText6")); + WxStaticText6->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - WxStaticText7 = new wxStaticText(NpgAuthors, ID_WXSTATICTEXT7, _("Mumit Khan, J.J. Var Der Heidjen, "), wxPoint(150,78), wxDefaultSize, 0, _("WxStaticText7")); + WxStaticText7 = new wxStaticText(NpgAuthors, ID_WXSTATICTEXT7, _("Mumit Khan, J.J. Var Der Heidjen, "), wxDefaultPosition, wxDefaultSize, 0, _("WxStaticText7")); + WxStaticText7->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - WxStaticText8 = new wxStaticText(NpgAuthors, ID_WXSTATICTEXT8, _("Colin Hendrix and GNU developers"), wxPoint(150,90), wxDefaultSize, 0, _("WxStaticText8")); + WxStaticText8 = new wxStaticText(NpgAuthors, ID_WXSTATICTEXT8, _("Colin Hendrix and GNU developers"), wxDefaultPosition, wxDefaultSize, 0, _("WxStaticText8")); + WxStaticText8->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - WxStaticText9 = new wxStaticText(NpgAuthors, ID_WXSTATICTEXT9, _("Matthijs Crielaard"), wxPoint(150,108), wxDefaultSize, 0, _("WxStaticText9")); + WxStaticText9 = new wxStaticText(NpgAuthors, ID_WXSTATICTEXT9, _("Matthijs Crielaard"), wxDefaultPosition, wxDefaultSize, 0, _("WxStaticText9")); + WxStaticText9->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - WxStaticText10 = new wxStaticText(NpgAuthors, ID_WXSTATICTEXT10, _("Gerard Caulfield"), wxPoint(150,125), wxDefaultSize, 0, _("WxStaticText10")); + WxStaticText10 = new wxStaticText(NpgAuthors, ID_WXSTATICTEXT10, _("Gerard Caulfield"), wxDefaultPosition, wxDefaultSize, 0, _("WxStaticText10")); + WxStaticText10->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - WxStaticText11 = new wxStaticText(NpgAuthors, ID_WXSTATICTEXT11, _("Thomas Thron"), wxPoint(150,142), wxDefaultSize, 0, _("WxStaticText11")); + WxStaticText11 = new wxStaticText(NpgAuthors, ID_WXSTATICTEXT11, _("Thomas Thron"), wxDefaultPosition, wxDefaultSize, 0, _("WxStaticText11")); + WxStaticText11->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - WxStaticText12 = new wxStaticText(NpgAuthors, ID_WXSTATICTEXT12, _("Gnome Designers"), wxPoint(150,159), wxDefaultSize, 0, _("WxStaticText12")); + WxStaticText12 = new wxStaticText(NpgAuthors, ID_WXSTATICTEXT12, _("Gnome Designers"), wxDefaultPosition, wxDefaultSize, 0, _("WxStaticText12")); + WxStaticText12->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - BtnUpdateCheck = new wxButton(this, ID_BTNUPDATECHECK, _("&Check for updates"), wxPoint(201,357), wxSize(98,25), 0, wxDefaultValidator, _("BtnUpdateCheck")); + BtnUpdateCheck = new wxButton(this, ID_BTNUPDATECHECK, _("&Check for updates"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("BtnUpdateCheck")); + BtnUpdateCheck->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); - BtnOK = new wxButton(this, wxID_OK, _("&OK"), wxPoint(309,357), wxSize(75,25), 0, wxDefaultValidator, _("BtnOK")); + BtnOK = new wxButton(this, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("BtnOK")); + BtnOK->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif"))); SetTitle(_("About wxDev-C++")); SetIcon(wxNullIcon); - SetSize(8,8,400,424); + SetSize(8,8,408,432); Center(); ////GUI Items Creation End @@ -476,3 +511,11 @@ TempMainFrame->ActionUpdateCheckExecute(event); } } + +/* + * AboutDlgActivate + */ +void AboutDlg::AboutDlgActivate(wxActivateEvent& event) +{ + // insert your code here +} Modified: trunk/wxdevide/source/AboutDlg.h =================================================================== --- trunk/wxdevide/source/AboutDlg.h 2008-09-27 08:44:49 UTC (rev 6) +++ trunk/wxdevide/source/AboutDlg.h 2008-09-27 09:10:25 UTC (rev 7) @@ -49,6 +49,7 @@ virtual ~AboutDlg(); void HlkwxdevcppWebsiteHyperLink(wxHyperlinkEvent& event); void BtnUpdateCheckClick(wxCommandEvent& event); + void AboutDlgActivate(wxActivateEvent& event); private: //Do not add custom control declarations between Modified: trunk/wxdevide/source/AboutDlg.wxform =================================================================== --- trunk/wxdevide/source/AboutDlg.wxform 2008-09-27 08:44:49 UTC (rev 6) +++ trunk/wxdevide/source/AboutDlg.wxform 2008-09-27 09:10:25 UTC (rev 7) @@ -13,12 +13,13 @@ Font.Name = 'MS Sans Serif' Font.Style = [] OldCreateOrder = True - PopupMenu = MainForm.DesignerPopup + PopupMenu = DesignerPopup.Owner Visible = True OnCreate = FormCreate OnDestroy = FormDestroy OnResize = FormResize EVT_CLOSE = 'OnClose' + EVT_ACTIVATE = 'AboutDlgActivate' Wx_ICON.Data = {07544269746D617000000000} Wx_Name = 'AboutDlg' Wx_IDName = 'ID_DIALOG1' @@ -2911,11 +2912,12 @@ 49FFAB6E49FFAA6E49FFAA6E49FFAA6E4AFFAA6E49FFAB6E4AFFA96D48FFAB6F 4BFF} Wx_Class = 'wxStaticBitmap' + Wx_ControlOrientation = wxControlVertical Wx_Enabled = False Wx_GeneralStyle = [] Wx_IDName = 'ID_IMGBANNER' Wx_IDValue = 1002 -Wx_Alignment = [wxALIGN_TOP] + Wx_Alignment = [wxALIGN_TOP] Wx_StretchFactor = 1 end object NbkContainer: TWxNotebook @@ -2927,6 +2929,7 @@ TabIndex = 0 TabOrder = 3 Wx_Class = 'wxNotebook' + Wx_ControlOrientation = wxControlVertical Wx_EventList.Strings = ( 'EVT_UPDATE_UI:OnUpdateUI' 'EVT_NOTEBOOK_PAGE_CHANGED:OnPageChanged' @@ -2936,12 +2939,14 @@ Wx_Hidden = False Wx_NoteBookStyle = [] Wx_GeneralStyle = [] -Wx_Alignment = [wxEXPAND] + Wx_Alignment = [wxEXPAND] Wx_StretchFactor = 1 + Wx_BookAlignment = wxNB_DEFAULT object NpgVersion: TWxNoteBookPage Caption = 'Version Information' Wx_BKColor = clBlack Wx_Class = 'wxPanel' + Wx_ControlOrientation = wxControlVertical Wx_Default = False Wx_EventList.Strings = ( 'EVT_UPDATE_UI:OnUpdateUI') @@ -2966,6 +2971,7 @@ TabOrder = 0 Wx_BGColor = clBlack Wx_Class = 'wxStaticText' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_Hidden = False @@ -2988,6 +2994,7 @@ TabOrder = 1 Wx_BGColor = clBlack Wx_Class = 'wxStaticText' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_Hidden = False @@ -3004,6 +3011,7 @@ TabOrder = 2 Wx_BGColor = clBlack Wx_Class = 'wxStaticText' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_Hidden = False @@ -3020,6 +3028,7 @@ TabOrder = 3 Wx_BGColor = clBlack Wx_Class = 'wxStaticText' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_Hidden = False @@ -3036,6 +3045,7 @@ TabOrder = 4 Wx_BGColor = clBlack Wx_Class = 'wxStaticText' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_Hidden = False @@ -3052,6 +3062,7 @@ TabOrder = 5 Wx_BGColor = clBlack Wx_Class = 'wxStaticText' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_Hidden = False @@ -3076,6 +3087,7 @@ EVT_HYPERLINK = 'HlkwxdevcppWebsiteHyperLink' Wx_BGColor = clBlack Wx_Class = 'wxHyperlinkCtrl' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [wxNO_BORDER] Wx_Hidden = False @@ -3102,6 +3114,7 @@ EVT_HYPERLINK = 'HlkwxdevcppWebsiteHyperLink' Wx_BGColor = clBlack Wx_Class = 'wxHyperlinkCtrl' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [wxNO_BORDER] Wx_Hidden = False @@ -3128,6 +3141,7 @@ EVT_HYPERLINK = 'HlkwxdevcppWebsiteHyperLink' Wx_BGColor = clBlack Wx_Class = 'wxHyperlinkCtrl' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [wxNO_BORDER] Wx_Hidden = False @@ -3154,6 +3168,7 @@ EVT_HYPERLINK = 'HlkwxdevcppWebsiteHyperLink' Wx_BGColor = clBlack Wx_Class = 'wxHyperlinkCtrl' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [wxNO_BORDER] Wx_Hidden = False @@ -3168,6 +3183,7 @@ Caption = 'GNU General Public License' Wx_BKColor = clBlack Wx_Class = 'wxPanel' + Wx_ControlOrientation = wxControlVertical Wx_Default = False Wx_EventList.Strings = ( 'EVT_UPDATE_UI:OnUpdateUI') @@ -3810,17 +3826,17 @@ 'THE POSSIBILITY OF SUCH DAMAGES.' '' ' END OF TERMS AND CONDITIONS') - ScrollBars = ssVertical TabOrder = 0 Wx_BGColor = clBlack Wx_Class = 'wxTextCtrl' + Wx_ControlOrientation = wxControlVertical Wx_EditStyle = [wxTE_MULTILINE] Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_IDName = 'ID_MMOLICENSE' Wx_IDValue = 1033 Wx_MaxLength = 0 -Wx_Alignment = [wxEXPAND] + Wx_Alignment = [wxEXPAND] Wx_StretchFactor = 1 end end @@ -3828,6 +3844,7 @@ Caption = 'Authors' Wx_BKColor = clBlack Wx_Class = 'wxPanel' + Wx_ControlOrientation = wxControlVertical Wx_Default = False Wx_EventList.Strings = ( 'EVT_UPDATE_UI:OnUpdateUI') @@ -3846,6 +3863,7 @@ TabOrder = 0 Wx_BGColor = clBlack Wx_Class = 'wxStaticText' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_Hidden = False @@ -3862,6 +3880,7 @@ TabOrder = 1 Wx_BGColor = clBlack Wx_Class = 'wxStaticText' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_Hidden = False @@ -3878,6 +3897,7 @@ TabOrder = 2 Wx_BGColor = clBlack Wx_Class = 'wxStaticText' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_Hidden = False @@ -3894,6 +3914,7 @@ TabOrder = 3 Wx_BGColor = clBlack Wx_Class = 'wxStaticText' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_Hidden = False @@ -3910,6 +3931,7 @@ TabOrder = 4 Wx_BGColor = clBlack Wx_Class = 'wxStaticText' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_Hidden = False @@ -3926,6 +3948,7 @@ TabOrder = 5 Wx_BGColor = clBlack Wx_Class = 'wxStaticText' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_Hidden = False @@ -3942,6 +3965,7 @@ TabOrder = 6 Wx_BGColor = clBlack Wx_Class = 'wxStaticText' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_Hidden = False @@ -3958,6 +3982,7 @@ TabOrder = 7 Wx_BGColor = clBlack Wx_Class = 'wxStaticText' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_Hidden = False @@ -3974,6 +3999,7 @@ TabOrder = 8 Wx_BGColor = clBlack Wx_Class = 'wxStaticText' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_Hidden = False @@ -3990,6 +4016,7 @@ TabOrder = 9 Wx_BGColor = clBlack Wx_Class = 'wxStaticText' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_Hidden = False @@ -4006,6 +4033,7 @@ TabOrder = 10 Wx_BGColor = clBlack Wx_Class = 'wxStaticText' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_Hidden = False @@ -4022,6 +4050,7 @@ TabOrder = 11 Wx_BGColor = clBlack Wx_Class = 'wxStaticText' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_Hidden = False @@ -4038,6 +4067,7 @@ TabOrder = 12 Wx_BGColor = clBlack Wx_Class = 'wxStaticText' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_Hidden = False @@ -4054,6 +4084,7 @@ TabOrder = 13 Wx_BGColor = clBlack Wx_Class = 'wxStaticText' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_Hidden = False @@ -4070,6 +4101,7 @@ TabOrder = 14 Wx_BGColor = clBlack Wx_Class = 'wxStaticText' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_Hidden = False @@ -4086,6 +4118,7 @@ TabOrder = 15 Wx_BGColor = clBlack Wx_Class = 'wxStaticText' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_Hidden = False @@ -4102,6 +4135,7 @@ TabOrder = 16 Wx_BGColor = clBlack Wx_Class = 'wxStaticText' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_Hidden = False @@ -4118,6 +4152,7 @@ TabOrder = 17 Wx_BGColor = clBlack Wx_Class = 'wxStaticText' + Wx_ControlOrientation = wxControlVertical Wx_FGColor = clBlack Wx_GeneralStyle = [] Wx_Hidden = False @@ -4138,6 +4173,7 @@ Wx_BKColor = clBlack Wx_ButtonStyle = [] Wx_Class = 'wxButton' + Wx_ControlOrientation = wxControlVertical Wx_Default = False Wx_EventList.Strings = ( 'EVT_BUTTON:OnClick' @@ -4158,6 +4194,7 @@ Wx_BKColor = clBlack Wx_ButtonStyle = [] Wx_Class = 'wxButton' + Wx_ControlOrientation = wxControlVertical Wx_Default = False Wx_EventList.Strings = ( 'EVT_BUTTON:OnClick' Modified: trunk/wxdevide/source/DevCpp.dev =================================================================== --- trunk/wxdevide/source/DevCpp.dev 2008-09-27 08:44:49 UTC (rev 6) +++ trunk/wxdevide/source/DevCpp.dev 2008-09-27 09:10:25 UTC (rev 7) @@ -1,7 +1,7 @@ [Project] FileName=DevCpp.dev Name=DevCpp -UnitCount=91 +UnitCount=94 PchHead=-1 PchSource=-1 Ver=3 @@ -104,7 +104,7 @@ Major=0 Minor=1 Release=1 -Build=1706 +Build=1741 LanguageID=1033 CharsetID=1252 CompanyName=Sof.T @@ -1016,3 +1016,32 @@ OverrideBuildCmd=0 BuildCmd= +[Unit92] +FileName=EnviroFrm.cpp +CompileCpp=1 +Folder=DevCpp +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit93] +FileName=EnviroFrm.h +CompileCpp=1 +Folder=DevCpp +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit94] +FileName=EnviroFrm.wxform +Folder=DevCpp +Compile=0 +Link=0 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + Modified: trunk/wxdevide/source/DevCpp.layout =================================================================== --- trunk/wxdevide/source/DevCpp.layout 2008-09-27 08:44:49 UTC (rev 6) +++ trunk/wxdevide/source/DevCpp.layout 2008-09-27 09:10:25 UTC (rev 7) @@ -6,21 +6,21 @@ Open=0 Top=0 [Editor_1] -CursorCol=1 -CursorRow=451 -TopLine=449 +CursorCol=6 +CursorRow=512 +TopLine=484 LeftChar=1 Open=0 Top=0 [Editor_2] CursorCol=18 CursorRow=58 -TopLine=32 +TopLine=58 LeftChar=1 Open=0 Top=0 [Editors] -Focused=50 +Focused=93 Order= [Editor_3] Open=0 @@ -53,16 +53,16 @@ [Editor_7] Open=0 Top=0 -CursorCol=20 -CursorRow=3357 -TopLine=3337 +CursorCol=1 +CursorRow=3358 +TopLine=3330 LeftChar=1 [Editor_8] Open=0 Top=0 CursorCol=50 CursorRow=672 -TopLine=652 +TopLine=644 LeftChar=1 [Editor_9] Open=0 @@ -638,3 +638,24 @@ CursorRow=1513 TopLine=1488 LeftChar=1 +[Editor_91] +Open=0 +Top=0 +CursorCol=3 +CursorRow=320 +TopLine=292 +LeftChar=1 +[Editor_92] +Open=0 +Top=0 +CursorCol=1 +CursorRow=1 +TopLine=1 +LeftChar=1 +[Editor_93] +Open=0 +Top=0 +CursorCol=1 +CursorRow=1 +TopLine=1 +LeftChar=1 Added: trunk/wxdevide/source/EnviroFrm.cpp =================================================================== --- trunk/wxdevide/source/EnviroFrm.cpp (rev 0) +++ trunk/wxdevide/source/EnviroFrm.cpp 2008-09-27 09:10:25 UTC (rev 7) @@ -0,0 +1,369 @@ +//--------------------------------------------------------------------------- +// +// Name: EnviroFrm.cpp +// Author: Malcolm +// Created: 15/09/2008 15:10:09 +// Description: TEnviroForm class implementation +// +//--------------------------------------------------------------------------- + +#include "EnviroFrm.h" + +//Do not add custom headers +//wxDev-C++ designer will remove them +////Header Include Start +#include "Images/TEnviroForm_WxBitmapButton1_XPM.xpm" +#include "Images/TEnviroForm_btnBrwSplash_XPM.xpm" +#include "Images/TEnviroForm_btnBrwLang_XPM.xpm" +#include "Images/TEnviroForm_btnBrwIcon_XPM.xpm" +#include "Images/TEnviroForm_btnOutputbrws_XPM.xpm" +#include "Images/TEnviroForm_btnDefBrws_XPM.xpm" +#include "Images/TEnviroForm_btnAltConfig_XPM.xpm" +////Header Include End + +//---------------------------------------------------------------------------- +// TEnviroForm +//---------------------------------------------------------------------------- +//Add Custom Events only in the appropriate block. +//Code added in other places will be removed by wxDev-C++ +////Event Table Start +BEGIN_EVENT_TABLE(TEnviroForm,wxDialog) + ////Manual Code Start + ////Manual Code End + + EVT_CLOSE(TEnviroForm::OnClose) +END_EVENT_TABLE() +////Event Table End + +TEnviroForm::TEnviroForm(wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &position, const wxSize& size, long style) +: wxDialog(parent, id, title, position, size, style) +{ + CreateGUIControls(); +} + +TEnviroForm::~TEnviroForm() +{ +} + +void TEnviroForm::CreateGUIControls() +{ + //Do not add custom code between + //GUI Items Creation Start and GUI Items Creation End. + //wxDev-C++ designer will remove them. + //Add the custom code before or after the blocks + ////GUI Items Creation Start + + EnvOptDlgSizer = new wxBoxSizer(wxVERTICAL); + this->SetSizer(EnvOptDlgSizer); + this->SetAutoLayout(true); + + PagesMain = new wxNotebook(this, ID_PAGESMAIN, wxDefaultPosition, wxDefaultSize, wxNB_DEFAULT | wxNB_MULTILINE); + EnvOptDlgSizer->Add(PagesMain,1,wxALIGN_CENTER | wxALL,5); + + tabGeneral = new wxPanel(PagesMain, ID_TABGENERAL, wxDefaultPosition, wxDefaultSize); + PagesMain->AddPage(tabGeneral, _("General")); + + GeneralBoxSizer = new wxBoxSizer(wxVERTICAL); + tabGeneral->SetSizer(GeneralBoxSizer); + tabGeneral->SetAutoLayout(true); + + cbSingleInstance = new wxCheckBox(tabGeneral, ID_CBSINGLEINSTANCE, _("Allow only one instance of wxDev-C++"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("cbSingleInstance")); + GeneralBoxSizer->Add(cbSingleInstance,0,wxALIGN_LEFT | wxALL,5); + + cbBackups = new wxCheckBox(tabGeneral, ID_CBBACKUPS, _("Create File Backups"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("cbBackups")); + GeneralBoxSizer->Add(cbBackups,0,wxALIGN_LEFT | wxALL,5); + + cbMinOnRun = new wxCheckBox(tabGeneral, ID_CBMINONRUN, _("Minimize on Run"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("cbMinOnRun")); + GeneralBoxSizer->Add(cbMinOnRun,0,wxALIGN_LEFT | wxALL,5); + + cbShowBars = new wxCheckBox(tabGeneral, ID_CBSHOWBARS, _("Show Toolbars in Full Screen"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("cbShowBars")); + GeneralBoxSizer->Add(cbShowBars,0,wxALIGN_LEFT | wxALL,5); + + cbShowMenu = new wxCheckBox(tabGeneral, ID_CBSHOWMENU, _("Show Menu in Full Screen"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("cbShowMenu")); + GeneralBoxSizer->Add(cbShowMenu,0,wxALIGN_LEFT | wxALL,5); + + cbdblFiles = new wxCheckBox(tabGeneral, ID_CBDBLFILES, _("Double-click to open Project Inspector files"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("cbdblFiles")); + GeneralBoxSizer->Add(cbdblFiles,0,wxALIGN_LEFT | wxALL,5); + + RadioStaticSizer = new wxBoxSizer(wxHORIZONTAL); + GeneralBoxSizer->Add(RadioStaticSizer, 0, wxALIGN_CENTER | wxALL, 5); + + wxArrayString arrayStringFor_WxRadioBox1; + arrayStringFor_WxRadioBox1.Add(_("All Project Files")); + arrayStringFor_WxRadioBox1.Add(_("Only First Project File")); + arrayStringFor_WxRadioBox1.Add(_("None")); + WxRadioBox1 = new wxRadioBox(tabGeneral, ID_WXRADIOBOX1, _("Auto Open"), wxDefaultPosition, wxDefaultSize, arrayStringFor_WxRadioBox1, 1, wxRA_SPECIFY_COLS, wxDefaultValidator, _("WxRadioBox1")); + WxRadioBox1->SetSelection(0); + RadioStaticSizer->Add(WxRadioBox1,0,wxALIGN_CENTER | wxALL,5); + + wxStaticBox* gbDebugger_StaticBoxObj = new wxStaticBox(tabGeneral, wxID_ANY, _("Debug Variable Browser")); + gbDebugger = new wxStaticBoxSizer(gbDebugger_StaticBoxObj, wxVERTICAL); + RadioStaticSizer->Add(gbDebugger, 0, wxALIGN_CENTER | wxALL, 5); + + cbWatchHint = new wxCheckBox(tabGeneral, ID_CBWATCHHINT, _("Watch variable under mouse"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("cbWatchHint")); + gbDebugger->Add(cbWatchHint,0,wxALIGN_LEFT | wxALL,5); + + cbWatchError = new wxCheckBox(tabGeneral, ID_CBWATCHERROR, _("Report watch errors"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("cbWatchError")); + gbDebugger->Add(cbWatchError,0,wxALIGN_LEFT | wxALL,5); + + tabInterface = new wxPanel(PagesMain, ID_TABINTERFACE, wxDefaultPosition, wxDefaultSize); + PagesMain->AddPage(tabInterface, _("Interface")); + + InterfaceSizer = new wxBoxSizer(wxVERTICAL); + tabInterface->SetSizer(InterfaceSizer); + tabInterface->SetAutoLayout(true); + + WxFlexGridSizer1 = new wxFlexGridSizer(0, 2, 0, 0); + InterfaceSizer->Add(WxFlexGridSizer1, 0, wxALIGN_CENTER | wxALL, 5); + + lblMRU = new wxStaticText(tabInterface, ID_LBLMRU, _("Files to retain in Recently Used List:"), wxDefaultPosition, wxDefaultSize, 0, _("lblMRU")); + WxFlexGridSizer1->Add(lblMRU,0,wxALIGN_CENTER | wxALL,5); + + seMRUMax = new wxSpinCtrl(tabInterface, ID_SEMRUMAX, _("0"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 100, 0); + WxFlexGridSizer1->Add(seMRUMax,0,wxALIGN_CENTER | wxALL,5); + + lblmsgTabs = new wxStaticText(tabInterface, ID_LBLMSGTABS, _("Message Window Tabs:"), wxDefaultPosition, wxDefaultSize, 0, _("lblmsgTabs")); + WxFlexGridSizer1->Add(lblmsgTabs,0,wxALIGN_CENTER | wxALL,5); + + wxArrayString arrayStringFor_cboTabsTop; + cboTabsTop = new wxComboBox(tabInterface, ID_CBOTABSTOP, _("cboTabsTop"), wxDefaultPosition, wxDefaultSize, arrayStringFor_cboTabsTop, 0, wxDefaultValidator, _("cboTabsTop")); + WxFlexGridSizer1->Add(cboTabsTop,0,wxALIGN_CENTER | wxALL,5); + + lblLang = new wxStaticText(tabInterface, ID_LBLLANG, _("Language:"), wxDefaultPosition, wxDefaultSize, 0, _("lblLang")); + WxFlexGridSizer1->Add(lblLang,0,wxALIGN_CENTER | wxALL,5); + + wxArrayString arrayStringFor_cboLang; + cboLang = new wxComboBox(tabInterface, ID_CBOLANG, _("cboLang"), wxDefaultPosition, wxDefaultSize, arrayStringFor_cboLang, 0, wxDefaultValidator, _("cboLang")); + WxFlexGridSizer1->Add(cboLang,0,wxALIGN_CENTER | wxALL,5); + + lblTheme = new wxStaticText(tabInterface, ID_LBLTHEME, _("Theme:"), wxDefaultPosition, wxDefaultSize, 0, _("lblTheme")); + WxFlexGridSizer1->Add(lblTheme,0,wxALIGN_CENTER | wxALL,5); + + wxArrayString arrayStringFor_cboTheme; + cboTheme = new wxComboBox(tabInterface, ID_CBOTHEME, _("cboTheme"), wxDefaultPosition, wxDefaultSize, arrayStringFor_cboTheme, 0, wxDefaultValidator, _("cboTheme")); + WxFlexGridSizer1->Add(cboTheme,0,wxALIGN_CENTER | wxALL,5); + + cbNoSplashScreen = new wxCheckBox(tabInterface, ID_CBNOSPLASHSCREEN, _("No Splash Screen on startup"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("cbNoSplashScreen")); + InterfaceSizer->Add(cbNoSplashScreen,0,wxALIGN_LEFT | wxALL,5); + + cbXPTheme = new wxCheckBox(tabInterface, ID_CBXPTHEME, _("Use XP Theme"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("cbXPTheme")); + InterfaceSizer->Add(cbXPTheme,0,wxALIGN_LEFT | wxALL,5); + + cbNativeDocks = new wxCheckBox(tabInterface, ID_CBNATIVEDOCKS, _("Use Native Docking Windows"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("cbNativeDocks")); + InterfaceSizer->Add(cbNativeDocks,0,wxALIGN_LEFT | wxALL,5); + + RadioStaticBoxSizer2 = new wxBoxSizer(wxHORIZONTAL); + InterfaceSizer->Add(RadioStaticBoxSizer2, 0, wxALIGN_CENTER | wxALL, 5); + + wxArrayString arrayStringFor_rgbOpenStyle; + arrayStringFor_rgbOpenStyle.Add(_("Windows 2k (sidebar)")); + arrayStringFor_rgbOpenStyle.Add(_("Windows 9x")); + arrayStringFor_rgbOpenStyle.Add(_("Windows 3.1")); + rgbOpenStyle = new wxRadioBox(tabInterface, ID_RGBOPENSTYLE, _("Open/Save Dialog Style"), wxDefaultPosition, wxDefaultSize, arrayStringFor_rgbOpenStyle, 1, wxRA_SPECIFY_COLS, wxDefaultValidator, _("rgbOpenStyle")); + rgbOpenStyle->SetSelection(0); + RadioStaticBoxSizer2->Add(rgbOpenStyle,0,wxALIGN_LEFT | wxALL,5); + + wxStaticBox* WxStaticBoxSizer1_StaticBoxObj = new wxStaticBox(tabInterface, wxID_ANY, _("Compilation Progress Window ")); + WxStaticBoxSizer1 = new wxStaticBoxSizer(WxStaticBoxSizer1_StaticBoxObj, wxVERTICAL); + RadioStaticBoxSizer2->Add(WxStaticBoxSizer1, 0, wxALIGN_CENTER | wxALL, 5); + + cbShowProgress = new wxCheckBox(tabInterface, ID_CBSHOWPROGRESS, _("&Show during compilation"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("cbShowProgress")); + WxStaticBoxSizer1->Add(cbShowProgress,0,wxALIGN_CENTER | wxALL,5); + + cbAutoCloseProgress = new wxCheckBox(tabInterface, ID_CBAUTOCLOSEPROGRESS, _("&Auto close after compile"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("cbAutoCloseProgress")); + WxStaticBoxSizer1->Add(cbAutoCloseProgress,0,wxALIGN_CENTER | wxALL,5); + + tabPaths = new wxPanel(PagesMain, ID_TABPATHS, wxDefaultPosition, wxDefaultSize); + PagesMain->AddPage(tabPaths, _("Files && Directories")); + + FilesBoxSizer = new wxBoxSizer(wxVERTICAL); + tabPaths->SetSizer(FilesBoxSizer); + tabPaths->SetAutoLayout(true); + + wxStaticBox* WxStaticBoxSizer2_StaticBoxObj = new wxStaticBox(tabPaths, wxID_ANY, _(" Alternate Configuration File ")); + WxStaticBoxSizer2 = new wxStaticBoxSizer(WxStaticBoxSizer2_StaticBoxObj, wxVERTICAL); + FilesBoxSizer->Add(WxStaticBoxSizer2, 0, wxEXPAND | wxALL, 5); + + chkAltConfig = new wxCheckBox(tabPaths, ID_CHKALTCONFIG, _("Use this alternate configuration file"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("chkAltConfig")); + WxStaticBoxSizer2->Add(chkAltConfig,0,wxALIGN_LEFT | wxEXPAND | wxALL,5); + + AltConfSizer = new wxBoxSizer(wxHORIZONTAL); + WxStaticBoxSizer2->Add(AltConfSizer, 1, wxALIGN_LEFT | wxALIGN_RIGHT | wxEXPAND | wxALL, 5); + + edAltConfig = new wxTextCtrl(tabPaths, ID_EDALTCONFIG, _(""), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("edAltConfig")); + AltConfSizer->Add(edAltConfig,1,wxALIGN_LEFT | wxEXPAND | wxALL,5); + +... [truncated message content] |