|
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(NpgAut...
[truncated message content] |
|
From: <ni...@us...> - 2008-10-03 12:00:15
|
Revision: 8
http://wxdevide.svn.sourceforge.net/wxdevide/?rev=8&view=rev
Author: ninjanl
Date: 2008-10-03 12:00:06 +0000 (Fri, 03 Oct 2008)
Log Message:
-----------
should add the $ ID : $ stuff
Modified Paths:
--------------
trunk/wxdevide/source/AboutDlg.cpp
trunk/wxdevide/source/AboutDlg.h
trunk/wxdevide/source/AddToDoFrm.cpp
trunk/wxdevide/source/AddToDoFrm.h
trunk/wxdevide/source/CFGData.cpp
trunk/wxdevide/source/CFGData.h
trunk/wxdevide/source/ColorEditDlg.cpp
trunk/wxdevide/source/ColorEditDlg.h
trunk/wxdevide/source/CompileProgressForm.cpp
trunk/wxdevide/source/CompileProgressForm.h
trunk/wxdevide/source/CompileProgressFrm.cpp
trunk/wxdevide/source/CompileProgressFrm.h
trunk/wxdevide/source/Compiler.cpp
trunk/wxdevide/source/Compiler.h
trunk/wxdevide/source/CompilerFunctions.cpp
trunk/wxdevide/source/CompilerFunctions.h
trunk/wxdevide/source/CustomComponents.cpp
trunk/wxdevide/source/CustomComponents.h
trunk/wxdevide/source/DebugHeader.h
trunk/wxdevide/source/DelphiSub.cpp
trunk/wxdevide/source/DelphiSub.h
trunk/wxdevide/source/DevCfg.cpp
trunk/wxdevide/source/DevResource.h
trunk/wxdevide/source/DevTheme.cpp
trunk/wxdevide/source/DevTheme.h
trunk/wxdevide/source/ELDsgnr.cpp
trunk/wxdevide/source/ELDsgnr.h
trunk/wxdevide/source/Editor.cpp
trunk/wxdevide/source/Editor.h
trunk/wxdevide/source/EditorOptfrm.cpp
trunk/wxdevide/source/EditorOptfrm.h
trunk/wxdevide/source/EnviroFrm.cpp
trunk/wxdevide/source/EnviroFrm.h
trunk/wxdevide/source/FileAssocs.cpp
trunk/wxdevide/source/FileAssocs.h
trunk/wxdevide/source/FilePropertiesfrm.cpp
trunk/wxdevide/source/FilePropertiesfrm.h
trunk/wxdevide/source/GotoLineFrm.cpp
trunk/wxdevide/source/GotoLineFrm.h
trunk/wxdevide/source/ImageResource.h
trunk/wxdevide/source/LangFrm.cpp
trunk/wxdevide/source/LangFrm.h
trunk/wxdevide/source/LangIDs.h
trunk/wxdevide/source/LangResource.h
trunk/wxdevide/source/Macros.cpp
trunk/wxdevide/source/Macros.h
trunk/wxdevide/source/MainFrm.cpp
trunk/wxdevide/source/MainFrm.h
trunk/wxdevide/source/MultiLangSupport.cpp
trunk/wxdevide/source/MultiLangSupport.h
trunk/wxdevide/source/NewProjectFrm.cpp
trunk/wxdevide/source/NewProjectFrm.h
trunk/wxdevide/source/NewProjectResource.h
trunk/wxdevide/source/PackmanExitCodesU.h
trunk/wxdevide/source/PrjTypes.cpp
trunk/wxdevide/source/PrjTypes.h
trunk/wxdevide/source/Project.cpp
trunk/wxdevide/source/Project.h
trunk/wxdevide/source/SearchCenter.cpp
trunk/wxdevide/source/SearchCenter.h
trunk/wxdevide/source/SplashFrm.cpp
trunk/wxdevide/source/SplashFrm.h
trunk/wxdevide/source/Template.cpp
trunk/wxdevide/source/Template.h
trunk/wxdevide/source/ThemeImages.h
trunk/wxdevide/source/ThemeResource.h
trunk/wxdevide/source/ToolEditForm.cpp
trunk/wxdevide/source/ToolEditForm.h
trunk/wxdevide/source/ToolEditFrm.cpp
trunk/wxdevide/source/ToolEditFrm.h
trunk/wxdevide/source/ToolFrm.cpp
trunk/wxdevide/source/ToolFrm.h
trunk/wxdevide/source/Utils.cpp
trunk/wxdevide/source/Utils.h
trunk/wxdevide/source/Version.h
trunk/wxdevide/source/WebUpdateDlg.cpp
trunk/wxdevide/source/WebUpdateDlg.h
trunk/wxdevide/source/cfgTypes.h
trunk/wxdevide/source/devFileMonitor.cpp
trunk/wxdevide/source/devFileMonitor.h
trunk/wxdevide/source/devFileMonitorThread.cpp
trunk/wxdevide/source/devFileMonitorThread.h
trunk/wxdevide/source/devMonitorTypes.h
trunk/wxdevide/source/devcfg.h
trunk/wxdevide/source/devcppApp.cpp
trunk/wxdevide/source/devcppApp.h
trunk/wxdevide/source/devcppApp.rc
trunk/wxdevide/source/oysUtils.cpp
trunk/wxdevide/source/oysUtils.h
trunk/wxdevide/source/wx_pch.h
Property Changed:
----------------
trunk/wxdevide/source/AboutDlg.cpp
trunk/wxdevide/source/AboutDlg.h
trunk/wxdevide/source/AddToDoFrm.cpp
trunk/wxdevide/source/AddToDoFrm.h
trunk/wxdevide/source/CFGData.cpp
trunk/wxdevide/source/CFGData.h
trunk/wxdevide/source/ColorEditDlg.cpp
trunk/wxdevide/source/ColorEditDlg.h
trunk/wxdevide/source/CompileProgressForm.cpp
trunk/wxdevide/source/CompileProgressForm.h
trunk/wxdevide/source/CompileProgressFrm.cpp
trunk/wxdevide/source/CompileProgressFrm.h
trunk/wxdevide/source/Compiler.cpp
trunk/wxdevide/source/Compiler.h
trunk/wxdevide/source/CompilerFunctions.cpp
trunk/wxdevide/source/CompilerFunctions.h
trunk/wxdevide/source/CustomComponents.cpp
trunk/wxdevide/source/CustomComponents.h
trunk/wxdevide/source/DebugHeader.h
trunk/wxdevide/source/DelphiSub.cpp
trunk/wxdevide/source/DelphiSub.h
trunk/wxdevide/source/DevCfg.cpp
trunk/wxdevide/source/DevResource.cpp
trunk/wxdevide/source/DevResource.h
trunk/wxdevide/source/DevTheme.cpp
trunk/wxdevide/source/DevTheme.h
trunk/wxdevide/source/ELDsgnr.cpp
trunk/wxdevide/source/ELDsgnr.h
trunk/wxdevide/source/Editor.cpp
trunk/wxdevide/source/Editor.h
trunk/wxdevide/source/EditorOptfrm.cpp
trunk/wxdevide/source/EditorOptfrm.h
trunk/wxdevide/source/EnviroFrm.cpp
trunk/wxdevide/source/EnviroFrm.h
trunk/wxdevide/source/FileAssocs.cpp
trunk/wxdevide/source/FileAssocs.h
trunk/wxdevide/source/FilePropertiesfrm.cpp
trunk/wxdevide/source/FilePropertiesfrm.h
trunk/wxdevide/source/GotoLineFrm.cpp
trunk/wxdevide/source/GotoLineFrm.h
trunk/wxdevide/source/ImageResource.h
trunk/wxdevide/source/LangFrm.cpp
trunk/wxdevide/source/LangFrm.h
trunk/wxdevide/source/LangIDs.h
trunk/wxdevide/source/LangResource.h
trunk/wxdevide/source/Macros.cpp
trunk/wxdevide/source/Macros.h
trunk/wxdevide/source/MainFrm.cpp
trunk/wxdevide/source/MainFrm.h
trunk/wxdevide/source/MultiLangSupport.cpp
trunk/wxdevide/source/MultiLangSupport.h
trunk/wxdevide/source/NewProjectFrm.cpp
trunk/wxdevide/source/NewProjectFrm.h
trunk/wxdevide/source/NewProjectResource.h
trunk/wxdevide/source/PackmanExitCodesU.h
trunk/wxdevide/source/PrjTypes.cpp
trunk/wxdevide/source/PrjTypes.h
trunk/wxdevide/source/Project.cpp
trunk/wxdevide/source/Project.h
trunk/wxdevide/source/SearchCenter.cpp
trunk/wxdevide/source/SearchCenter.h
trunk/wxdevide/source/SplashFrm.cpp
trunk/wxdevide/source/SplashFrm.h
trunk/wxdevide/source/Template.cpp
trunk/wxdevide/source/Template.h
trunk/wxdevide/source/ThemeImages.h
trunk/wxdevide/source/ThemeResource.h
trunk/wxdevide/source/ToolEditForm.cpp
trunk/wxdevide/source/ToolEditForm.h
trunk/wxdevide/source/ToolEditFrm.cpp
trunk/wxdevide/source/ToolEditFrm.h
trunk/wxdevide/source/ToolFrm.cpp
trunk/wxdevide/source/ToolFrm.h
trunk/wxdevide/source/Utils.cpp
trunk/wxdevide/source/Utils.h
trunk/wxdevide/source/Version.h
trunk/wxdevide/source/WebUpdateDlg.cpp
trunk/wxdevide/source/WebUpdateDlg.h
trunk/wxdevide/source/cfgTypes.h
trunk/wxdevide/source/devFileMonitor.cpp
trunk/wxdevide/source/devFileMonitor.h
trunk/wxdevide/source/devFileMonitorThread.cpp
trunk/wxdevide/source/devFileMonitorThread.h
trunk/wxdevide/source/devMonitorTypes.h
trunk/wxdevide/source/devcfg.h
trunk/wxdevide/source/devcppApp.cpp
trunk/wxdevide/source/devcppApp.h
trunk/wxdevide/source/devcppApp.rc
trunk/wxdevide/source/oysUtils.cpp
trunk/wxdevide/source/oysUtils.h
trunk/wxdevide/source/wx_pch.h
Modified: trunk/wxdevide/source/AboutDlg.cpp
===================================================================
--- trunk/wxdevide/source/AboutDlg.cpp 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/AboutDlg.cpp 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-//
+//$Id : XXXXXX $
// Name: AboutDlg.cpp
// Author: Sof.T
// Created: 23/01/2007 22:21:49
Property changes on: trunk/wxdevide/source/AboutDlg.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/AboutDlg.h
===================================================================
--- trunk/wxdevide/source/AboutDlg.h 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/AboutDlg.h 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-//
+// $Id : XXXXXX $
// Name: AboutDlg.h
// Author: Sof.T
// Created: 23/01/2007 22:21:49
Property changes on: trunk/wxdevide/source/AboutDlg.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/AddToDoFrm.cpp
===================================================================
--- trunk/wxdevide/source/AddToDoFrm.cpp 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/AddToDoFrm.cpp 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-//
+//$Id : XXXXXX $
// Name: AddToDoFrm.cpp
// Author: Sof.T
// Created: 25/01/2007 06:28:00
Property changes on: trunk/wxdevide/source/AddToDoFrm.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/AddToDoFrm.h
===================================================================
--- trunk/wxdevide/source/AddToDoFrm.h 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/AddToDoFrm.h 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-//
+//$Id : XXXXXX $
// Name: AddToDoFrm.h
// Author: Sof.T
// Created: 25/01/2007 06:28:00
Property changes on: trunk/wxdevide/source/AddToDoFrm.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/CFGData.cpp
===================================================================
--- trunk/wxdevide/source/CFGData.cpp 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/CFGData.cpp 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,3 +1,12 @@
+//---------------------------------------------------------------------------
+//$Id : XXXXXX $
+// Name: CFGData.cpp
+// Author: Sof.T
+// Created: 29/01/2007 19:21:03
+// Description: CFGData class implementation
+//
+//---------------------------------------------------------------------------
+
#include "CFGData.h"
#include <wx/wfstream.h> // So that we can use wxFileInputStream
Property changes on: trunk/wxdevide/source/CFGData.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/CFGData.h
===================================================================
--- trunk/wxdevide/source/CFGData.h 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/CFGData.h 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,4 +1,13 @@
+//---------------------------------------------------------------------------
+//$Id : XXXXXX $
+// Name: CFGData.h
+// Author: Sof.T
+// Created: 29/01/2007 19:21:03
+// Description:
+//
+//---------------------------------------------------------------------------
+
#ifndef CFGDATA_H
#define CFGDATA_H
Property changes on: trunk/wxdevide/source/CFGData.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/ColorEditDlg.cpp
===================================================================
--- trunk/wxdevide/source/ColorEditDlg.cpp 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/ColorEditDlg.cpp 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-//
+//$Id : XXXXXX $
// Name: ColorEditDlg.cpp
// Author: Sof.T
// Created: 25/01/2007 15:21:09
Property changes on: trunk/wxdevide/source/ColorEditDlg.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/ColorEditDlg.h
===================================================================
--- trunk/wxdevide/source/ColorEditDlg.h 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/ColorEditDlg.h 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-//
+//$Id : XXXXXX $
// Name: ColorEditDlg.h
// Author: Sof.T
// Created: 25/01/2007 15:21:09
Property changes on: trunk/wxdevide/source/ColorEditDlg.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/CompileProgressForm.cpp
===================================================================
--- trunk/wxdevide/source/CompileProgressForm.cpp 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/CompileProgressForm.cpp 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-//
+//$Id : XXXXXX $
// Name: CompileProgressForm.cpp
// Author: Programming
// Created: 11/04/2008 08:48:26
Property changes on: trunk/wxdevide/source/CompileProgressForm.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/CompileProgressForm.h
===================================================================
--- trunk/wxdevide/source/CompileProgressForm.h 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/CompileProgressForm.h 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-//
+//$Id : XXXXXX $
// Name: CompileProgressForm.h
// Author: Programming
// Created: 11/04/2008 08:48:26
Property changes on: trunk/wxdevide/source/CompileProgressForm.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/CompileProgressFrm.cpp
===================================================================
--- trunk/wxdevide/source/CompileProgressFrm.cpp 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/CompileProgressFrm.cpp 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-//
+//$Id : XXXXXX $
// Name: CompileProgressFrm.cpp
// Author: Sof.T
// Created: 11/04/2008 08:49:59
Property changes on: trunk/wxdevide/source/CompileProgressFrm.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/CompileProgressFrm.h
===================================================================
--- trunk/wxdevide/source/CompileProgressFrm.h 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/CompileProgressFrm.h 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-//
+//$Id : XXXXXX $
// Name: CompileProgressFrm.h
// Author: Sof.T
// Created: 11/04/2008 08:49:59
Property changes on: trunk/wxdevide/source/CompileProgressFrm.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/Compiler.cpp
===================================================================
--- trunk/wxdevide/source/Compiler.cpp 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/Compiler.cpp 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,3 +1,12 @@
+//---------------------------------------------------------------------------
+//$Id : XXXXXX $
+// Name: Compiler.cpp
+// Author: Sof.T
+// Created: 29/01/2007 19:21:03
+// Description: Compiler class implementation
+//
+//---------------------------------------------------------------------------
+
#include "Compiler.h"
#include "MainFrm.h"
#include "devcppApp.h"
Property changes on: trunk/wxdevide/source/Compiler.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/Compiler.h
===================================================================
--- trunk/wxdevide/source/Compiler.h 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/Compiler.h 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,7 +1,16 @@
+//---------------------------------------------------------------------------
+//$Id : XXXXXX $
+// Name: Compiler.h
+// Author: Sof.T
+// Created: 29/01/2007 19:21:03
+// Description:
+//
+//---------------------------------------------------------------------------
+
#ifndef COMPILER_H
#define COMPILER_H
/*
- $Id: compiler.pas,v 1.29 2006/11/08 07:59:03 gururamnath Exp $
+ $Id$
This file is part of Dev-C++
Copyright (c) 2004 Bloodshed Software
Property changes on: trunk/wxdevide/source/Compiler.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/CompilerFunctions.cpp
===================================================================
--- trunk/wxdevide/source/CompilerFunctions.cpp 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/CompilerFunctions.cpp 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,3 +1,12 @@
+//---------------------------------------------------------------------------
+//$Id : XXXXXX $
+// Name: CompilerFunctions.cpp
+// Author: Sof.T
+// Created: 29/01/2007 19:21:03
+// Description: CompilerFunctions class implementation
+//
+//---------------------------------------------------------------------------
+
#include "CompilerFunctions.h"
#include "DebugHeader.h"
Property changes on: trunk/wxdevide/source/CompilerFunctions.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/CompilerFunctions.h
===================================================================
--- trunk/wxdevide/source/CompilerFunctions.h 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/CompilerFunctions.h 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,3 +1,11 @@
+//---------------------------------------------------------------------------
+//$Id : XXXXXX $
+// Name: CompilerFunctions.h
+// Author: Sof.T
+// Created: 29/01/2007 19:21:03
+// Description:
+//---------------------------------------------------------------------------
+
#ifndef COMPILER_FUNCTIONS_H
#define COMPILER_FUNCTIONS_H
Property changes on: trunk/wxdevide/source/CompilerFunctions.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/CustomComponents.cpp
===================================================================
--- trunk/wxdevide/source/CustomComponents.cpp 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/CustomComponents.cpp 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,3 +1,12 @@
+//---------------------------------------------------------------------------
+//$Id : XXXXXX $
+// Name: CustomComponents.cpp
+// Author: Sof.T
+// Created: 29/01/2007 19:21:03
+// Description: CustomComponents class implementation
+//
+//---------------------------------------------------------------------------
+
#include "CustomComponents.h"
#include "DebugHeader.h"
Property changes on: trunk/wxdevide/source/CustomComponents.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/CustomComponents.h
===================================================================
--- trunk/wxdevide/source/CustomComponents.h 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/CustomComponents.h 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,3 +1,11 @@
+//---------------------------------------------------------------------------
+//$Id : XXXXXX $
+// Name: CustomComponents.h
+// Author: Sof.T
+// Created: 29/01/2007 19:21:03
+// Description:
+//---------------------------------------------------------------------------
+
#ifndef CUSTOMCOMPONENTS_H
#define CUSTOMCOMPONENTS_H
Property changes on: trunk/wxdevide/source/CustomComponents.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/DebugHeader.h
===================================================================
--- trunk/wxdevide/source/DebugHeader.h 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/DebugHeader.h 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,4 +1,13 @@
+//---------------------------------------------------------------------------
+//$Id : XXXXXX $
+// Name: DebugHeader.h
+// Author: Sof.T
+// Created: 29/01/2007 19:21:03
+// Description:
+//
+//---------------------------------------------------------------------------
+
#ifndef DEBUG_HEADER_H
#define DEBUG_HEADER_H
//comment the following line out to remove debugging
Property changes on: trunk/wxdevide/source/DebugHeader.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/DelphiSub.cpp
===================================================================
--- trunk/wxdevide/source/DelphiSub.cpp 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/DelphiSub.cpp 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,3 +1,12 @@
+//---------------------------------------------------------------------------
+//$Id : XXXXXX $
+// Name: DelphiSub.cpp
+// Author: Sof.T
+// Created: 29/01/2007 19:21:03
+// Description: DelphiSub class implementation
+//
+//---------------------------------------------------------------------------
+
#include "DelphiSub.h"
#include <wx/textfile.h>
Property changes on: trunk/wxdevide/source/DelphiSub.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/DelphiSub.h
===================================================================
--- trunk/wxdevide/source/DelphiSub.h 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/DelphiSub.h 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,3 +1,12 @@
+//---------------------------------------------------------------------------
+//$Id : XXXXXX $
+// Name: DelphiSub.h
+// Author: Sof.T
+// Created: 29/01/2007 19:21:03
+// Description:
+//
+//---------------------------------------------------------------------------
+
#ifndef DELPHI_SUBSTITUTE_CLASSES_H
#define DELPHI_SUBSTITUTE_CLASSES_H
Property changes on: trunk/wxdevide/source/DelphiSub.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/DevCfg.cpp
===================================================================
--- trunk/wxdevide/source/DevCfg.cpp 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/DevCfg.cpp 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,3 +1,12 @@
+//---------------------------------------------------------------------------
+//$Id : XXXXXX $
+// Name: devcfg.cpp
+// Author: Sof.T
+// Created: 29/01/2007 19:21:03
+// Description: devcfg class implementation
+//
+//---------------------------------------------------------------------------
+
#include "devcfg.h"
#include "Version.h"
#include "CompilerFunctions.h"
Property changes on: trunk/wxdevide/source/DevCfg.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Property changes on: trunk/wxdevide/source/DevResource.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/DevResource.h
===================================================================
--- trunk/wxdevide/source/DevResource.h 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/DevResource.h 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,3 +1,12 @@
+//---------------------------------------------------------------------------
+//$Id : XXXXXX $
+// Name: DevResource.h
+// Author: Sof.T
+// Created: 29/01/2007 19:21:03
+// Description:
+//
+//---------------------------------------------------------------------------
+
#ifndef DEV_RESOURCE_H
#define DEV_RESOURCE_H
Property changes on: trunk/wxdevide/source/DevResource.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/DevTheme.cpp
===================================================================
--- trunk/wxdevide/source/DevTheme.cpp 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/DevTheme.cpp 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,3 +1,12 @@
+//---------------------------------------------------------------------------
+//$Id : XXXXXX $
+// Name: DevTheme.cpp
+// Author: Sof.T
+// Created: 29/01/2007 19:21:03
+// Description: DevTheme class implementation
+//
+//---------------------------------------------------------------------------
+
#include "DevTheme.h"
#include "devcfg.h" //Needed to access DevDirs
#include "Utils.h" //Needed to access FilesFromWildCard function
Property changes on: trunk/wxdevide/source/DevTheme.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/DevTheme.h
===================================================================
--- trunk/wxdevide/source/DevTheme.h 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/DevTheme.h 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,3 +1,12 @@
+//---------------------------------------------------------------------------
+//$Id : XXXXXX $
+// Name: DevTheme.h
+// Author: Sof.T
+// Created: 29/01/2007 19:21:03
+// Description:
+//
+//---------------------------------------------------------------------------
+
#ifndef DEVTHEMES_H
#define DEVTHEMES_H
Property changes on: trunk/wxdevide/source/DevTheme.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/ELDsgnr.cpp
===================================================================
--- trunk/wxdevide/source/ELDsgnr.cpp 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/ELDsgnr.cpp 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,3 +1,12 @@
+//---------------------------------------------------------------------------
+//$Id : XXXXXX $
+// Name: ELDsgnr.cpp
+// Author: Sof.T
+// Created: 29/01/2007 19:21:03
+// Description: ELDsgnr class implementation
+//
+//---------------------------------------------------------------------------
+
#include "ELDsgnr.h"
/*{*******************************************************}
{ }
Property changes on: trunk/wxdevide/source/ELDsgnr.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/ELDsgnr.h
===================================================================
--- trunk/wxdevide/source/ELDsgnr.h 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/ELDsgnr.h 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,3 +1,12 @@
+//---------------------------------------------------------------------------
+//$Id : XXXXXX $
+// Name: ELDsgnr.h
+// Author: Sof.T
+// Created: 29/01/2007 19:21:03
+// Description:
+//
+//---------------------------------------------------------------------------
+
#ifndef ELDSGNR_H
#define ELDSGNR_H
Property changes on: trunk/wxdevide/source/ELDsgnr.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/Editor.cpp
===================================================================
--- trunk/wxdevide/source/Editor.cpp 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/Editor.cpp 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,3 +1,12 @@
+//---------------------------------------------------------------------------
+//$Id : XXXXXX $
+// Name: Editor.cpp
+// Author: Sof.T
+// Created: 29/01/2007 19:21:03
+// Description: Editor class implementation
+//
+//---------------------------------------------------------------------------
+
#include "Editor.h"
#include "devcppApp.h"
#include "devcfg.h"
Property changes on: trunk/wxdevide/source/Editor.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/Editor.h
===================================================================
--- trunk/wxdevide/source/Editor.h 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/Editor.h 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,3 +1,12 @@
+//---------------------------------------------------------------------------
+//$Id : XXXXXX $
+// Name: Editor.h
+// Author: Sof.T
+// Created: 29/01/2007 19:21:03
+// Description:
+//
+//---------------------------------------------------------------------------
+
#ifndef EDITOR_H
#define EDITOR_H
@@ -16,7 +25,7 @@
#include <wx/stc/stc.h>
#include <wx/aui/auibook.h>
/*
- $Id: editor.pas 836 2007-01-14 13:09:15Z NinjaNL $
+ $Id$
This file is part of Dev-C++
Copyright (c) 2004 Bloodshed Software
Property changes on: trunk/wxdevide/source/Editor.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/wxdevide/source/EditorOptfrm.cpp
===================================================================
--- trunk/wxdevide/source/EditorOptfrm.cpp 2008-09-27 09:10:25 UTC (rev 7)
+++ trunk/wxdevide/source/EditorOptfrm.cpp 2008-10-03 12:00:06 UTC (rev 8)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-//
+//$Id : XXXXXX $
// Name: EditorOptfrm.cpp
// Author: Sof.T
// Created: 11/06/2008 07:53:20
Property changes on: trunk/wxdevide/source/EditorOptfrm.cpp
_________...
[truncated message content] |
|
From: <ni...@us...> - 2008-10-03 12:38:32
|
Revision: 11
http://wxdevide.svn.sourceforge.net/wxdevide/?rev=11&view=rev
Author: ninjanl
Date: 2008-10-03 12:38:21 +0000 (Fri, 03 Oct 2008)
Log Message:
-----------
should add the $ID: filename$ stuff still don't know why it won't work
Modified Paths:
--------------
trunk/wxdevide/source/AboutDlg.cpp
trunk/wxdevide/source/AboutDlg.h
trunk/wxdevide/source/AddToDoFrm.cpp
trunk/wxdevide/source/AddToDoFrm.h
trunk/wxdevide/source/CFGData.cpp
trunk/wxdevide/source/CFGData.h
trunk/wxdevide/source/ColorEditDlg.cpp
trunk/wxdevide/source/ColorEditDlg.h
trunk/wxdevide/source/CompileProgressForm.cpp
trunk/wxdevide/source/CompileProgressForm.h
trunk/wxdevide/source/CompileProgressFrm.cpp
trunk/wxdevide/source/CompileProgressFrm.h
trunk/wxdevide/source/Compiler.cpp
trunk/wxdevide/source/Compiler.h
trunk/wxdevide/source/CompilerFunctions.cpp
trunk/wxdevide/source/CompilerFunctions.h
trunk/wxdevide/source/CustomComponents.cpp
trunk/wxdevide/source/CustomComponents.h
trunk/wxdevide/source/DebugHeader.h
trunk/wxdevide/source/DelphiSub.cpp
trunk/wxdevide/source/DelphiSub.h
trunk/wxdevide/source/DevCfg.cpp
trunk/wxdevide/source/DevResource.h
trunk/wxdevide/source/DevTheme.cpp
trunk/wxdevide/source/DevTheme.h
trunk/wxdevide/source/ELDsgnr.cpp
trunk/wxdevide/source/ELDsgnr.h
trunk/wxdevide/source/Editor.cpp
trunk/wxdevide/source/Editor.h
trunk/wxdevide/source/EditorOptfrm.cpp
trunk/wxdevide/source/EditorOptfrm.h
trunk/wxdevide/source/EnviroFrm.cpp
trunk/wxdevide/source/EnviroFrm.h
trunk/wxdevide/source/FileAssocs.cpp
trunk/wxdevide/source/FileAssocs.h
trunk/wxdevide/source/FilePropertiesfrm.cpp
trunk/wxdevide/source/FilePropertiesfrm.h
trunk/wxdevide/source/GotoLineFrm.cpp
trunk/wxdevide/source/GotoLineFrm.h
trunk/wxdevide/source/ImageResource.h
trunk/wxdevide/source/LangFrm.cpp
trunk/wxdevide/source/LangFrm.h
trunk/wxdevide/source/LangIDs.h
trunk/wxdevide/source/LangResource.h
trunk/wxdevide/source/Macros.cpp
trunk/wxdevide/source/Macros.h
trunk/wxdevide/source/MainFrm.cpp
trunk/wxdevide/source/MainFrm.h
trunk/wxdevide/source/MultiLangSupport.cpp
trunk/wxdevide/source/MultiLangSupport.h
trunk/wxdevide/source/NewProjectFrm.cpp
trunk/wxdevide/source/NewProjectFrm.h
trunk/wxdevide/source/NewProjectResource.h
trunk/wxdevide/source/PackmanExitCodesU.h
trunk/wxdevide/source/PrjTypes.cpp
trunk/wxdevide/source/PrjTypes.h
trunk/wxdevide/source/Project.cpp
trunk/wxdevide/source/Project.h
trunk/wxdevide/source/SearchCenter.cpp
trunk/wxdevide/source/SearchCenter.h
trunk/wxdevide/source/SplashFrm.cpp
trunk/wxdevide/source/SplashFrm.h
trunk/wxdevide/source/Template.cpp
trunk/wxdevide/source/Template.h
trunk/wxdevide/source/ThemeImages.h
trunk/wxdevide/source/ThemeResource.h
trunk/wxdevide/source/ToolEditForm.cpp
trunk/wxdevide/source/ToolEditForm.h
trunk/wxdevide/source/ToolEditFrm.cpp
trunk/wxdevide/source/ToolEditFrm.h
trunk/wxdevide/source/ToolFrm.cpp
trunk/wxdevide/source/ToolFrm.h
trunk/wxdevide/source/Utils.cpp
trunk/wxdevide/source/Utils.h
trunk/wxdevide/source/Version.h
trunk/wxdevide/source/WebUpdateDlg.cpp
trunk/wxdevide/source/WebUpdateDlg.h
trunk/wxdevide/source/cfgTypes.h
trunk/wxdevide/source/devFileMonitor.cpp
trunk/wxdevide/source/devFileMonitor.h
trunk/wxdevide/source/devFileMonitorThread.cpp
trunk/wxdevide/source/devFileMonitorThread.h
trunk/wxdevide/source/devMonitorTypes.h
trunk/wxdevide/source/devcfg.h
trunk/wxdevide/source/devcppApp.cpp
trunk/wxdevide/source/devcppApp.h
trunk/wxdevide/source/devcppApp.rc
trunk/wxdevide/source/oysUtils.cpp
trunk/wxdevide/source/oysUtils.h
trunk/wxdevide/source/wx_pch.h
Modified: trunk/wxdevide/source/AboutDlg.cpp
===================================================================
--- trunk/wxdevide/source/AboutDlg.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/AboutDlg.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: AboutDlg.cpp
// Author: Sof.T
// Created: 23/01/2007 22:21:49
Modified: trunk/wxdevide/source/AboutDlg.h
===================================================================
--- trunk/wxdevide/source/AboutDlg.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/AboutDlg.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: AboutDlg.h
// Author: Sof.T
// Created: 23/01/2007 22:21:49
Modified: trunk/wxdevide/source/AddToDoFrm.cpp
===================================================================
--- trunk/wxdevide/source/AddToDoFrm.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/AddToDoFrm.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: AddToDoFrm.cpp
// Author: Sof.T
// Created: 25/01/2007 06:28:00
Modified: trunk/wxdevide/source/AddToDoFrm.h
===================================================================
--- trunk/wxdevide/source/AddToDoFrm.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/AddToDoFrm.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: AddToDoFrm.h
// Author: Sof.T
// Created: 25/01/2007 06:28:00
Modified: trunk/wxdevide/source/CFGData.cpp
===================================================================
--- trunk/wxdevide/source/CFGData.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/CFGData.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: CFGData.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/CFGData.h
===================================================================
--- trunk/wxdevide/source/CFGData.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/CFGData.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: CFGData.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/ColorEditDlg.cpp
===================================================================
--- trunk/wxdevide/source/ColorEditDlg.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/ColorEditDlg.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: ColorEditDlg.cpp
// Author: Sof.T
// Created: 25/01/2007 15:21:09
Modified: trunk/wxdevide/source/ColorEditDlg.h
===================================================================
--- trunk/wxdevide/source/ColorEditDlg.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/ColorEditDlg.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: ColorEditDlg.h
// Author: Sof.T
// Created: 25/01/2007 15:21:09
Modified: trunk/wxdevide/source/CompileProgressForm.cpp
===================================================================
--- trunk/wxdevide/source/CompileProgressForm.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/CompileProgressForm.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: CompileProgressForm.cpp
// Author: Programming
// Created: 11/04/2008 08:48:26
Modified: trunk/wxdevide/source/CompileProgressForm.h
===================================================================
--- trunk/wxdevide/source/CompileProgressForm.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/CompileProgressForm.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: CompileProgressForm.h
// Author: Programming
// Created: 11/04/2008 08:48:26
Modified: trunk/wxdevide/source/CompileProgressFrm.cpp
===================================================================
--- trunk/wxdevide/source/CompileProgressFrm.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/CompileProgressFrm.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: CompileProgressFrm.cpp
// Author: Sof.T
// Created: 11/04/2008 08:49:59
Modified: trunk/wxdevide/source/CompileProgressFrm.h
===================================================================
--- trunk/wxdevide/source/CompileProgressFrm.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/CompileProgressFrm.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: CompileProgressFrm.h
// Author: Sof.T
// Created: 11/04/2008 08:49:59
Modified: trunk/wxdevide/source/Compiler.cpp
===================================================================
--- trunk/wxdevide/source/Compiler.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/Compiler.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: Compiler.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/Compiler.h
===================================================================
--- trunk/wxdevide/source/Compiler.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/Compiler.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: Compiler.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/CompilerFunctions.cpp
===================================================================
--- trunk/wxdevide/source/CompilerFunctions.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/CompilerFunctions.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: CompilerFunctions.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/CompilerFunctions.h
===================================================================
--- trunk/wxdevide/source/CompilerFunctions.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/CompilerFunctions.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: CompilerFunctions.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/CustomComponents.cpp
===================================================================
--- trunk/wxdevide/source/CustomComponents.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/CustomComponents.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: CustomComponents.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/CustomComponents.h
===================================================================
--- trunk/wxdevide/source/CustomComponents.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/CustomComponents.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: CustomComponents.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/DebugHeader.h
===================================================================
--- trunk/wxdevide/source/DebugHeader.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/DebugHeader.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: DebugHeader.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/DelphiSub.cpp
===================================================================
--- trunk/wxdevide/source/DelphiSub.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/DelphiSub.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: DelphiSub.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/DelphiSub.h
===================================================================
--- trunk/wxdevide/source/DelphiSub.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/DelphiSub.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: DelphiSub.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/DevCfg.cpp
===================================================================
--- trunk/wxdevide/source/DevCfg.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/DevCfg.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: devcfg.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/DevResource.h
===================================================================
--- trunk/wxdevide/source/DevResource.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/DevResource.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: DevResource.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/DevTheme.cpp
===================================================================
--- trunk/wxdevide/source/DevTheme.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/DevTheme.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: DevTheme.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/DevTheme.h
===================================================================
--- trunk/wxdevide/source/DevTheme.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/DevTheme.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: DevTheme.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/ELDsgnr.cpp
===================================================================
--- trunk/wxdevide/source/ELDsgnr.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/ELDsgnr.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: ELDsgnr.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/ELDsgnr.h
===================================================================
--- trunk/wxdevide/source/ELDsgnr.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/ELDsgnr.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: ELDsgnr.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/Editor.cpp
===================================================================
--- trunk/wxdevide/source/Editor.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/Editor.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: Editor.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/Editor.h
===================================================================
--- trunk/wxdevide/source/Editor.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/Editor.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// $Id$
// Name: Editor.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/EditorOptfrm.cpp
===================================================================
--- trunk/wxdevide/source/EditorOptfrm.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/EditorOptfrm.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: EditorOptfrm.cpp
// Author: Sof.T
// Created: 11/06/2008 07:53:20
Modified: trunk/wxdevide/source/EditorOptfrm.h
===================================================================
--- trunk/wxdevide/source/EditorOptfrm.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/EditorOptfrm.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: EditorOptfrm.h
// Author: Sof.T
// Created: 11/06/2008 07:53:20
Modified: trunk/wxdevide/source/EnviroFrm.cpp
===================================================================
--- trunk/wxdevide/source/EnviroFrm.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/EnviroFrm.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: EnviroFrm.cpp
// Author: Malcolm
// Created: 15/09/2008 15:10:09
Modified: trunk/wxdevide/source/EnviroFrm.h
===================================================================
--- trunk/wxdevide/source/EnviroFrm.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/EnviroFrm.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: EnviroFrm.h
// Author: Malcolm
// Created: 15/09/2008 15:10:09
Modified: trunk/wxdevide/source/FileAssocs.cpp
===================================================================
--- trunk/wxdevide/source/FileAssocs.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/FileAssocs.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: FileAssocs.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/FileAssocs.h
===================================================================
--- trunk/wxdevide/source/FileAssocs.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/FileAssocs.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: FileAssocs.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/FilePropertiesfrm.cpp
===================================================================
--- trunk/wxdevide/source/FilePropertiesfrm.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/FilePropertiesfrm.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: FilePropertiesfrm.cpp
// Author: Sof.T
// Created: 06/06/2008 11:08:38
Modified: trunk/wxdevide/source/FilePropertiesfrm.h
===================================================================
--- trunk/wxdevide/source/FilePropertiesfrm.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/FilePropertiesfrm.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: FilePropertiesfrm.h
// Author: Sof.T
// Created: 06/06/2008 11:08:38
Modified: trunk/wxdevide/source/GotoLineFrm.cpp
===================================================================
--- trunk/wxdevide/source/GotoLineFrm.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/GotoLineFrm.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: GotoLineFrm.cpp
// Author: Sof.T
// Created: 31/05/2008 13:37:56
Modified: trunk/wxdevide/source/GotoLineFrm.h
===================================================================
--- trunk/wxdevide/source/GotoLineFrm.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/GotoLineFrm.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: GotoLineFrm.h
// Author: Sof.T
// Created: 31/05/2008 13:37:56
Modified: trunk/wxdevide/source/ImageResource.h
===================================================================
--- trunk/wxdevide/source/ImageResource.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/ImageResource.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: ImageResource.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/LangFrm.cpp
===================================================================
--- trunk/wxdevide/source/LangFrm.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/LangFrm.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: LangFrm.cpp
// Author: Sof.T
// Created: 26/04/2008 12:08:00
Modified: trunk/wxdevide/source/LangFrm.h
===================================================================
--- trunk/wxdevide/source/LangFrm.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/LangFrm.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: LangFrm.h
// Author: Sof.T
// Created: 26/04/2008 12:07:58
Modified: trunk/wxdevide/source/LangIDs.h
===================================================================
--- trunk/wxdevide/source/LangIDs.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/LangIDs.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: LangIDs.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/LangResource.h
===================================================================
--- trunk/wxdevide/source/LangResource.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/LangResource.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: LangResurce.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/Macros.cpp
===================================================================
--- trunk/wxdevide/source/Macros.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/Macros.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: Macros.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/Macros.h
===================================================================
--- trunk/wxdevide/source/Macros.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/Macros.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: Macros.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/MainFrm.cpp
===================================================================
--- trunk/wxdevide/source/MainFrm.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/MainFrm.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: MainFrm.cpp
// Author: Sof.T
// Created: 23/01/2007 22:15:38
Modified: trunk/wxdevide/source/MainFrm.h
===================================================================
--- trunk/wxdevide/source/MainFrm.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/MainFrm.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: MainFrm.h
// Author: Sof.T
// Created: 23/01/2007 22:15:38
Modified: trunk/wxdevide/source/MultiLangSupport.cpp
===================================================================
--- trunk/wxdevide/source/MultiLangSupport.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/MultiLangSupport.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: MultiLangSupport.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/MultiLangSupport.h
===================================================================
--- trunk/wxdevide/source/MultiLangSupport.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/MultiLangSupport.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: MultiLangSupport.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/NewProjectFrm.cpp
===================================================================
--- trunk/wxdevide/source/NewProjectFrm.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/NewProjectFrm.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: NewProjectFrm.cpp
// Author: Sof.T
// Created: 24/05/2008 14:43:21
Modified: trunk/wxdevide/source/NewProjectFrm.h
===================================================================
--- trunk/wxdevide/source/NewProjectFrm.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/NewProjectFrm.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: NewProjectFrm.h
// Author: Sof.T
// Created: 24/05/2008 14:43:21
Modified: trunk/wxdevide/source/NewProjectResource.h
===================================================================
--- trunk/wxdevide/source/NewProjectResource.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/NewProjectResource.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: NewProjectResource.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/PackmanExitCodesU.h
===================================================================
--- trunk/wxdevide/source/PackmanExitCodesU.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/PackmanExitCodesU.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: PackmanExitCodesU.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/PrjTypes.cpp
===================================================================
--- trunk/wxdevide/source/PrjTypes.cpp 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/PrjTypes.cpp 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $id$
+// // $Id$
// Name: PrjTypes.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/PrjTypes.h
===================================================================
--- trunk/wxdevide/source/PrjTypes.h 2008-10-03 12:33:58 UTC (rev 10)
+++ trunk/wxdevide/source/PrjTypes.h 2008-10-03 12:38:21 UTC (rev 11)
@@ -1,5 +1,5 @@
//----------------------...
[truncated message content] |
|
From: <ni...@us...> - 2008-10-03 12:34:10
|
Revision: 10
http://wxdevide.svn.sourceforge.net/wxdevide/?rev=10&view=rev
Author: ninjanl
Date: 2008-10-03 12:33:58 +0000 (Fri, 03 Oct 2008)
Log Message:
-----------
should add the $ID: filename$ stuff still don't know why it won't work
Modified Paths:
--------------
trunk/wxdevide/source/AboutDlg.cpp
trunk/wxdevide/source/AboutDlg.h
trunk/wxdevide/source/AddToDoFrm.cpp
trunk/wxdevide/source/AddToDoFrm.h
trunk/wxdevide/source/CFGData.cpp
trunk/wxdevide/source/CFGData.h
trunk/wxdevide/source/ColorEditDlg.cpp
trunk/wxdevide/source/ColorEditDlg.h
trunk/wxdevide/source/CompileProgressForm.cpp
trunk/wxdevide/source/CompileProgressForm.h
trunk/wxdevide/source/CompileProgressFrm.cpp
trunk/wxdevide/source/CompileProgressFrm.h
trunk/wxdevide/source/Compiler.cpp
trunk/wxdevide/source/Compiler.h
trunk/wxdevide/source/CompilerFunctions.cpp
trunk/wxdevide/source/CompilerFunctions.h
trunk/wxdevide/source/CustomComponents.cpp
trunk/wxdevide/source/CustomComponents.h
trunk/wxdevide/source/DebugHeader.h
trunk/wxdevide/source/DelphiSub.cpp
trunk/wxdevide/source/DelphiSub.h
trunk/wxdevide/source/DevCfg.cpp
trunk/wxdevide/source/DevResource.h
trunk/wxdevide/source/DevTheme.cpp
trunk/wxdevide/source/DevTheme.h
trunk/wxdevide/source/ELDsgnr.cpp
trunk/wxdevide/source/ELDsgnr.h
trunk/wxdevide/source/Editor.cpp
trunk/wxdevide/source/Editor.h
trunk/wxdevide/source/EditorOptfrm.cpp
trunk/wxdevide/source/EditorOptfrm.h
trunk/wxdevide/source/EnviroFrm.cpp
trunk/wxdevide/source/EnviroFrm.h
trunk/wxdevide/source/FileAssocs.cpp
trunk/wxdevide/source/FileAssocs.h
trunk/wxdevide/source/FilePropertiesfrm.cpp
trunk/wxdevide/source/FilePropertiesfrm.h
trunk/wxdevide/source/GotoLineFrm.cpp
trunk/wxdevide/source/GotoLineFrm.h
trunk/wxdevide/source/ImageResource.h
trunk/wxdevide/source/LangFrm.cpp
trunk/wxdevide/source/LangFrm.h
trunk/wxdevide/source/LangIDs.h
trunk/wxdevide/source/LangResource.h
trunk/wxdevide/source/Macros.cpp
trunk/wxdevide/source/Macros.h
trunk/wxdevide/source/MainFrm.cpp
trunk/wxdevide/source/MainFrm.h
trunk/wxdevide/source/MultiLangSupport.cpp
trunk/wxdevide/source/MultiLangSupport.h
trunk/wxdevide/source/NewProjectFrm.cpp
trunk/wxdevide/source/NewProjectFrm.h
trunk/wxdevide/source/NewProjectResource.h
trunk/wxdevide/source/PackmanExitCodesU.h
trunk/wxdevide/source/PrjTypes.cpp
trunk/wxdevide/source/PrjTypes.h
trunk/wxdevide/source/Project.cpp
trunk/wxdevide/source/Project.h
trunk/wxdevide/source/SearchCenter.cpp
trunk/wxdevide/source/SearchCenter.h
trunk/wxdevide/source/SplashFrm.cpp
trunk/wxdevide/source/SplashFrm.h
trunk/wxdevide/source/Template.cpp
trunk/wxdevide/source/Template.h
trunk/wxdevide/source/ThemeImages.h
trunk/wxdevide/source/ThemeResource.h
trunk/wxdevide/source/ToolEditForm.cpp
trunk/wxdevide/source/ToolEditForm.h
trunk/wxdevide/source/ToolEditFrm.cpp
trunk/wxdevide/source/ToolEditFrm.h
trunk/wxdevide/source/ToolFrm.cpp
trunk/wxdevide/source/ToolFrm.h
trunk/wxdevide/source/Utils.cpp
trunk/wxdevide/source/Utils.h
trunk/wxdevide/source/Version.h
trunk/wxdevide/source/WebUpdateDlg.cpp
trunk/wxdevide/source/WebUpdateDlg.h
trunk/wxdevide/source/cfgTypes.h
trunk/wxdevide/source/devFileMonitor.cpp
trunk/wxdevide/source/devFileMonitor.h
trunk/wxdevide/source/devFileMonitorThread.cpp
trunk/wxdevide/source/devFileMonitorThread.h
trunk/wxdevide/source/devMonitorTypes.h
trunk/wxdevide/source/devcfg.h
trunk/wxdevide/source/devcppApp.cpp
trunk/wxdevide/source/devcppApp.h
trunk/wxdevide/source/devcppApp.rc
trunk/wxdevide/source/oysUtils.cpp
trunk/wxdevide/source/oysUtils.h
trunk/wxdevide/source/wx_pch.h
Modified: trunk/wxdevide/source/AboutDlg.cpp
===================================================================
--- trunk/wxdevide/source/AboutDlg.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/AboutDlg.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: AboutDlg.cpp
// Author: Sof.T
// Created: 23/01/2007 22:21:49
Modified: trunk/wxdevide/source/AboutDlg.h
===================================================================
--- trunk/wxdevide/source/AboutDlg.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/AboutDlg.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: AboutDlg.h
// Author: Sof.T
// Created: 23/01/2007 22:21:49
Modified: trunk/wxdevide/source/AddToDoFrm.cpp
===================================================================
--- trunk/wxdevide/source/AddToDoFrm.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/AddToDoFrm.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: AddToDoFrm.cpp
// Author: Sof.T
// Created: 25/01/2007 06:28:00
Modified: trunk/wxdevide/source/AddToDoFrm.h
===================================================================
--- trunk/wxdevide/source/AddToDoFrm.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/AddToDoFrm.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: AddToDoFrm.h
// Author: Sof.T
// Created: 25/01/2007 06:28:00
Modified: trunk/wxdevide/source/CFGData.cpp
===================================================================
--- trunk/wxdevide/source/CFGData.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/CFGData.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: CFGData.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/CFGData.h
===================================================================
--- trunk/wxdevide/source/CFGData.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/CFGData.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: CFGData.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/ColorEditDlg.cpp
===================================================================
--- trunk/wxdevide/source/ColorEditDlg.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/ColorEditDlg.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: ColorEditDlg.cpp
// Author: Sof.T
// Created: 25/01/2007 15:21:09
Modified: trunk/wxdevide/source/ColorEditDlg.h
===================================================================
--- trunk/wxdevide/source/ColorEditDlg.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/ColorEditDlg.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: ColorEditDlg.h
// Author: Sof.T
// Created: 25/01/2007 15:21:09
Modified: trunk/wxdevide/source/CompileProgressForm.cpp
===================================================================
--- trunk/wxdevide/source/CompileProgressForm.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/CompileProgressForm.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: CompileProgressForm.cpp
// Author: Programming
// Created: 11/04/2008 08:48:26
Modified: trunk/wxdevide/source/CompileProgressForm.h
===================================================================
--- trunk/wxdevide/source/CompileProgressForm.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/CompileProgressForm.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: CompileProgressForm.h
// Author: Programming
// Created: 11/04/2008 08:48:26
Modified: trunk/wxdevide/source/CompileProgressFrm.cpp
===================================================================
--- trunk/wxdevide/source/CompileProgressFrm.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/CompileProgressFrm.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: CompileProgressFrm.cpp
// Author: Sof.T
// Created: 11/04/2008 08:49:59
Modified: trunk/wxdevide/source/CompileProgressFrm.h
===================================================================
--- trunk/wxdevide/source/CompileProgressFrm.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/CompileProgressFrm.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: CompileProgressFrm.h
// Author: Sof.T
// Created: 11/04/2008 08:49:59
Modified: trunk/wxdevide/source/Compiler.cpp
===================================================================
--- trunk/wxdevide/source/Compiler.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/Compiler.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: Compiler.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/Compiler.h
===================================================================
--- trunk/wxdevide/source/Compiler.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/Compiler.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: Compiler.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/CompilerFunctions.cpp
===================================================================
--- trunk/wxdevide/source/CompilerFunctions.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/CompilerFunctions.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: CompilerFunctions.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/CompilerFunctions.h
===================================================================
--- trunk/wxdevide/source/CompilerFunctions.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/CompilerFunctions.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: CompilerFunctions.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/CustomComponents.cpp
===================================================================
--- trunk/wxdevide/source/CustomComponents.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/CustomComponents.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: CustomComponents.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/CustomComponents.h
===================================================================
--- trunk/wxdevide/source/CustomComponents.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/CustomComponents.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: CustomComponents.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/DebugHeader.h
===================================================================
--- trunk/wxdevide/source/DebugHeader.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/DebugHeader.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: DebugHeader.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/DelphiSub.cpp
===================================================================
--- trunk/wxdevide/source/DelphiSub.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/DelphiSub.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: DelphiSub.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/DelphiSub.h
===================================================================
--- trunk/wxdevide/source/DelphiSub.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/DelphiSub.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: DelphiSub.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/DevCfg.cpp
===================================================================
--- trunk/wxdevide/source/DevCfg.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/DevCfg.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: devcfg.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/DevResource.h
===================================================================
--- trunk/wxdevide/source/DevResource.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/DevResource.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: DevResource.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/DevTheme.cpp
===================================================================
--- trunk/wxdevide/source/DevTheme.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/DevTheme.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: DevTheme.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/DevTheme.h
===================================================================
--- trunk/wxdevide/source/DevTheme.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/DevTheme.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: DevTheme.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/ELDsgnr.cpp
===================================================================
--- trunk/wxdevide/source/ELDsgnr.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/ELDsgnr.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: ELDsgnr.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/ELDsgnr.h
===================================================================
--- trunk/wxdevide/source/ELDsgnr.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/ELDsgnr.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: ELDsgnr.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/Editor.cpp
===================================================================
--- trunk/wxdevide/source/Editor.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/Editor.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: Editor.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/Editor.h
===================================================================
--- trunk/wxdevide/source/Editor.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/Editor.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: Editor.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/EditorOptfrm.cpp
===================================================================
--- trunk/wxdevide/source/EditorOptfrm.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/EditorOptfrm.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: EditorOptfrm.cpp
// Author: Sof.T
// Created: 11/06/2008 07:53:20
Modified: trunk/wxdevide/source/EditorOptfrm.h
===================================================================
--- trunk/wxdevide/source/EditorOptfrm.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/EditorOptfrm.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: EditorOptfrm.h
// Author: Sof.T
// Created: 11/06/2008 07:53:20
Modified: trunk/wxdevide/source/EnviroFrm.cpp
===================================================================
--- trunk/wxdevide/source/EnviroFrm.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/EnviroFrm.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: EnviroFrm.cpp
// Author: Malcolm
// Created: 15/09/2008 15:10:09
Modified: trunk/wxdevide/source/EnviroFrm.h
===================================================================
--- trunk/wxdevide/source/EnviroFrm.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/EnviroFrm.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: EnviroFrm.h
// Author: Malcolm
// Created: 15/09/2008 15:10:09
Modified: trunk/wxdevide/source/FileAssocs.cpp
===================================================================
--- trunk/wxdevide/source/FileAssocs.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/FileAssocs.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: FileAssocs.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/FileAssocs.h
===================================================================
--- trunk/wxdevide/source/FileAssocs.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/FileAssocs.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: FileAssocs.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/FilePropertiesfrm.cpp
===================================================================
--- trunk/wxdevide/source/FilePropertiesfrm.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/FilePropertiesfrm.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: FilePropertiesfrm.cpp
// Author: Sof.T
// Created: 06/06/2008 11:08:38
Modified: trunk/wxdevide/source/FilePropertiesfrm.h
===================================================================
--- trunk/wxdevide/source/FilePropertiesfrm.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/FilePropertiesfrm.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: FilePropertiesfrm.h
// Author: Sof.T
// Created: 06/06/2008 11:08:38
Modified: trunk/wxdevide/source/GotoLineFrm.cpp
===================================================================
--- trunk/wxdevide/source/GotoLineFrm.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/GotoLineFrm.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: GotoLineFrm.cpp
// Author: Sof.T
// Created: 31/05/2008 13:37:56
Modified: trunk/wxdevide/source/GotoLineFrm.h
===================================================================
--- trunk/wxdevide/source/GotoLineFrm.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/GotoLineFrm.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: GotoLineFrm.h
// Author: Sof.T
// Created: 31/05/2008 13:37:56
Modified: trunk/wxdevide/source/ImageResource.h
===================================================================
--- trunk/wxdevide/source/ImageResource.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/ImageResource.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: ImageResource.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/LangFrm.cpp
===================================================================
--- trunk/wxdevide/source/LangFrm.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/LangFrm.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: LangFrm.cpp
// Author: Sof.T
// Created: 26/04/2008 12:08:00
Modified: trunk/wxdevide/source/LangFrm.h
===================================================================
--- trunk/wxdevide/source/LangFrm.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/LangFrm.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: LangFrm.h
// Author: Sof.T
// Created: 26/04/2008 12:07:58
Modified: trunk/wxdevide/source/LangIDs.h
===================================================================
--- trunk/wxdevide/source/LangIDs.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/LangIDs.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: LangIDs.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/LangResource.h
===================================================================
--- trunk/wxdevide/source/LangResource.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/LangResource.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: LangResurce.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/Macros.cpp
===================================================================
--- trunk/wxdevide/source/Macros.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/Macros.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: Macros.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/Macros.h
===================================================================
--- trunk/wxdevide/source/Macros.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/Macros.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: Macros.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/MainFrm.cpp
===================================================================
--- trunk/wxdevide/source/MainFrm.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/MainFrm.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: MainFrm.cpp
// Author: Sof.T
// Created: 23/01/2007 22:15:38
Modified: trunk/wxdevide/source/MainFrm.h
===================================================================
--- trunk/wxdevide/source/MainFrm.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/MainFrm.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: MainFrm.h
// Author: Sof.T
// Created: 23/01/2007 22:15:38
Modified: trunk/wxdevide/source/MultiLangSupport.cpp
===================================================================
--- trunk/wxdevide/source/MultiLangSupport.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/MultiLangSupport.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: MultiLangSupport.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/MultiLangSupport.h
===================================================================
--- trunk/wxdevide/source/MultiLangSupport.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/MultiLangSupport.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: MultiLangSupport.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/NewProjectFrm.cpp
===================================================================
--- trunk/wxdevide/source/NewProjectFrm.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/NewProjectFrm.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: NewProjectFrm.cpp
// Author: Sof.T
// Created: 24/05/2008 14:43:21
Modified: trunk/wxdevide/source/NewProjectFrm.h
===================================================================
--- trunk/wxdevide/source/NewProjectFrm.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/NewProjectFrm.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: NewProjectFrm.h
// Author: Sof.T
// Created: 24/05/2008 14:43:21
Modified: trunk/wxdevide/source/NewProjectResource.h
===================================================================
--- trunk/wxdevide/source/NewProjectResource.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/NewProjectResource.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: NewProjectResource.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/PackmanExitCodesU.h
===================================================================
--- trunk/wxdevide/source/PackmanExitCodesU.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/PackmanExitCodesU.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: PackmanExitCodesU.h
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/PrjTypes.cpp
===================================================================
--- trunk/wxdevide/source/PrjTypes.cpp 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/PrjTypes.cpp 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: PrjTypes.cpp
// Author: Sof.T
// Created: 29/01/2007 19:21:03
Modified: trunk/wxdevide/source/PrjTypes.h
===================================================================
--- trunk/wxdevide/source/PrjTypes.h 2008-10-03 12:14:31 UTC (rev 9)
+++ trunk/wxdevide/source/PrjTypes.h 2008-10-03 12:33:58 UTC (rev 10)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// $id: $
+// // $id$
// Name: PrjTypes.h
//...
[truncated message content] |
|
From: <ni...@us...> - 2008-10-07 18:03:02
|
Revision: 12
http://wxdevide.svn.sourceforge.net/wxdevide/?rev=12&view=rev
Author: ninjanl
Date: 2008-10-07 18:02:56 +0000 (Tue, 07 Oct 2008)
Log Message:
-----------
Changed AddToDoFrm to be sizer based.
Added EnviroFrm data transfer for the environment variables.
Wondering if this svn gets through unchallenged.
Modified Paths:
--------------
trunk/wxdevide/source/AddToDoFrm.cpp
trunk/wxdevide/source/AddToDoFrm.h
trunk/wxdevide/source/AddToDoFrm.wxform
trunk/wxdevide/source/EnviroFrm.cpp
trunk/wxdevide/source/EnviroFrm.h
trunk/wxdevide/source/EnviroFrm.wxform
Modified: trunk/wxdevide/source/AddToDoFrm.cpp
===================================================================
--- trunk/wxdevide/source/AddToDoFrm.cpp 2008-10-03 12:38:21 UTC (rev 11)
+++ trunk/wxdevide/source/AddToDoFrm.cpp 2008-10-07 18:02:56 UTC (rev 12)
@@ -52,30 +52,57 @@
//Add the custom code before or after the blocks
////GUI Items Creation Start
- WxPanel1 = new wxPanel(this, ID_WXPANEL1, wxPoint(0,0), wxSize(292,206));
+ DialogSizer = new wxBoxSizer(wxVERTICAL);
+ this->SetSizer(DialogSizer);
+ this->SetAutoLayout(true);
- LblDescription = new wxStaticText(WxPanel1, ID_LBLDESCRIPTION, _("Description:"), wxPoint(8,8), wxDefaultSize, 0, _("LblDescription"));
+ WxPanel1 = new wxPanel(this, ID_WXPANEL1, wxDefaultPosition, wxDefaultSize);
+ WxPanel1->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
+ DialogSizer->Add(WxPanel1,0,wxALIGN_CENTER | wxALL,5);
- MemDescription = new wxTextCtrl(WxPanel1, ID_MEMDESCRIPTION, _(""), wxPoint(8,24), wxSize(277,95), wxTE_MULTILINE, wxDefaultValidator, _("MemDescription"));
+ PanelSizer = new wxBoxSizer(wxVERTICAL);
+ WxPanel1->SetSizer(PanelSizer);
+ WxPanel1->SetAutoLayout(true);
+
+ LblDescription = new wxStaticText(WxPanel1, ID_LBLDESCRIPTION, _("Description:"), wxDefaultPosition, wxDefaultSize, 0, _("LblDescription"));
+ LblDescription->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
+ PanelSizer->Add(LblDescription,0,wxALIGN_LEFT | wxALL,5);
+
+ MemDescription = new wxTextCtrl(WxPanel1, ID_MEMDESCRIPTION, _(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE, wxDefaultValidator, _("MemDescription"));
MemDescription->SetMaxLength(0);
MemDescription->SetFocus();
MemDescription->SetInsertionPointEnd();
+ MemDescription->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
+ PanelSizer->Add(MemDescription,1,wxEXPAND | wxALL,5);
- LblPriority = new wxStaticText(WxPanel1, ID_LBLPRIORITY, _("Priority:"), wxPoint(8,124), wxDefaultSize, 0, _("LblPriority"));
+ WxFlexGridSizer1 = new wxFlexGridSizer(0, 2, 0, 0);
+ PanelSizer->Add(WxFlexGridSizer1, 0, wxALIGN_CENTER | wxALL, 5);
- LblUser = new wxStaticText(WxPanel1, ID_LBLUSER, _("User:"), wxPoint(132,124), wxDefaultSize, 0, _("LblUser"));
+ LblPriority = new wxStaticText(WxPanel1, ID_LBLPRIORITY, _("Priority:"), wxDefaultPosition, wxDefaultSize, 0, _("LblPriority"));
+ LblPriority->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
+ WxFlexGridSizer1->Add(LblPriority,0,wxALIGN_LEFT | wxALL,5);
- SpnPriority = new wxSpinCtrl(WxPanel1, ID_SPNPRIORITY, _("1"), wxPoint(8,140), wxSize(113,22), wxSP_ARROW_KEYS, 1, 9, 1);
+ LblUser = new wxStaticText(WxPanel1, ID_LBLUSER, _("User:"), wxDefaultPosition, wxDefaultSize, 0, _("LblUser"));
+ LblUser->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
+ WxFlexGridSizer1->Add(LblUser,1,wxALIGN_LEFT | wxALL,5);
- EdtUser = new wxTextCtrl(WxPanel1, ID_EDTUSER, _(""), wxPoint(132,140), wxSize(153,22), 0, wxTextValidator(wxFILTER_ALPHANUMERIC, NULL), _("EdtUser"));
+ SpnPriority = new wxSpinCtrl(WxPanel1, ID_SPNPRIORITY, _("1"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 9, 1);
+ SpnPriority->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
+ WxFlexGridSizer1->Add(SpnPriority,0,wxALIGN_LEFT | wxALL,5);
- BtnOK = new wxButton(WxPanel1, wxID_OK, _("OK"), wxPoint(131,172), wxSize(75,25), 0, wxDefaultValidator, _("BtnOK"));
+ EdtUser = new wxTextCtrl(WxPanel1, ID_EDTUSER, _(""), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator(wxFILTER_ALPHANUMERIC, NULL), _("EdtUser"));
+ EdtUser->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
+ WxFlexGridSizer1->Add(EdtUser,1,0 | wxALL,5);
- BtnCancel = new wxButton(WxPanel1, wxID_CANCEL, _("Cancel"), wxPoint(211,172), wxSize(75,25), 0, wxDefaultValidator, _("BtnCancel"));
+ WxStdDialogButtonSizer1 = CreateButtonSizer(wxOK | wxCANCEL);
+ DialogSizer->Add(WxStdDialogButtonSizer1, 0, wxALIGN_CENTER | wxALL, 5);
SetTitle(_("Add To-Do Item"));
SetIcon(wxNullIcon);
- SetSize(8,8,300,234);
+
+ GetSizer()->Layout();
+ GetSizer()->Fit(this);
+ GetSizer()->SetSizeHints(this);
Center();
////GUI Items Creation End
@@ -83,8 +110,14 @@
LblDescription->SetLabel(Lang()->GetString(ID_ADDTODO_DESCRIPTION) + wxT(":"));
LblPriority->SetLabel(Lang()->GetString(ID_ADDTODO_PRIORITY) + wxT(":"));
LblUser->SetLabel(Lang()->GetString(ID_ADDTODO_USER) + wxT(":"));
- BtnOK->SetLabel(Lang()->GetString(ID_BTN_OK));
- BtnCancel->SetLabel(Lang()->GetString(ID_BTN_CANCEL));
+//mn BtnOK->SetLabel(Lang()->GetString(ID_BTN_OK));
+//mn BtnCancel->SetLabel(Lang()->GetString(ID_BTN_CANCEL));
+
+ MemDescription->SetMinSize(wxSize(277,95));
+ GetSizer()->Layout();
+ GetSizer()->Fit(this);
+ GetSizer()->SetSizeHints(this);
+ Center();
}
void AddToDoFrm::OnClose(wxCloseEvent& event)
Modified: trunk/wxdevide/source/AddToDoFrm.h
===================================================================
--- trunk/wxdevide/source/AddToDoFrm.h 2008-10-03 12:38:21 UTC (rev 11)
+++ trunk/wxdevide/source/AddToDoFrm.h 2008-10-07 18:02:56 UTC (rev 12)
@@ -25,11 +25,11 @@
//Header Include Start and Header Include End.
//wxDev-C++ designer will remove them. Add custom headers after the block.
////Header Include Start
-#include <wx/button.h>
#include <wx/spinctrl.h>
#include <wx/textctrl.h>
#include <wx/stattext.h>
#include <wx/panel.h>
+#include <wx/sizer.h>
////Header Include End
////Dialog Style Start
@@ -53,15 +53,17 @@
//GUI Control Declaration Start and GUI Control Declaration End.
//wxDev-C++ will remove them. Add custom code after the block.
////GUI Control Declaration Start
- wxButton *BtnCancel;
- wxButton *BtnOK;
+ wxSizer *WxStdDialogButtonSizer1;
wxTextCtrl *EdtUser;
wxSpinCtrl *SpnPriority;
wxStaticText *LblUser;
wxStaticText *LblPriority;
+ wxFlexGridSizer *WxFlexGridSizer1;
wxTextCtrl *MemDescription;
wxStaticText *LblDescription;
+ wxBoxSizer *PanelSizer;
wxPanel *WxPanel1;
+ wxBoxSizer *DialogSizer;
////GUI Control Declaration End
private:
@@ -72,10 +74,10 @@
enum
{
////GUI Enum Control ID Start
- ID_EDTUSER = 1008,
- ID_SPNPRIORITY = 1007,
- ID_LBLUSER = 1006,
- ID_LBLPRIORITY = 1005,
+ ID_EDTUSER = 1017,
+ ID_SPNPRIORITY = 1016,
+ ID_LBLUSER = 1015,
+ ID_LBLPRIORITY = 1014,
ID_MEMDESCRIPTION = 1004,
ID_LBLDESCRIPTION = 1003,
ID_WXPANEL1 = 1002,
Modified: trunk/wxdevide/source/AddToDoFrm.wxform
===================================================================
--- trunk/wxdevide/source/AddToDoFrm.wxform 2008-10-03 12:38:21 UTC (rev 11)
+++ trunk/wxdevide/source/AddToDoFrm.wxform 2008-10-07 18:02:56 UTC (rev 12)
@@ -1,11 +1,11 @@
-object frmNewForm_2: TfrmNewForm
+object frmNewForm: TfrmNewForm
Left = 8
Top = 8
AutoScroll = False
BorderIcons = [biSystemMenu, biMinimize]
Caption = 'Add To-Do Item'
- ClientHeight = 206
- ClientWidth = 292
+ ClientHeight = 287
+ ClientWidth = 303
Color = clAppWorkSpace
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -13,7 +13,7 @@
Font.Name = 'MS Sans Serif'
Font.Style = []
OldCreateOrder = True
- PopupMenu = MainForm.DesignerPopup
+ PopupMenu = DesignerPopup.Owner
Visible = True
OnCreate = FormCreate
OnDestroy = FormDestroy
@@ -29,20 +29,33 @@
Wx_SizeToContents = True
Wx_GeneralStyle = []
Wx_DialogStyle = [wxCAPTION, wxSYSTEM_MENU, wxDIALOG_NO_PARENT, wxMINIMIZE_BOX, wxCLOSE_BOX, wxFRAME_TOOL_WINDOW]
- Wx_DesignerType = dtWxFrame
Wx_Border = 0
Wx_BorderAlignment = []
PixelsPerInch = 96
TextHeight = 13
- object WxPanel1: TWxPanel
+ object DialogSizer: TWxBoxSizer
Left = 0
Top = 0
- Width = 292
- Height = 206
+ Width = 303
+ Height = 287
Align = alClient
TabOrder = 0
+ Orientation = wxVertical
+ Wx_Class = 'wxBoxSizer'
+ Wx_ControlOrientation = wxControlVertical
+ Wx_IDName = 'ID_WXBOXSIZER1'
+ Wx_IDValue = 1001
+ Wx_Alignment = [wxEXPAND]
+ object WxPanel1: TWxPanel
+ Left = 1
+ Top = 1
+ Width = 301
+ Height = 285
+ Align = alClient
+ TabOrder = 0
Wx_BKColor = clBlack
Wx_Class = 'wxPanel'
+ Wx_ControlOrientation = wxControlVertical
Wx_Default = False
Wx_EventList.Strings = (
'EVT_UPDATE_UI:OnUpdateUI')
@@ -51,25 +64,41 @@
Wx_Hidden = False
Wx_IDName = 'ID_WXPANEL1'
Wx_IDValue = 1002
+ object PanelSizer: TWxBoxSizer
+ Left = 1
+ Top = 1
+ Width = 299
+ Height = 283
+ Align = alClient
+ TabOrder = 0
+ Orientation = wxVertical
+ Wx_Class = 'wxBoxSizer'
+ Wx_ControlOrientation = wxControlVertical
+ Wx_IDName = 'ID_WXBOXSIZER2'
+ Wx_IDValue = 1006
+ Wx_Alignment = [wxEXPAND]
+ Wx_StretchFactor = 1
object LblDescription: TWxStaticText
- Left = 8
- Top = 8
+ Left = 118
+ Top = 5
Width = 60
Height = 17
Caption = 'Description:'
TabOrder = 0
Wx_BGColor = clBlack
Wx_Class = 'wxStaticText'
+ Wx_ControlOrientation = wxControlVertical
Wx_FGColor = clBlack
Wx_GeneralStyle = []
Wx_Hidden = False
Wx_IDName = 'ID_LBLDESCRIPTION'
Wx_IDValue = 1003
Wx_LabelStyle = []
+ Wx_Alignment = [wxALIGN_LEFT]
end
object MemDescription: TWxMemo
- Left = 8
- Top = 24
+ Left = 9
+ Top = 32
Width = 277
Height = 95
BevelInner = bvNone
@@ -77,126 +106,134 @@
TabOrder = 1
Wx_BGColor = clBlack
Wx_Class = 'wxTextCtrl'
+ Wx_ControlOrientation = wxControlVertical
Wx_EditStyle = [wxTE_MULTILINE]
Wx_FGColor = clBlack
Wx_GeneralStyle = []
Wx_IDName = 'ID_MEMDESCRIPTION'
Wx_IDValue = 1004
Wx_MaxLength = 0
+ Wx_Alignment = [wxEXPAND]
+ Wx_StretchFactor = 1
end
+ object WxFlexGridSizer1: TWxFlexGridSizer
+ Left = 5
+ Top = 137
+ Width = 286
+ Height = 59
+ TabOrder = 2
+ Wx_Class = 'wxFlexGridSizer'
+ Wx_ControlOrientation = wxControlVertical
+ Wx_IDName = 'ID_WXFLEXGRIDSIZER1'
+ Wx_IDValue = 1013
object LblPriority: TWxStaticText
- Left = 8
- Top = 124
+ Left = 42
+ Top = 5
Width = 38
Height = 17
Caption = 'Priority:'
- TabOrder = 2
+ TabOrder = 0
Wx_BGColor = clBlack
Wx_Class = 'wxStaticText'
+ Wx_ControlOrientation = wxControlVertical
Wx_FGColor = clBlack
Wx_GeneralStyle = []
Wx_Hidden = False
Wx_IDName = 'ID_LBLPRIORITY'
- Wx_IDValue = 1005
+ Wx_IDValue = 1014
Wx_LabelStyle = []
+ Wx_Alignment = [wxALIGN_LEFT]
end
object LblUser: TWxStaticText
- Left = 132
- Top = 124
+ Left = 190
+ Top = 5
Width = 29
Height = 17
Caption = 'User:'
- TabOrder = 3
+ TabOrder = 1
Wx_BGColor = clBlack
Wx_Class = 'wxStaticText'
+ Wx_ControlOrientation = wxControlVertical
Wx_FGColor = clBlack
Wx_GeneralStyle = []
Wx_Hidden = False
Wx_IDName = 'ID_LBLUSER'
- Wx_IDValue = 1006
+ Wx_IDValue = 1015
Wx_LabelStyle = []
+ Wx_Alignment = [wxALIGN_LEFT]
+ Wx_StretchFactor = 1
end
object SpnPriority: TWxSpinCtrl
- Left = 8
- Top = 140
+ Left = 5
+ Top = 32
Width = 113
Height = 22
MaxValue = 9
MinValue = 1
- TabOrder = 4
+ TabOrder = 2
Value = 1
Wx_BGColor = clBlack
Wx_Class = 'wxSpinCtrl'
Wx_SpinButtonStyle = []
Wx_EditStyle = []
+ Wx_ControlOrientation = wxControlVertical
Wx_FGColor = clBlack
Wx_GeneralStyle = []
Wx_Hidden = False
Wx_IDName = 'ID_SPNPRIORITY'
- Wx_IDValue = 1007
+ Wx_IDValue = 1016
+ Wx_Alignment = [wxALIGN_LEFT]
end
object EdtUser: TWxEdit
- Left = 132
- Top = 140
+ Left = 128
+ Top = 32
Width = 153
Height = 22
BevelInner = bvNone
BevelOuter = bvNone
Modified = False
AutoSize = False
- TabOrder = 5
+ TabOrder = 3
Wx_BGColor = clBlack
Wx_Class = 'wxTextCtrl'
+ Wx_ControlOrientation = wxControlVertical
Wx_EditStyle = []
Wx_FGColor = clBlack
Wx_GeneralStyle = []
Wx_Hidden = False
Wx_IDName = 'ID_EDTUSER'
- Wx_IDValue = 1008
+ Wx_IDValue = 1017
Wx_Validator = 'wxTextValidator(wxFILTER_ALPHANUMERIC, NULL)'
+ Wx_Alignment = []
+ Wx_StretchFactor = 1
Wx_MaxLength = 0
end
- object BtnOK: TWxButton
- Left = 131
- Top = 172
- Width = 75
- Height = 25
- Caption = 'OK'
- TabOrder = 6
- EVT_BUTTON = 'BtnOKClick'
- Wx_BKColor = clBlack
- Wx_ButtonStyle = []
- Wx_Class = 'wxButton'
- Wx_Default = False
- Wx_EventList.Strings = (
- 'EVT_BUTTON:OnClick'
- 'EVT_UPDATE_UI:OnUpdateUI')
- Wx_FGColor = clBlack
- Wx_GeneralStyle = []
- Wx_Hidden = False
- Wx_IDName = 'wxID_OK'
- Wx_IDValue = 1009
end
- object BtnCancel: TWxButton
- Left = 211
- Top = 172
- Width = 75
- Height = 25
- Caption = 'Cancel'
- TabOrder = 7
- EVT_BUTTON = 'BtnCancelClick'
- Wx_BKColor = clBlack
- Wx_ButtonStyle = []
- Wx_Class = 'wxButton'
- Wx_Default = False
+ end
+ end
+ object WxStdDialogButtonSizer1: TWxStdDialogButtonSizer
+ Left = 78
+ Top = 300
+ Width = 155
+ Height = 23
+ TabOrder = 1
+ Wx_Class = 'wxStdDialogButtonSizer'
Wx_EventList.Strings = (
- 'EVT_BUTTON:OnClick'
- 'EVT_UPDATE_UI:OnUpdateUI')
- Wx_FGColor = clBlack
- Wx_GeneralStyle = []
- Wx_Hidden = False
- Wx_IDName = 'wxID_CANCEL'
- Wx_IDValue = 1011
+ 'EVT_OK_BUTTON:OnOkClick'
+ 'EVT_OK_UPDATE_UI:OnOkUpdateUI'
+ 'EVT_APPLY_BUTTON:OnApplyClick'
+ 'EVT_APPLY_UPDATE_UI:OnApplyUpdateUI'
+ 'EVT_NO_BUTTON:OnNoClick'
+ 'EVT_NO_UPDATE_UI:OnNoUpdateUI'
+ 'EVT_CANCEL_BUTTON:OnCancelClick'
+ 'EVT_CANCEL_UPDATE_UI:OnCancelUpdateUI'
+ 'EVT_HELP_BUTTON:OnHelpClick'
+ 'EVT_HELP_UPDATE_UI:OnHelpUpdateUI')
+ Wx_IDName = 'ID_WXSTDDIALOGBUTTONSIZER1'
+ Wx_IDValue = 1012
+ Wx_Buttons = [wxID_OK, wxID_CANCEL]
+ EVT_OK_BUTTON = 'BtnOKClick'
+ EVT_CANCEL_BUTTON = 'BtnCancelClick'
end
end
end
Modified: trunk/wxdevide/source/EnviroFrm.cpp
===================================================================
--- trunk/wxdevide/source/EnviroFrm.cpp 2008-10-03 12:38:21 UTC (rev 11)
+++ trunk/wxdevide/source/EnviroFrm.cpp 2008-10-07 18:02:56 UTC (rev 12)
@@ -21,6 +21,9 @@
#include "Images/TEnviroForm_btnAltConfig_XPM.xpm"
////Header Include End
+
+#include "devcfg.h" // Needed to access DevData
+
//----------------------------------------------------------------------------
// TEnviroForm
//----------------------------------------------------------------------------
@@ -82,19 +85,19 @@
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);
+ 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);
+ wxArrayString arrayStringFor_rgbAutoOpen;
+ arrayStringFor_rgbAutoOpen.Add(_("All Project Files"));
+ arrayStringFor_rgbAutoOpen.Add(_("Only First Project File"));
+ arrayStringFor_rgbAutoOpen.Add(_("None"));
+ rgbAutoOpen = new wxRadioBox(tabGeneral, ID_WXRADIOBOX1, _("Auto Open"), wxDefaultPosition, wxDefaultSize, arrayStringFor_rgbAutoOpen, 1, wxRA_SPECIFY_COLS, wxDefaultValidator, _("rgbAutoOpen"));
+ rgbAutoOpen->SetSelection(0);
+ RadioStaticSizer->Add(rgbAutoOpen,0,wxALIGN_CENTER | wxALL,5);
wxStaticBox* gbDebugger_StaticBoxObj = new wxStaticBox(tabGeneral, wxID_ANY, _("Debug Variable Browser"));
gbDebugger = new wxStaticBoxSizer(gbDebugger_StaticBoxObj, wxVERTICAL);
@@ -119,28 +122,30 @@
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);
+ seMRUMax = new wxSpinCtrl(tabInterface, ID_SEMRUMAX, _("0"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 12, 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"));
+ arrayStringFor_cboTabsTop.Add(_("Bottom"));
+ arrayStringFor_cboTabsTop.Add(_("Top"));
+ cboTabsTop = new wxComboBox(tabInterface, ID_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"));
+ cboLang = new wxComboBox(tabInterface, ID_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"));
+ cboTheme = new wxComboBox(tabInterface, ID_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"));
@@ -255,8 +260,8 @@
SplashScreenSizer = new wxBoxSizer(wxHORIZONTAL);
FilesBoxSizer->Add(SplashScreenSizer, 1, wxEXPAND | 0, 5);
- WxEdit6 = new wxTextCtrl(tabPaths, ID_WXEDIT6, _(""), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("WxEdit6"));
- SplashScreenSizer->Add(WxEdit6,1,wxALIGN_LEFT | wxLEFT | wxRIGHT | wxBOTTOM,5);
+ edSplash = new wxTextCtrl(tabPaths, ID_EDSPLASH, _(""), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("edSplash"));
+ SplashScreenSizer->Add(edSplash,1,wxALIGN_LEFT | wxLEFT | wxRIGHT | wxBOTTOM,5);
wxBitmap btnBrwSplash_BITMAP (TEnviroForm_btnBrwSplash_XPM);
btnBrwSplash = new wxBitmapButton(tabPaths, ID_BTNBRWSPLASH, btnBrwSplash_BITMAP, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW, wxDefaultValidator, _("btnBrwSplash"));
@@ -367,3 +372,115 @@
{
// insert your code here
}
+
+/*!
+* Transfer data to the window
+*/
+bool TEnviroForm::TransferDataToWindow()
+{
+ extern TdevData * DevData;
+ extern TdevDirs * DevDirs;
+
+ //General Info First
+ cbSingleInstance->SetValue(DevData->GetSingleInstance());
+ cbBackups->SetValue(DevData->GetBackUps());
+ cbMinOnRun->SetValue(DevData->GetMinOnRun());
+ cbShowBars->SetValue(DevData->GetShowBars());
+ cbShowMenu->SetValue(DevData->GetShowMenu());
+ cbDblFiles->SetValue(DevData->GetDblFiles());
+ rgbAutoOpen->SetSelection(DevData->GetAutoOpen());
+ cbWatchHint->SetValue(DevData->GetWatchHint());
+ cbWatchError->SetValue(DevData->GetWatchError());
+
+ //Interface Window Next
+ seMRUMax->SetValue(DevData->GetMRUMax());
+// cboTabsTop->SetValue(DevData->GetMsgTabs());
+ cboLang->Clear();
+ // Fill the Language combo with the language list here
+ // Fill the Theme Combobox here
+ cboTheme->Clear();
+
+ cbNoSplashScreen->SetValue(DevData->GetNoSplashScreen());
+ cbXPTheme->SetValue(DevData->GetXPTheme());
+ cbNativeDocks->SetValue(DevData->GetNativeDocks());
+ rgbOpenStyle->SetSelection(DevData->GetOpenStyle());
+ cbShowProgress->SetValue(DevData->GetShowProgress());
+ cbAutoCloseProgress->SetValue(DevData->GetAutoCloseProgress());
+
+ //Files and Directories
+ chkAltConfig->SetValue(DevData->GetUseAltConfigFile());
+ edAltConfig->SetValue(DevData->GetAltConfigFile());
+ edUserDir->SetValue(DevDirs->GetDefault());
+ edTemplatesDir->SetValue(DevDirs->GetTemplates());
+ edIcoLib->SetValue(DevDirs->GetIcons());
+ edLang->SetValue(DevDirs->GetLang());
+ edSplash->SetValue(DevData->GetSplash());
+
+ //External programs
+ //fill the view with our data
+ //vleExternal->
+
+ //File Associations
+ //lstAssocFileTypes->
+
+ //Source Code Control
+ //edCVSExec->
+
+ return true;
+}
+/*!
+* Transfer data from the window
+*/
+bool TEnviroForm::TransferDataFromWindow()
+{
+ extern TdevData * DevData;
+ extern TdevDirs * DevDirs;
+
+ //General Info First
+ DevData->SetSingleInstance(cbSingleInstance->GetValue());
+ DevData->SetBackUps(cbBackups->GetValue());
+ DevData->SetMinOnRun(cbMinOnRun->GetValue());
+ DevData->SetShowBars(cbShowBars->GetValue());
+ DevData->SetShowMenu(cbShowMenu->GetValue());
+ DevData->SetDblFiles(cbDblFiles->GetValue());
+ DevData->SetAutoOpen(rgbAutoOpen->GetSelection());
+ DevData->SetWatchHint(cbWatchHint->GetValue());
+ DevData->SetWatchError(cbWatchError->GetValue());
+
+ //Interface Window Next
+ seMRUMax->SetValue(DevData->GetMRUMax());
+// cboTabsTop->SetValue(DevData->GetMsgTabs());
+ cboLang->Clear();
+ // Fill the Language combo with the language list here
+ // Fill the Theme Combobox here
+ cboTheme->Clear();
+
+ DevData->SetNoSplashScreen(cbNoSplashScreen->GetValue());
+ DevData->SetXPTheme(cbXPTheme->GetValue());
+ DevData->SetNativeDocks(cbNativeDocks->GetValue());
+ DevData->SetOpenStyle(rgbOpenStyle->GetSelection());
+ DevData->SetShowProgress(cbShowProgress->GetValue());
+ DevData->SetAutoCloseProgress(cbAutoCloseProgress->GetValue());
+
+ //Files and Directories
+ DevData->SetUseAltConfigFile(chkAltConfig->GetValue());
+ DevData->SetAltConfigFile(edAltConfig->GetValue());
+ DevDirs->SetDefault(edUserDir->GetValue());
+ DevDirs->SetTemplates(edTemplatesDir->GetValue());
+ DevDirs->SetIcons(edIcoLib->GetValue());
+ DevDirs->SetLang(edLang->GetValue());
+ DevData->SetSplash(edSplash->GetValue());
+
+ //External programs
+ //fill the view with our data
+ //vleExternal->
+
+ //File Associations
+ //lstAssocFileTypes->
+
+ //Source Code Control
+ //edCVSExec->
+
+
+ return true;
+}
Modified: trunk/wxdevide/source/EnviroFrm.h
===================================================================
--- trunk/wxdevide/source/EnviroFrm.h 2008-10-03 12:38:21 UTC (rev 11)
+++ trunk/wxdevide/source/EnviroFrm.h 2008-10-07 18:02:56 UTC (rev 12)
@@ -85,7 +85,7 @@
wxBoxSizer *ExtProgSizer;
wxPanel *tabExternal;
wxBitmapButton *btnBrwSplash;
- wxTextCtrl *WxEdit6;
+ wxTextCtrl *edSplash;
wxBoxSizer *SplashScreenSizer;
wxStaticText *lblSplash;
wxBitmapButton *btnBrwLang;
@@ -133,9 +133,9 @@
wxCheckBox *cbWatchError;
wxCheckBox *cbWatchHint;
wxStaticBoxSizer *gbDebugger;
- wxRadioBox *WxRadioBox1;
+ wxRadioBox *rgbAutoOpen;
wxBoxSizer *RadioStaticSizer;
- wxCheckBox *cbdblFiles;
+ wxCheckBox *cbDblFiles;
wxCheckBox *cbShowMenu;
wxCheckBox *cbShowBars;
wxCheckBox *cbMinOnRun;
@@ -172,7 +172,7 @@
ID_LBLEXTERNAL = 1077,
ID_TABEXTERNAL = 1008,
ID_BTNBRWSPLASH = 1072,
- ID_WXEDIT6 = 1071,
+ ID_EDSPLASH = 1071,
ID_LBLSPLASH = 1061,
ID_BTNBRWLANG = 1070,
ID_EDLANG = 1069,
@@ -223,6 +223,8 @@
private:
void OnClose(wxCloseEvent& event);
void CreateGUIControls();
+ bool TransferDataToWindow();
+ bool TransferDataFromWindow();
};
#endif
Modified: trunk/wxdevide/source/EnviroFrm.wxform
===================================================================
--- trunk/wxdevide/source/EnviroFrm.wxform 2008-10-03 12:38:21 UTC (rev 11)
+++ trunk/wxdevide/source/EnviroFrm.wxform 2008-10-07 18:02:56 UTC (rev 12)
@@ -177,7 +177,7 @@
Wx_IDValue = 1016
Wx_Alignment = [wxALIGN_LEFT]
end
- object cbdblFiles: TWxCheckBox
+ object cbDblFiles: TWxCheckBox
Left = 5
Top = 140
Width = 248
@@ -205,7 +205,7 @@
Wx_ControlOrientation = wxControlVertical
Wx_IDName = 'ID_WXBOXSIZER5'
Wx_IDValue = 1019
- object WxRadioBox1: TWxRadioBox
+ object rgbAutoOpen: TWxRadioBox
Left = 5
Top = 5
Width = 185
@@ -342,6 +342,7 @@
Top = 5
Width = 121
Height = 24
+ MaxValue = 12
MinValue = 0
TabOrder = 1
Value = 0
@@ -380,7 +381,9 @@
Height = 23
ItemHeight = 15
TabOrder = 3
- Text = 'cboTabsTop'
+ Items.Strings = (
+ 'Bottom'
+ 'Top')
Wx_BGColor = clBlack
Wx_Class = 'wxComboBox'
Wx_ComboboxStyle = []
@@ -414,9 +417,8 @@
Top = 72
Width = 145
Height = 23
- ItemHeight = 15
+ ItemHeight = 0
TabOrder = 5
- Text = 'cboLang'
Wx_BGColor = clBlack
Wx_Class = 'wxComboBox'
Wx_ComboboxStyle = []
@@ -450,9 +452,8 @@
Top = 105
Width = 145
Height = 23
- ItemHeight = 15
+ ItemHeight = 0
TabOrder = 7
- Text = 'cboTheme'
Wx_BGColor = clBlack
Wx_Class = 'wxComboBox'
Wx_ComboboxStyle = []
@@ -645,8 +646,8 @@
Wx_IDValue = 1047
Wx_Alignment = [wxEXPAND]
object chkAltConfig: TWxCheckBox
- Left = 19
- Top = 20
+ Left = 8
+ Top = 23
Width = 137
Height = 17
Caption = 'Use this alternate configuration file'
@@ -1343,7 +1344,7 @@
Wx_BorderAlignment = []
Wx_Alignment = [wxEXPAND]
Wx_StretchFactor = 1
- object WxEdit6: TWxEdit
+ object edSplash: TWxEdit
Left = 268
Top = 471
Width = 121
@@ -1360,7 +1361,7 @@
Wx_FGColor = clBlack
Wx_GeneralStyle = []
Wx_Hidden = False
- Wx_IDName = 'ID_WXEDIT6'
+ Wx_IDName = 'ID_EDSPLASH'
Wx_IDValue = 1071
Wx_Alignment = [wxALIGN_LEFT]
Wx_StretchFactor = 1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ni...@us...> - 2009-09-16 20:17:56
|
Revision: 14
http://wxdevide.svn.sourceforge.net/wxdevide/?rev=14&view=rev
Author: ninjanl
Date: 2009-09-16 20:17:38 +0000 (Wed, 16 Sep 2009)
Log Message:
-----------
Change to allow successful build. (changed the EnvForm Icons to point to the correct image (Images/gnome/Explorer.bmp))
Modified Paths:
--------------
trunk/wxdevide/source/DevCpp.dev
trunk/wxdevide/source/EnviroFrm.cpp
trunk/wxdevide/source/EnviroFrm.h
trunk/wxdevide/source/EnviroFrm.wxform
Added Paths:
-----------
trunk/wxdevide/source/Images/TEnviroForm_WxBitmapButton1_XPM.xpm
trunk/wxdevide/source/Images/TEnviroForm_btnAltConfig_XPM.xpm
trunk/wxdevide/source/Images/TEnviroForm_btnBrwIcon_XPM.xpm
trunk/wxdevide/source/Images/TEnviroForm_btnBrwLang_XPM.xpm
trunk/wxdevide/source/Images/TEnviroForm_btnBrwSplash_XPM.xpm
trunk/wxdevide/source/Images/TEnviroForm_btnDefBrws_XPM.xpm
trunk/wxdevide/source/Images/TEnviroForm_btnOutputbrws_XPM.xpm
Modified: trunk/wxdevide/source/DevCpp.dev
===================================================================
--- trunk/wxdevide/source/DevCpp.dev 2008-10-23 16:46:26 UTC (rev 13)
+++ trunk/wxdevide/source/DevCpp.dev 2009-09-16 20:17:38 UTC (rev 14)
@@ -104,7 +104,7 @@
Major=0
Minor=1
Release=1
-Build=1741
+Build=1744
LanguageID=1033
CharsetID=1252
CompanyName=Sof.T
@@ -145,7 +145,7 @@
IncludeVersionInfo=1
SupportXPThemes=1
CompilerSet=0
-compilerType=0
+CompilerType=0
[Profile2]
ProfileName=Visual C++ 2005
@@ -173,7 +173,7 @@
IncludeVersionInfo=0
SupportXPThemes=0
CompilerSet=1
-compilerType=1
+CompilerType=1
[Profile3]
ProfileName=DigitalMars C++
@@ -201,7 +201,7 @@
IncludeVersionInfo=0
SupportXPThemes=0
CompilerSet=0
-compilerType=0
+CompilerType=0
[Unit10]
FileName=MainFrm.wxform
Modified: trunk/wxdevide/source/EnviroFrm.cpp
===================================================================
--- trunk/wxdevide/source/EnviroFrm.cpp 2008-10-23 16:46:26 UTC (rev 13)
+++ trunk/wxdevide/source/EnviroFrm.cpp 2009-09-16 20:17:38 UTC (rev 14)
@@ -12,13 +12,6 @@
//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
@@ -56,299 +49,141 @@
//Add the custom code before or after the blocks
////GUI Items Creation Start
+ wxInitAllImageHandlers(); //Initialize graphic format handlers
+
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);
+ PagesMain = XRCCTRL(*this, wxT("PagesMain"), wxNotebook);
- tabGeneral = new wxPanel(PagesMain, ID_TABGENERAL, wxDefaultPosition, wxDefaultSize);
- PagesMain->AddPage(tabGeneral, _("General"));
+ tabGeneral = XRCCTRL(*PagesMain, wxT("tabGeneral"), wxPanel);
- GeneralBoxSizer = new wxBoxSizer(wxVERTICAL);
- tabGeneral->SetSizer(GeneralBoxSizer);
- tabGeneral->SetAutoLayout(true);
+ cbSingleInstance = XRCCTRL(*tabGeneral, wxT("cbSingleInstance"), wxCheckBox);
- 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 = XRCCTRL(*tabGeneral, wxT("cbBackups"), wxCheckBox);
- cbBackups = new wxCheckBox(tabGeneral, ID_CBBACKUPS, _("Create File Backups"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("cbBackups"));
- GeneralBoxSizer->Add(cbBackups,0,wxALIGN_LEFT | wxALL,5);
+ cbMinOnRun = XRCCTRL(*tabGeneral, wxT("cbMinOnRun"), wxCheckBox);
- cbMinOnRun = new wxCheckBox(tabGeneral, ID_CBMINONRUN, _("Minimize on Run"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("cbMinOnRun"));
- GeneralBoxSizer->Add(cbMinOnRun,0,wxALIGN_LEFT | wxALL,5);
+ cbShowBars = XRCCTRL(*tabGeneral, wxT("cbShowBars"), wxCheckBox);
- 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 = XRCCTRL(*tabGeneral, wxT("cbShowMenu"), wxCheckBox);
- 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 = XRCCTRL(*tabGeneral, wxT("cbDblFiles"), wxCheckBox);
- 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_rgbAutoOpen;
- arrayStringFor_rgbAutoOpen.Add(_("All Project Files"));
- arrayStringFor_rgbAutoOpen.Add(_("Only First Project File"));
- arrayStringFor_rgbAutoOpen.Add(_("None"));
- rgbAutoOpen = new wxRadioBox(tabGeneral, ID_WXRADIOBOX1, _("Auto Open"), wxDefaultPosition, wxDefaultSize, arrayStringFor_rgbAutoOpen, 1, wxRA_SPECIFY_COLS, wxDefaultValidator, _("rgbAutoOpen"));
+ rgbAutoOpen = XRCCTRL(*tabGeneral, wxT("rgbAutoOpen"), wxRadioBox);
rgbAutoOpen->SetSelection(0);
- RadioStaticSizer->Add(rgbAutoOpen,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 = XRCCTRL(*tabGeneral, wxT("cbWatchHint"), wxCheckBox);
- cbWatchHint = new wxCheckBox(tabGeneral, ID_CBWATCHHINT, _("Watch variable under mouse"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("cbWatchHint"));
- gbDebugger->Add(cbWatchHint,0,wxALIGN_LEFT | wxALL,5);
+ cbWatchError = XRCCTRL(*tabGeneral, wxT("cbWatchError"), wxCheckBox);
- cbWatchError = new wxCheckBox(tabGeneral, ID_CBWATCHERROR, _("Report watch errors"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("cbWatchError"));
- gbDebugger->Add(cbWatchError,0,wxALIGN_LEFT | wxALL,5);
+ tabInterface = XRCCTRL(*PagesMain, wxT("tabInterface"), wxPanel);
- tabInterface = new wxPanel(PagesMain, ID_TABINTERFACE, wxDefaultPosition, wxDefaultSize);
- PagesMain->AddPage(tabInterface, _("Interface"));
+ lblMRU = XRCCTRL(*tabInterface, wxT("lblMRU"), wxStaticText);
- InterfaceSizer = new wxBoxSizer(wxVERTICAL);
- tabInterface->SetSizer(InterfaceSizer);
- tabInterface->SetAutoLayout(true);
+ lblMRU = XRCCTRL(*tabInterface, wxT("lblMRU"), wxStaticText);
- WxFlexGridSizer1 = new wxFlexGridSizer(0, 2, 0, 0);
- InterfaceSizer->Add(WxFlexGridSizer1, 0, wxALIGN_CENTER | wxALL, 5);
+ seMRUMax = XRCCTRL(*tabInterface, wxT("seMRUMax"), wxSpinCtrl);
- 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);
+ lblmsgTabs = XRCCTRL(*tabInterface, wxT("lblmsgTabs"), wxStaticText);
- seMRUMax = new wxSpinCtrl(tabInterface, ID_SEMRUMAX, _("0"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 12, 0);
- WxFlexGridSizer1->Add(seMRUMax,0,wxALIGN_CENTER | wxALL,5);
+ cboTabsTop = XRCCTRL(*tabInterface, wxT("cboTabsTop"), wxComboBox);
- lblmsgTabs = new wxStaticText(tabInterface, ID_LBLMSGTABS, _("Message Window Tabs:"), wxDefaultPosition, wxDefaultSize, 0, _("lblmsgTabs"));
- WxFlexGridSizer1->Add(lblmsgTabs,0,wxALIGN_CENTER | wxALL,5);
+ lblLang = XRCCTRL(*tabInterface, wxT("lblLang"), wxStaticText);
- wxArrayString arrayStringFor_cboTabsTop;
- arrayStringFor_cboTabsTop.Add(_("Bottom"));
- arrayStringFor_cboTabsTop.Add(_("Top"));
- cboTabsTop = new wxComboBox(tabInterface, ID_CBOTABSTOP, _(""), wxDefaultPosition, wxDefaultSize, arrayStringFor_cboTabsTop, 0, wxDefaultValidator, _("cboTabsTop"));
- WxFlexGridSizer1->Add(cboTabsTop,0,wxALIGN_CENTER | wxALL,5);
+ cboLang = XRCCTRL(*tabInterface, wxT("cboLang"), wxComboBox);
- lblLang = new wxStaticText(tabInterface, ID_LBLLANG, _("Language:"), wxDefaultPosition, wxDefaultSize, 0, _("lblLang"));
- WxFlexGridSizer1->Add(lblLang,0,wxALIGN_CENTER | wxALL,5);
+ lblTheme = XRCCTRL(*tabInterface, wxT("lblTheme"), wxStaticText);
- wxArrayString arrayStringFor_cboLang;
- cboLang = new wxComboBox(tabInterface, ID_CBOLANG, _(""), wxDefaultPosition, wxDefaultSize, arrayStringFor_cboLang, 0, wxDefaultValidator, _("cboLang"));
- WxFlexGridSizer1->Add(cboLang,0,wxALIGN_CENTER | wxALL,5);
+ cboTheme = XRCCTRL(*tabInterface, wxT("cboTheme"), wxComboBox);
- lblTheme = new wxStaticText(tabInterface, ID_LBLTHEME, _("Theme:"), wxDefaultPosition, wxDefaultSize, 0, _("lblTheme"));
- WxFlexGridSizer1->Add(lblTheme,0,wxALIGN_CENTER | wxALL,5);
+ cbNoSplashScreen = XRCCTRL(*tabInterface, wxT("cbNoSplashScreen"), wxCheckBox);
- wxArrayString arrayStringFor_cboTheme;
- cboTheme = new wxComboBox(tabInterface, ID_CBOTHEME, _(""), wxDefaultPosition, wxDefaultSize, arrayStringFor_cboTheme, 0, wxDefaultValidator, _("cboTheme"));
- WxFlexGridSizer1->Add(cboTheme,0,wxALIGN_CENTER | wxALL,5);
+ cbXPTheme = XRCCTRL(*tabInterface, wxT("cbXPTheme"), wxCheckBox);
- cbNoSplashScreen = new wxCheckBox(tabInterface, ID_CBNOSPLASHSCREEN, _("No Splash Screen on startup"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("cbNoSplashScreen"));
- InterfaceSizer->Add(cbNoSplashScreen,0,wxALIGN_LEFT | wxALL,5);
+ cbNativeDocks = XRCCTRL(*tabInterface, wxT("cbNativeDocks"), wxCheckBox);
- 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 = XRCCTRL(*tabInterface, wxT("rgbOpenStyle"), wxRadioBox);
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 = XRCCTRL(*tabInterface, wxT("cbShowProgress"), wxCheckBox);
- cbShowProgress = new wxCheckBox(tabInterface, ID_CBSHOWPROGRESS, _("&Show during compilation"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("cbShowProgress"));
- WxStaticBoxSizer1->Add(cbShowProgress,0,wxALIGN_CENTER | wxALL,5);
+ cbAutoCloseProgress = XRCCTRL(*tabInterface, wxT("cbAutoCloseProgress"), wxCheckBox);
- cbAutoCloseProgress = new wxCheckBox(tabInterface, ID_CBAUTOCLOSEPROGRESS, _("&Auto close after compile"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("cbAutoCloseProgress"));
- WxStaticBoxSizer1->Add(cbAutoCloseProgress,0,wxALIGN_CENTER | wxALL,5);
+ tabPaths = XRCCTRL(*PagesMain, wxT("tabPaths"), wxPanel);
- tabPaths = new wxPanel(PagesMain, ID_TABPATHS, wxDefaultPosition, wxDefaultSize);
- PagesMain->AddPage(tabPaths, _("Files && Directories"));
+ chkAltConfig = XRCCTRL(*tabPaths, wxT("chkAltConfig"), wxCheckBox);
- FilesBoxSizer = new wxBoxSizer(wxVERTICAL);
- tabPaths->SetSizer(FilesBoxSizer);
- tabPaths->SetAutoLayout(true);
+ edAltConfig = XRCCTRL(*tabPaths, wxT("edAltConfig"), wxTextCtrl);
- wxStaticBox* WxStaticBoxSizer2_StaticBoxObj = new wxStaticBox(tabPaths, wxID_ANY, _(" Alternate Configuration File "));
- WxStaticBoxSizer2 = new wxStaticBoxSizer(WxStaticBoxSizer2_StaticBoxObj, wxVERTICAL);
- FilesBoxSizer->Add(WxStaticBoxSizer2, 0, wxEXPAND | wxALL, 5);
+ btnAltConfig = XRCCTRL(*tabPaths, wxT("btnAltConfig"), wxBitmapButton);
- 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);
+ lblUserDir = XRCCTRL(*tabPaths, wxT("lblUserDir"), wxStaticText);
- AltConfSizer = new wxBoxSizer(wxHORIZONTAL);
- WxStaticBoxSizer2->Add(AltConfSizer, 1, wxALIGN_LEFT | wxALIGN_RIGHT | wxEXPAND | wxALL, 5);
+ edUserDir = XRCCTRL(*tabPaths, wxT("edUserDir"), wxTextCtrl);
- edAltConfig = new wxTextCtrl(tabPaths, ID_EDALTCONFIG, _(""), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("edAltConfig"));
- AltConfSizer->Add(edAltConfig,1,wxALIGN_LEFT | wxEXPAND | wxALL,5);
+ btnDefBrws = XRCCTRL(*tabPaths, wxT("btnDefBrws"), wxBitmapButton);
- wxBitmap btnAltConfig_BITMAP (TEnviroForm_btnAltConfig_XPM);
- btnAltConfig = new wxBitmapButton(tabPaths, ID_BTNALTCONFIG, btnAltConfig_BITMAP, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW, wxDefaultValidator, _("btnAltConfig"));
- AltConfSizer->Add(btnAltConfig, 0, wxALIGN_RIGHT | wxALL, 5);
+ lblTemplatesDir = XRCCTRL(*tabPaths, wxT("lblTemplatesDir"), wxStaticText);
- lblUserDir = new wxStaticText(tabPaths, ID_LBLUSERDIR, _("User's Default Directory"), wxDefaultPosition, wxDefaultSize, 0, _("lblUserDir"));
- FilesBoxSizer->Add(lblUserDir,0,wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP,5);
+ edTemplatesDir = XRCCTRL(*tabPaths, wxT("edTemplatesDir"), wxTextCtrl);
- UserDefSizer = new wxBoxSizer(wxHORIZONTAL);
- FilesBoxSizer->Add(UserDefSizer, 1, wxEXPAND | 0, 5);
+ btnOutputbrws = XRCCTRL(*tabPaths, wxT("btnOutputbrws"), wxBitmapButton);
- edUserDir = new wxTextCtrl(tabPaths, ID_EDUSERDIR, _(""), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("edUserDir"));
- UserDefSizer->Add(edUserDir,1,wxALIGN_LEFT | wxLEFT | wxRIGHT | wxBOTTOM,5);
+ lblIcoLib = XRCCTRL(*tabPaths, wxT("lblIcoLib"), wxStaticText);
- wxBitmap btnDefBrws_BITMAP (TEnviroForm_btnDefBrws_XPM);
- btnDefBrws = new wxBitmapButton(tabPaths, ID_BTNDEFBRWS, btnDefBrws_BITMAP, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW, wxDefaultValidator, _("btnDefBrws"));
- UserDefSizer->Add(btnDefBrws, 0, wxALIGN_RIGHT | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+ edIcoLib = XRCCTRL(*tabPaths, wxT("edIcoLib"), wxTextCtrl);
- lblTemplatesDir = new wxStaticText(tabPaths, ID_LBLTEMPLATESDIR, _("Templates Directory"), wxDefaultPosition, wxDefaultSize, 0, _("lblTemplatesDir"));
- FilesBoxSizer->Add(lblTemplatesDir,0,wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP,5);
+ btnBrwIcon = XRCCTRL(*tabPaths, wxT("btnBrwIcon"), wxBitmapButton);
- TempDirSizer = new wxBoxSizer(wxHORIZONTAL);
- FilesBoxSizer->Add(TempDirSizer, 1, wxEXPAND | 0, 5);
+ lblLangPath = XRCCTRL(*tabPaths, wxT("lblLangPath"), wxStaticText);
- edTemplatesDir = new wxTextCtrl(tabPaths, ID_EDTEMPLATESDIR, _(""), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("edTemplatesDir"));
- TempDirSizer->Add(edTemplatesDir,1,wxALIGN_LEFT | wxLEFT | wxRIGHT | wxBOTTOM,5);
+ edLang = XRCCTRL(*tabPaths, wxT("edLang"), wxTextCtrl);
- wxBitmap btnOutputbrws_BITMAP (TEnviroForm_btnOutputbrws_XPM);
- btnOutputbrws = new wxBitmapButton(tabPaths, ID_BTNOUTPUTBRWS, btnOutputbrws_BITMAP, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW, wxDefaultValidator, _("btnOutputbrws"));
- TempDirSizer->Add(btnOutputbrws, 0, wxALIGN_RIGHT | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+ btnBrwLang = XRCCTRL(*tabPaths, wxT("btnBrwLang"), wxBitmapButton);
- lblIcoLib = new wxStaticText(tabPaths, ID_LBLICOLIB, _("Icon Library Path"), wxDefaultPosition, wxDefaultSize, 0, _("lblIcoLib"));
- FilesBoxSizer->Add(lblIcoLib,0,wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP,5);
+ lblSplash = XRCCTRL(*tabPaths, wxT("lblSplash"), wxStaticText);
- IconLibPathSizer = new wxBoxSizer(wxHORIZONTAL);
- FilesBoxSizer->Add(IconLibPathSizer, 1, wxEXPAND | 0, 5);
+ edSplash = XRCCTRL(*tabPaths, wxT("edSplash"), wxTextCtrl);
- edIcoLib = new wxTextCtrl(tabPaths, ID_EDICOLIB, _(""), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("edIcoLib"));
- IconLibPathSizer->Add(edIcoLib,1,wxALIGN_LEFT | wxLEFT | wxRIGHT | wxBOTTOM,5);
+ btnBrwSplash = XRCCTRL(*tabPaths, wxT("btnBrwSplash"), wxBitmapButton);
- wxBitmap btnBrwIcon_BITMAP (TEnviroForm_btnBrwIcon_XPM);
- btnBrwIcon = new wxBitmapButton(tabPaths, ID_BTNBRWICON, btnBrwIcon_BITMAP, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW, wxDefaultValidator, _("btnBrwIcon"));
- IconLibPathSizer->Add(btnBrwIcon, 0, wxALIGN_RIGHT | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+ tabExternal = XRCCTRL(*PagesMain, wxT("tabExternal"), wxPanel);
- lblLangPath = new wxStaticText(tabPaths, ID_LBLLANGPATH, _("Language Path"), wxDefaultPosition, wxDefaultSize, 0, _("lblLangPath"));
- FilesBoxSizer->Add(lblLangPath,0,wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP,5);
+ lblExternal = XRCCTRL(*tabExternal, wxT("lblExternal"), wxStaticText);
- LangPathSizer = new wxBoxSizer(wxHORIZONTAL);
- FilesBoxSizer->Add(LangPathSizer, 1, wxEXPAND | 0, 5);
+ vleExternal = XRCCTRL(*tabExternal, wxT("vleExternal"), wxListCtrl);
+ vleExternal->InsertColumn(0,wxT("External Program"),wxLIST_FORMAT_LEFT,393 );
+ vleExternal->InsertColumn(0,wxT("Extension"),wxLIST_FORMAT_LEFT,50 );
- edLang = new wxTextCtrl(tabPaths, ID_EDLANG, _(""), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("edLang"));
- LangPathSizer->Add(edLang,1,wxALIGN_LEFT | wxLEFT | wxRIGHT | wxBOTTOM,5);
+ btnExtAdd = XRCCTRL(*tabExternal, wxT("btnExtAdd"), wxButton);
- wxBitmap btnBrwLang_BITMAP (TEnviroForm_btnBrwLang_XPM);
- btnBrwLang = new wxBitmapButton(tabPaths, ID_BTNBRWLANG, btnBrwLang_BITMAP, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW, wxDefaultValidator, _("btnBrwLang"));
- LangPathSizer->Add(btnBrwLang, 0, wxALIGN_RIGHT | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+ btnExtDel = XRCCTRL(*tabExternal, wxT("btnExtDel"), wxButton);
- lblSplash = new wxStaticText(tabPaths, ID_LBLSPLASH, _("Splash Screen Image"), wxDefaultPosition, wxDefaultSize, 0, _("lblSplash"));
- FilesBoxSizer->Add(lblSplash,0,wxALIGN_LEFT | wxLEFT | wxRIGHT | wxTOP,5);
+ tabAssocs = XRCCTRL(*PagesMain, wxT("tabAssocs"), wxPanel);
- SplashScreenSizer = new wxBoxSizer(wxHORIZONTAL);
- FilesBoxSizer->Add(SplashScreenSizer, 1, wxEXPAND | 0, 5);
+ lblAssocFileTypes = XRCCTRL(*tabAssocs, wxT("lblAssocFileTypes"), wxStaticText);
- edSplash = new wxTextCtrl(tabPaths, ID_EDSPLASH, _(""), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("edSplash"));
- SplashScreenSizer->Add(edSplash,1,wxALIGN_LEFT | wxLEFT | wxRIGHT | wxBOTTOM,5);
+ lstAssocFileTypes = XRCCTRL(*tabAssocs, wxT("lstAssocFileTypes"), wxCheckListBox);
- wxBitmap btnBrwSplash_BITMAP (TEnviroForm_btnBrwSplash_XPM);
- btnBrwSplash = new wxBitmapButton(tabPaths, ID_BTNBRWSPLASH, btnBrwSplash_BITMAP, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW, wxDefaultValidator, _("btnBrwSplash"));
- SplashScreenSizer->Add(btnBrwSplash, 0, wxALIGN_RIGHT | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+ lblAssocDesc = XRCCTRL(*tabAssocs, wxT("lblAssocDesc"), wxStaticText);
- tabExternal = new wxPanel(PagesMain, ID_TABEXTERNAL, wxDefaultPosition, wxDefaultSize);
- PagesMain->AddPage(tabExternal, _("External Programs"));
+ tabCVS = XRCCTRL(*PagesMain, wxT("tabCVS"), wxPanel);
- ExtProgSizer = new wxBoxSizer(wxVERTICAL);
- tabExternal->SetSizer(ExtProgSizer);
- tabExternal->SetAutoLayout(true);
+ lblCVSExec = XRCCTRL(*tabCVS, wxT("lblCVSExec"), wxStaticText);
- lblExternal = new wxStaticText(tabExternal, ID_LBLEXTERNAL, _("External Program Associations"), wxDefaultPosition, wxDefaultSize, 0, _("lblExternal"));
- ExtProgSizer->Add(lblExternal,0,wxALIGN_LEFT | wxALL,5);
+ edCVSExec = XRCCTRL(*tabCVS, wxT("edCVSExec"), wxTextCtrl);
- vleExternal = new wxListCtrl(tabExternal, ID_VLEEXTERNAL, wxDefaultPosition, wxDefaultSize, wxLC_REPORT, wxDefaultValidator, _("vleExternal"));
- vleExternal->InsertColumn(0,_("External Program"),wxLIST_FORMAT_LEFT,393 );
- vleExternal->InsertColumn(0,_("Extension"),wxLIST_FORMAT_LEFT,50 );
- ExtProgSizer->Add(vleExternal,1,wxEXPAND | wxALL,5);
+ WxBitmapButton1 = XRCCTRL(*tabCVS, wxT("WxBitmapButton1"), wxBitmapButton);
- ExtProgButtonSizer = new wxBoxSizer(wxHORIZONTAL);
- ExtProgSizer->Add(ExtProgButtonSizer, 0, wxALIGN_CENTER | wxALL, 5);
+ lblCVSCompression = XRCCTRL(*tabCVS, wxT("lblCVSCompression"), wxStaticText);
- btnExtAdd = new wxButton(tabExternal, ID_WXBUTTON1, _("Add"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("btnExtAdd"));
- ExtProgButtonSizer->Add(btnExtAdd,0,wxALIGN_CENTER | wxALL,5);
+ spnCVSCompression = XRCCTRL(*tabCVS, wxT("spnCVSCompression"), wxSpinCtrl);
- btnExtDel = new wxButton(tabExternal, ID_WXBUTTON2, _("Delete"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("btnExtDel"));
- ExtProgButtonSizer->Add(btnExtDel,0,wxALIGN_CENTER | wxALL,5);
+ chkCVSUseSSH = XRCCTRL(*tabCVS, wxT("chkCVSUseSSH"), wxCheckBox);
- tabAssocs = new wxPanel(PagesMain, ID_TABASSOCS, wxDefaultPosition, wxDefaultSize);
- PagesMain->AddPage(tabAssocs, _("File Associations"));
-
- FileAssocSizer = new wxBoxSizer(wxVERTICAL);
- tabAssocs->SetSizer(FileAssocSizer);
- tabAssocs->SetAutoLayout(true);
-
- lblAssocFileTypes = new wxStaticText(tabAssocs, ID_LBLASSOCFILETYPES, _("File Types:"), wxDefaultPosition, wxDefaultSize, 0, _("lblAssocFileTypes"));
- FileAssocSizer->Add(lblAssocFileTypes,0,wxALIGN_LEFT | wxALL,5);
-
- wxArrayString arrayStringFor_lstAssocFileTypes;
- lstAssocFileTypes = new wxCheckListBox(tabAssocs, ID_LSTASSOCFILETYPES, wxDefaultPosition, wxDefaultSize, arrayStringFor_lstAssocFileTypes, wxLB_SINGLE, wxDefaultValidator, _("lstAssocFileTypes"));
- FileAssocSizer->Add(lstAssocFileTypes,1,wxALIGN_CENTER | wxEXPAND | wxALL,5);
-
- lblAssocDesc = new wxStaticText(tabAssocs, ID_LBLASSOCDESC, _("Check the file types which you want wxDev-C++ to be registered as the \ndefault application to open them."), wxDefaultPosition, wxDefaultSize, 0, _("lblAssocDesc"));
- FileAssocSizer->Add(lblAssocDesc,0,wxALIGN_LEFT | wxALL,5);
-
- tabCVS = new wxPanel(PagesMain, ID_TABCVS, wxDefaultPosition, wxDefaultSize);
- PagesMain->AddPage(tabCVS, _("Source Control Support"));
-
- CVSSizer = new wxBoxSizer(wxVERTICAL);
- tabCVS->SetSizer(CVSSizer);
- tabCVS->SetAutoLayout(true);
-
- wxStaticBox* CVSStaticSizer_StaticBoxObj = new wxStaticBox(tabCVS, wxID_ANY, _("CVS"));
- CVSStaticSizer = new wxStaticBoxSizer(CVSStaticSizer_StaticBoxObj, wxVERTICAL);
- CVSSizer->Add(CVSStaticSizer, 1, wxALIGN_LEFT | wxEXPAND | wxALL, 5);
-
- lblCVSExec = new wxStaticText(tabCVS, ID_LBLCVSEXEC, _("CVS Program File"), wxDefaultPosition, wxDefaultSize, 0, _("lblCVSExec"));
- CVSStaticSizer->Add(lblCVSExec,0,wxALIGN_LEFT | wxALL,5);
-
- WxBoxSizer1 = new wxBoxSizer(wxHORIZONTAL);
- CVSStaticSizer->Add(WxBoxSizer1, 1, wxALIGN_CENTER | wxALL, 5);
-
- edCVSExec = new wxTextCtrl(tabCVS, ID_EDCVSEXEC, _(""), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("edCVSExec"));
- WxBoxSizer1->Add(edCVSExec,1,wxALIGN_CENTER | wxALL,5);
-
- wxBitmap WxBitmapButton1_BITMAP (TEnviroForm_WxBitmapButton1_XPM);
- WxBitmapButton1 = new wxBitmapButton(tabCVS, ID_WXBITMAPBUTTON1, WxBitmapButton1_BITMAP, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW, wxDefaultValidator, _("WxBitmapButton1"));
- WxBoxSizer1->Add(WxBitmapButton1, 0, wxALIGN_CENTER | wxALL, 5);
-
- lblCVSCompression = new wxStaticText(tabCVS, ID_LBLCVSCOMPRESSION, _("Compression Level"), wxDefaultPosition, wxDefaultSize, 0, _("lblCVSCompression"));
- CVSStaticSizer->Add(lblCVSCompression,0,wxALIGN_LEFT | wxALL,5);
-
- spnCVSCompression = new wxSpinCtrl(tabCVS, ID_SPNCVSCOMPRESSION, _("1"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 100, 1);
- CVSStaticSizer->Add(spnCVSCompression,0,wxALIGN_LEFT | wxALL,5);
-
- chkCVSUseSSH = new wxCheckBox(tabCVS, ID_CHKCVSUSESSH, _("Use SSH instead of RSH"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _("chkCVSUseSSH"));
- CVSStaticSizer->Add(chkCVSUseSSH,0,wxALIGN_LEFT | wxALL,5);
-
- wxStaticBox* SVNStaticSizer_StaticBoxObj = new wxStaticBox(tabCVS, wxID_ANY, _("SVN"));
- SVNStaticSizer = new wxStaticBoxSizer(SVNStaticSizer_StaticBoxObj, wxHORIZONTAL);
- CVSSizer->Add(SVNStaticSizer, 1, wxEXPAND | wxALL, 5);
-
- WxStdDialogButtonSizer1 = CreateButtonSizer(wxOK | wxCANCEL | wxHELP);
- EnvOptDlgSizer->Add(WxStdDialogButtonSizer1, 0, wxALIGN_RIGHT | wxALIGN_BOTTOM | wxALIGN_CENTER | wxALL, 5);
-
- SetTitle(_("Environment Options"));
+ SetTitle(wxT("Environment Options"));
SetIcon(wxNullIcon);
GetSizer()->Layout();
Modified: trunk/wxdevide/source/EnviroFrm.h
===================================================================
--- trunk/wxdevide/source/EnviroFrm.h 2008-10-23 16:46:26 UTC (rev 13)
+++ trunk/wxdevide/source/EnviroFrm.h 2009-09-16 20:17:38 UTC (rev 14)
@@ -25,6 +25,8 @@
//Header Include Start and Header Include End.
//wxDev-C++ designer will remove them. Add custom headers after the block.
////Header Include Start
+#include <wx/xrc/xmlres.h>
+#include <wx/xrc/xh_all.h>
#include <wx/checklst.h>
#include <wx/button.h>
#include <wx/listctrl.h>
@@ -60,62 +62,48 @@
//GUI Control Declaration Start and GUI Control Declaration End.
//wxDev-C++ will remove them. Add custom code after the block.
////GUI Control Declaration Start
- wxSizer *WxStdDialogButtonSizer1;
- wxStaticBoxSizer *SVNStaticSizer;
+ wxStdDialogButtonSizer *WxStdDialogButtonSizer1;
+ wxButton *btnOK;
+ wxButton *btnCANCEL;
+ wxButton *btnHELP;
wxCheckBox *chkCVSUseSSH;
wxSpinCtrl *spnCVSCompression;
wxStaticText *lblCVSCompression;
wxBitmapButton *WxBitmapButton1;
wxTextCtrl *edCVSExec;
- wxBoxSizer *WxBoxSizer1;
wxStaticText *lblCVSExec;
- wxStaticBoxSizer *CVSStaticSizer;
- wxBoxSizer *CVSSizer;
wxPanel *tabCVS;
wxStaticText *lblAssocDesc;
wxCheckListBox *lstAssocFileTypes;
wxStaticText *lblAssocFileTypes;
- wxBoxSizer *FileAssocSizer;
wxPanel *tabAssocs;
wxButton *btnExtDel;
wxButton *btnExtAdd;
- wxBoxSizer *ExtProgButtonSizer;
wxListCtrl *vleExternal;
wxStaticText *lblExternal;
- wxBoxSizer *ExtProgSizer;
wxPanel *tabExternal;
wxBitmapButton *btnBrwSplash;
wxTextCtrl *edSplash;
- wxBoxSizer *SplashScreenSizer;
wxStaticText *lblSplash;
wxBitmapButton *btnBrwLang;
wxTextCtrl *edLang;
- wxBoxSizer *LangPathSizer;
wxStaticText *lblLangPath;
wxBitmapButton *btnBrwIcon;
wxTextCtrl *edIcoLib;
- wxBoxSizer *IconLibPathSizer;
wxStaticText *lblIcoLib;
wxBitmapButton *btnOutputbrws;
wxTextCtrl *edTemplatesDir;
- wxBoxSizer *TempDirSizer;
wxStaticText *lblTemplatesDir;
wxBitmapButton *btnDefBrws;
wxTextCtrl *edUserDir;
- wxBoxSizer *UserDefSizer;
wxStaticText *lblUserDir;
wxBitmapButton *btnAltConfig;
wxTextCtrl *edAltConfig;
- wxBoxSizer *AltConfSizer;
wxCheckBox *chkAltConfig;
- wxStaticBoxSizer *WxStaticBoxSizer2;
- wxBoxSizer *FilesBoxSizer;
wxPanel *tabPaths;
wxCheckBox *cbAutoCloseProgress;
wxCheckBox *cbShowProgress;
- wxStaticBoxSizer *WxStaticBoxSizer1;
wxRadioBox *rgbOpenStyle;
- wxBoxSizer *RadioStaticBoxSizer2;
wxCheckBox *cbNativeDocks;
wxCheckBox *cbXPTheme;
wxCheckBox *cbNoSplashScreen;
@@ -127,21 +115,16 @@
wxStaticText *lblmsgTabs;
wxSpinCtrl *seMRUMax;
wxStaticText *lblMRU;
- wxFlexGridSizer *WxFlexGridSizer1;
- wxBoxSizer *InterfaceSizer;
wxPanel *tabInterface;
wxCheckBox *cbWatchError;
wxCheckBox *cbWatchHint;
- wxStaticBoxSizer *gbDebugger;
wxRadioBox *rgbAutoOpen;
- wxBoxSizer *RadioStaticSizer;
wxCheckBox *cbDblFiles;
wxCheckBox *cbShowMenu;
wxCheckBox *cbShowBars;
wxCheckBox *cbMinOnRun;
wxCheckBox *cbBackups;
wxCheckBox *cbSingleInstance;
- wxBoxSizer *GeneralBoxSizer;
wxPanel *tabGeneral;
wxNotebook *PagesMain;
wxBoxSizer *EnvOptDlgSizer;
@@ -155,67 +138,68 @@
enum
{
////GUI Enum Control ID Start
- ID_CHKCVSUSESSH = 1095,
- ID_SPNCVSCOMPRESSION = 1094,
- ID_LBLCVSCOMPRESSION = 1093,
- ID_WXBITMAPBUTTON1 = 1092,
- ID_EDCVSEXEC = 1091,
- ID_LBLCVSEXEC = 1089,
- ID_TABCVS = 1010,
- ID_LBLASSOCDESC = 1085,
- ID_LSTASSOCFILETYPES = 1084,
- ID_LBLASSOCFILETYPES = 1083,
- ID_TABASSOCS = 1009,
- ID_WXBUTTON2 = 1081,
- ID_WXBUTTON1 = 1080,
- ID_VLEEXTERNAL = 1078,
- ID_LBLEXTERNAL = 1077,
- ID_TABEXTERNAL = 1008,
- ID_BTNBRWSPLASH = 1072,
- ID_EDSPLASH = 1071,
- ID_LBLSPLASH = 1061,
- ID_BTNBRWLANG = 1070,
- ID_EDLANG = 1069,
- ID_LBLLANGPATH = 1059,
- ID_BTNBRWICON = 1068,
- ID_EDICOLIB = 1067,
- ID_LBLICOLIB = 1057,
- ID_BTNOUTPUTBRWS = 1066,
- ID_EDTEMPLATESDIR = 1065,
- ID_LBLTEMPLATESDIR = 1055,
- ID_BTNDEFBRWS = 1064,
- ID_EDUSERDIR = 1063,
- ID_LBLUSERDIR = 1053,
- ID_BTNALTCONFIG = 1052,
- ID_EDALTCONFIG = 1051,
- ID_CHKALTCONFIG = 1049,
- ID_TABPATHS = 1007,
- ID_CBAUTOCLOSEPROGRESS = 1042,
- ID_CBSHOWPROGRESS = 1041,
- ID_RGBOPENSTYLE = 1039,
- ID_CBNATIVEDOCKS = 1045,
- ID_CBXPTHEME = 1044,
- ID_CBNOSPLASHSCREEN = 1043,
- ID_CBOTHEME = 1032,
- ID_LBLTHEME = 1031,
- ID_CBOLANG = 1030,
- ID_LBLLANG = 1029,
- ID_CBOTABSTOP = 1028,
- ID_L...
[truncated message content] |
|
From: <ni...@us...> - 2010-09-05 18:22:44
|
Revision: 15
http://wxdevide.svn.sourceforge.net/wxdevide/?rev=15&view=rev
Author: ninjanl
Date: 2010-09-05 18:22:36 +0000 (Sun, 05 Sep 2010)
Log Message:
-----------
Small changes needed to build using wxWidgets SVN build. Don't forget to add WXW29 to the compiler defines to support the build.
Modified Paths:
--------------
trunk/wxdevide/source/Compiler.cpp
trunk/wxdevide/source/DevCfg.cpp
trunk/wxdevide/source/Editor.cpp
trunk/wxdevide/source/EnviroFrm.cpp
trunk/wxdevide/source/LangFrm.cpp
trunk/wxdevide/source/LangFrm.h
trunk/wxdevide/source/MainFrm.cpp
trunk/wxdevide/source/NewProjectFrm.cpp
trunk/wxdevide/source/SearchCenter.cpp
trunk/wxdevide/source/ToolEditForm.cpp
trunk/wxdevide/source/ToolEditFrm.cpp
trunk/wxdevide/source/Utils.cpp
trunk/wxdevide/source/devcppApp.cpp
trunk/wxdevide/source/devcppApp.h
trunk/wxdevide/source/oysUtils.cpp
Modified: trunk/wxdevide/source/Compiler.cpp
===================================================================
--- trunk/wxdevide/source/Compiler.cpp 2009-09-16 20:17:38 UTC (rev 14)
+++ trunk/wxdevide/source/Compiler.cpp 2010-09-05 18:22:36 UTC (rev 15)
@@ -108,6 +108,10 @@
Objects = wxT("");
+ //MN REMOVE ME
+ return RetVal; //here to get program to compile
+ //MN REMOVE ME
+
// create the object output directory if we have to
/*if( ( fProject.CurrentProfile.ObjectOutput != "" ) && ( !DirectoryExists( fProject.CurrentProfile.ObjectOutput ) ) )
ForceDirectories( GetRealPath( SubstituteMakeParams( fProject.CurrentProfile.ObjectOutput ) , fProject.Directory ) );
Modified: trunk/wxdevide/source/DevCfg.cpp
===================================================================
--- trunk/wxdevide/source/DevCfg.cpp 2009-09-16 20:17:38 UTC (rev 14)
+++ trunk/wxdevide/source/DevCfg.cpp 2010-09-05 18:22:36 UTC (rev 15)
@@ -162,7 +162,11 @@
BadDirs = BadDirs.AfterFirst(';');
wxSetWorkingDirectory(currdir);
+#ifndef WXW29
if(badDirs)
+#else
+ if(badDirs.IsEmpty())
+#endif
{
badDirs.Empty();
badDirs.Append(BadDirs);
@@ -174,7 +178,7 @@
void InitializeOptions()
{
DevDirs = TdevDirs::GetInstance();
-
+
DevCompilerSet = TdevCompilerSet::GetInstance();
DevCompiler = TdevCompiler::GetInstance();
@@ -245,7 +249,7 @@
DevDirs->SetCompilerType(1);
DevDirs->SetToDefaults();
//Guru: todo: Add More Compiler default sets here
-
+
//DevCompilerSet->LoadSet(DevCompiler->GetCompilerSet());
DevCompiler->AddDefaultOptions();
DevCompilerSet->AssignToCompiler();
@@ -284,7 +288,7 @@
wxLogError(wxT("Function FinalizeOptions - devcfg.cpp is a stub"));
#endif
//DevData->Free;
-
+
DevCompiler->SaveSettings();
//devCompiler.Free;
@@ -375,7 +379,7 @@
fDblFiles = LoadBoolSetting(wxT("DblFiles"), false); // double click opens files out of project manager
//bool fLangChange = LoadBoolSetting(wxT("MsgTabs"), true); // flag for language change
//bool fThemeChange = LoadBoolSetting(wxT("MsgTabs"), true); // did the theme changed
-
+
#ifdef DEBUG
wxLogError(wxT("Function LoadSettings - devcfg.cpp is incomplete"));
#endif
@@ -433,11 +437,11 @@
// Debug variable browser
fWatchHint = LoadBoolSetting(wxT("WatchHint"), true); // watch variable under mouse
fWatchError = LoadBoolSetting(wxT("WatchError"), true); // report watch errors
-
+
//Alt config file
fUseAltConfigFile = LoadBoolSetting(wxT("UseAltConfigFile"),false);
fAltConfigFile = LoadSetting(wxT("AltConfigFile"));
-
+
//'Position'
//LoadPerspective(fWinPlace);*/
}
@@ -630,7 +634,7 @@
// TCompilerOpts }
void TdevCompiler::AddDefaultOptions()
{
-
+
wxArrayString sl;
TProjTypeSet ProjTypeSet, NullProjSet;
// WARNING: do *not* re-arrange the options. Their values are written to the ini file
@@ -1283,7 +1287,7 @@
wxString _Setting,wxString _Section,TProjTypeSet ExcludeFromTypes, wxArrayString Choices)
{
struct TCompilerOption TempCompilerOption;
-
+
//Fill the structure with the options passed in
TempCompilerOption.optName = _Name;
TempCompilerOption.optIsGroup = _IsGroup;
@@ -1295,7 +1299,7 @@
TempCompilerOption.optSection = _Section;
TempCompilerOption.optExcludeFromTypes = ExcludeFromTypes;
TempCompilerOption.optChoices = Choices;
-
+
fOptions.Add(TempCompilerOption);
}
@@ -1355,7 +1359,7 @@
{
DevData->SetKey(wxT("Compiler"));
TCompilerOption opt;
-
+
wxString TempString;
fUseParams = DevData->LoadBoolSetting(wxT("UseParams"));
fRunParams = DevData->LoadSetting(wxT("RunParams"));
@@ -1393,7 +1397,7 @@
void TdevCompiler::SaveSettings()
{
wxString TempString;
-
+
DevData->SetKey(wxT("Compiler"));
DevData->SaveBoolSetting(wxT("UseParams"), fUseParams);
DevData->SaveSetting(wxT("RunParams"), fRunParams);
@@ -1414,9 +1418,9 @@
{
TempString += BoolVal10[fOptions[i].optValue];
DevData->SaveSetting(wxT("Options"), TempString);
- /* TODO (SofT#1#): Check with original .pas file and make sure the
+ /* TODO (SofT#1#): Check with original .pas file and make sure the
translation is understood */
-
+
}
DevData->SaveBoolSetting(wxT("Makefile"), wxT("FastDep"), fFastDep);
@@ -1433,11 +1437,11 @@
// Programs
fCompilerSet = Value;
if(DevDirs->GetOriginalPath().Cmp(wxT(""))==0) // first time only
- /* TODO (SofT#1#): Check that this is correct. Do we want to get the path
+ /* TODO (SofT#1#): Check that this is correct. Do we want to get the path
only or path and executable name */
DevDirs->SetOriginalPath(wxStandardPaths::Get().GetExecutablePath());
SetPath(DevDirs->GetBins());
-
+
DevCompilerSet->LoadSet(Value);
fgccName = DevCompilerSet->GetgccName();
fgppName = DevCompilerSet->GetgppName();
@@ -1483,7 +1487,7 @@
RetVal = 1;
else
RetVal = 0;
-
+
return RetVal;
}
@@ -1548,7 +1552,7 @@
fLibDir = ValidatePaths(LIB_DIR(fCompilerType), tempstr);
fRCDir = ValidatePaths(RC_INCLUDE_DIR(fCompilerType), tempstr);
fRCDir = wxT("");
-
+
fExec = wxFileName(wxStandardPaths::Get().GetExecutablePath()).GetPath() + wxString(PATH_SEP);
fConfig = fExec;
fHelp = fExec + HELP_DIR;
@@ -1562,7 +1566,7 @@
void TdevDirs::LoadSettings()
{
DevData->SetKey(wxT("Directories"));
-
+
//Load Settings
fCompilerType = DevData->LoadIntSetting(wxT("CompilerType"));
fBinDir = DevData->LoadSetting(wxT("Bins"));
@@ -1622,7 +1626,7 @@
//Perform the following check if running windows
//Linux, etc don't have the concept of drive letters
/* TODO (SofT#1#): Do we need to perform a similar check for Linux? */
-
+
#if defined (__WXMSW__)
// if we are called by double-clicking a .dev file in explorer,
// we must perform the next checks or else the dirs are
@@ -1677,14 +1681,14 @@
fCompression = (wxByte) DevData->LoadIntSetting(wxT("Compression"));
fExecutable = DevData->LoadSetting(wxT("Executable"));
/* TODO (SofT#1#): Do we want to save and load repositories? */
-
+
}
void TdevCVSHandler::SaveSettings()
{
//devData.SaveObject(Self);
DevData->SetKey(StrName);
-
+
DevData->SaveBoolSetting(wxT("UseSSH"), fUseSSH);
DevData->SaveIntSetting(wxT("Compression"), (int) fCompression);
DevData->SaveSetting(wxT("Executable"), fExecutable);
@@ -1826,35 +1830,60 @@
if(!tempStr.IsEmpty()) //Temp string does not equal ''
{
msg += wxT("Following Bin directories don't exist:\n");
+#ifndef WXW29
msg += tempStr.Replace(wxString(wxT(";")).c_str(),wxString(wxT("\r\n")).c_str());
+#else
+ tempStr.Replace( wxT(";"), wxT("\r\n"));
+ msg += tempStr;
+#endif
msg += wxT("\r\n\r\n");
}
goodCDir = ValidatePaths(fCDir, tempStr);
if(!tempStr.IsEmpty())
{
msg += wxT("Following C Include directories don't exist:\r\n");
+#ifndef WXW29
msg += tempStr.Replace(wxString(wxT(";")).c_str(),wxString(wxT("\r\n")).c_str());
+#else
+ tempStr.Replace( wxT(";"), wxT("\r\n"));
+ msg += tempStr;
+#endif
msg += wxT("\r\n\r\n");
}
goodCppDir = ValidatePaths(fCppDir, tempStr);
if(!tempStr.IsEmpty())
{
msg += wxT("Following C++ Include directories don''t exist:\r\n");
- msg += tempStr.Replace(wxString(wxT(";")).mb_str(),wxString(wxT("\r\n")).mb_str());
+#ifndef WXW29
+ msg += tempStr.Replace(wxString(wxT(";")).c_str(),wxString(wxT("\r\n")).c_str());
+#else
+ tempStr.Replace( wxT(";"), wxT("\r\n"));
+ msg += tempStr;
+#endif
msg += wxT("\r\n\r\n");
}
goodLibDir = ValidatePaths(fLibDir, tempStr);
if(!tempStr.IsEmpty())
{
msg += wxT("Following Libs directories don''t exist:\r\n");
+#ifndef WXW29
msg += tempStr.Replace(wxString(wxT(";")).c_str(),wxString(wxT("\r\n")).c_str());
+#else
+ tempStr.Replace( wxT(";"), wxT("\r\n"));
+ msg += tempStr;
+#endif
msg += wxT("\r\n\r\n");
}
goodRCDir = ValidatePaths(fRCDir, tempStr);
if(!tempStr.IsEmpty())
{
msg += wxT("Following resource compiler directories don''t exist:\r\n");
+#ifndef WXW29
msg += tempStr.Replace(wxString(wxT(";")).c_str(),wxString(wxT("\r\n")).c_str());
+#else
+ tempStr.Replace( wxT(";"), wxT("\r\n"));
+ msg += tempStr;
+#endif
msg += wxT("\r\n\r\n");
}
if(!msg.IsEmpty())
@@ -2353,7 +2382,7 @@
TempFont.SetFamily(wxFONTFAMILY_MODERN);
TempFont.SetPointSize(DevData->LoadIntSetting(wxT("Size")));
fFont.SetChosenFont(TempFont);
-
+
DevData->SetKey(wxT("Editor.GutterFont"));
TempColourString = DevData->LoadSetting(wxT("Color"));
if(TempColourString.find(wxT("cl")) != wxString::npos)
@@ -2370,12 +2399,12 @@
TempFont.SetFamily(wxFONTFAMILY_MODERN);
TempFont.SetPointSize(DevData->LoadIntSetting(wxT("Size")));
fGutterFont.SetChosenFont(TempFont);
-
+
//wxString fActiveSyn; // Active syntax highlighting set
-
+
//Load the syntax colourizing
DevData->SetKey(wxT("Editor.Syntax"));
-
+
fSyntax.Add(wxString(wxT("Assembler=")) + DevData->LoadSetting(wxT("Assembler")));
fSyntax.Add(wxString(wxT("Character=")) + DevData->LoadSetting(wxT("Character")));
fSyntax.Add(wxString(wxT("Comment=")) + DevData->LoadSetting(wxT("Comment")));
@@ -2408,7 +2437,7 @@
void TdevEditor::SetToDefaults()
{
- wxFont TempFont;
+ wxFont TempFont;
TempFont.SetFaceName(wxT("Courier New"));
TempFont.SetFamily(wxFONTFAMILY_MODERN);
TempFont.SetPointSize(10);
@@ -2474,7 +2503,7 @@
void TdevEditor::AssignEditor(wxStyledTextCtrl * Editor)
{
-
+
#ifdef DEBUG
wxLogError(wxT("Function AssignEditor - Devcfg.cpp is incomplete"));
#endif
@@ -2487,7 +2516,7 @@
Editor->SetUseTabs(fTabtoSpaces);
Editor->SetFont(fFont.GetChosenFont());
-
+
if(fShowGutter)
{
// do we need to show line numbers?
@@ -2501,9 +2530,9 @@
else
Editor->SetMarginWidth(0, 0);
}
-
+
// Margin for debugging symbols and such
-
+
Editor->SetMarginWidth(1, 16); //margin 1 16 px wide
Editor->SetMarginType(1, wxSTC_MARGIN_SYMBOL); //margin 1 for symbols,
Editor->SetMarginSensitive(2,true); //Make this margin sensitive to mouse clicks
@@ -2539,7 +2568,7 @@
}
else
- Editor->SetMarginWidth(2, 0);
+ Editor->SetMarginWidth(2, 0);
//Editor->SetMarginWidth(3, 0); //Not used yet
//Editor->SetMarginWidth(4, 0); //Not used yet
@@ -2802,12 +2831,12 @@
{
//Result := fPrograms.Values[fPrograms.Names[Index]];
return fPrograms[Index].AfterLast('=');
- /* TODO (SofT#1#): Need to check what a TStrings object does and if this
+ /* TODO (SofT#1#): Need to check what a TStrings object does and if this
is a correct interpretation */
//I think this finds the string held in program.name and then locates the
//the value held by this name. I think this interpretation is correct to check
//Second thoughts maybe wxHashMap is closer to this.
-
+
}
void TdevExternalPrograms::LoadSettings()
Modified: trunk/wxdevide/source/Editor.cpp
===================================================================
--- trunk/wxdevide/source/Editor.cpp 2009-09-16 20:17:38 UTC (rev 14)
+++ trunk/wxdevide/source/Editor.cpp 2010-09-05 18:22:36 UTC (rev 15)
@@ -657,6 +657,10 @@
}
else
fText.Invalidate;*/
+
+ //MN REMOVE ME
+ return false;
+ //MN REMOVE ME
}
int TEditor::HasBreakPoint(int line_number)
Modified: trunk/wxdevide/source/EnviroFrm.cpp
===================================================================
--- trunk/wxdevide/source/EnviroFrm.cpp 2009-09-16 20:17:38 UTC (rev 14)
+++ trunk/wxdevide/source/EnviroFrm.cpp 2010-09-05 18:22:36 UTC (rev 15)
@@ -26,7 +26,7 @@
BEGIN_EVENT_TABLE(TEnviroForm,wxDialog)
////Manual Code Start
////Manual Code End
-
+
EVT_CLOSE(TEnviroForm::OnClose)
END_EVENT_TABLE()
////Event Table End
@@ -39,7 +39,7 @@
TEnviroForm::~TEnviroForm()
{
-}
+}
void TEnviroForm::CreateGUIControls()
{
@@ -55,142 +55,142 @@
this->SetSizer(EnvOptDlgSizer);
this->SetAutoLayout(true);
- PagesMain = XRCCTRL(*this, wxT("PagesMain"), wxNotebook);
+ PagesMain = XRCCTRL(*this, "PagesMain", wxNotebook);
- tabGeneral = XRCCTRL(*PagesMain, wxT("tabGeneral"), wxPanel);
+ tabGeneral = XRCCTRL(*PagesMain, "tabGeneral", wxPanel);
- cbSingleInstance = XRCCTRL(*tabGeneral, wxT("cbSingleInstance"), wxCheckBox);
+ cbSingleInstance = XRCCTRL(*tabGeneral, "cbSingleInstance", wxCheckBox);
- cbBackups = XRCCTRL(*tabGeneral, wxT("cbBackups"), wxCheckBox);
+ cbBackups = XRCCTRL(*tabGeneral, "cbBackups", wxCheckBox);
- cbMinOnRun = XRCCTRL(*tabGeneral, wxT("cbMinOnRun"), wxCheckBox);
+ cbMinOnRun = XRCCTRL(*tabGeneral, "cbMinOnRun", wxCheckBox);
- cbShowBars = XRCCTRL(*tabGeneral, wxT("cbShowBars"), wxCheckBox);
+ cbShowBars = XRCCTRL(*tabGeneral, "cbShowBars", wxCheckBox);
- cbShowMenu = XRCCTRL(*tabGeneral, wxT("cbShowMenu"), wxCheckBox);
+ cbShowMenu = XRCCTRL(*tabGeneral, "cbShowMenu", wxCheckBox);
- cbDblFiles = XRCCTRL(*tabGeneral, wxT("cbDblFiles"), wxCheckBox);
+ cbDblFiles = XRCCTRL(*tabGeneral, "cbDblFiles", wxCheckBox);
- rgbAutoOpen = XRCCTRL(*tabGeneral, wxT("rgbAutoOpen"), wxRadioBox);
+ rgbAutoOpen = XRCCTRL(*tabGeneral, "rgbAutoOpen", wxRadioBox);
rgbAutoOpen->SetSelection(0);
- cbWatchHint = XRCCTRL(*tabGeneral, wxT("cbWatchHint"), wxCheckBox);
+ cbWatchHint = XRCCTRL(*tabGeneral, "cbWatchHint", wxCheckBox);
- cbWatchError = XRCCTRL(*tabGeneral, wxT("cbWatchError"), wxCheckBox);
+ cbWatchError = XRCCTRL(*tabGeneral, "cbWatchError", wxCheckBox);
- tabInterface = XRCCTRL(*PagesMain, wxT("tabInterface"), wxPanel);
+ tabInterface = XRCCTRL(*PagesMain, "tabInterface", wxPanel);
- lblMRU = XRCCTRL(*tabInterface, wxT("lblMRU"), wxStaticText);
+ lblMRU = XRCCTRL(*tabInterface, "lblMRU", wxStaticText);
- lblMRU = XRCCTRL(*tabInterface, wxT("lblMRU"), wxStaticText);
+ lblMRU = XRCCTRL(*tabInterface, "lblMRU", wxStaticText);
- seMRUMax = XRCCTRL(*tabInterface, wxT("seMRUMax"), wxSpinCtrl);
+ seMRUMax = XRCCTRL(*tabInterface, "seMRUMax", wxSpinCtrl);
- lblmsgTabs = XRCCTRL(*tabInterface, wxT("lblmsgTabs"), wxStaticText);
+ lblmsgTabs = XRCCTRL(*tabInterface, "lblmsgTabs", wxStaticText);
- cboTabsTop = XRCCTRL(*tabInterface, wxT("cboTabsTop"), wxComboBox);
+ cboTabsTop = XRCCTRL(*tabInterface, "cboTabsTop", wxComboBox);
- lblLang = XRCCTRL(*tabInterface, wxT("lblLang"), wxStaticText);
+ lblLang = XRCCTRL(*tabInterface, "lblLang", wxStaticText);
- cboLang = XRCCTRL(*tabInterface, wxT("cboLang"), wxComboBox);
+ cboLang = XRCCTRL(*tabInterface, "cboLang", wxComboBox);
- lblTheme = XRCCTRL(*tabInterface, wxT("lblTheme"), wxStaticText);
+ lblTheme = XRCCTRL(*tabInterface, "lblTheme", wxStaticText);
- cboTheme = XRCCTRL(*tabInterface, wxT("cboTheme"), wxComboBox);
+ cboTheme = XRCCTRL(*tabInterface, "cboTheme", wxComboBox);
- cbNoSplashScreen = XRCCTRL(*tabInterface, wxT("cbNoSplashScreen"), wxCheckBox);
+ cbNoSplashScreen = XRCCTRL(*tabInterface, "cbNoSplashScreen", wxCheckBox);
- cbXPTheme = XRCCTRL(*tabInterface, wxT("cbXPTheme"), wxCheckBox);
+ cbXPTheme = XRCCTRL(*tabInterface, "cbXPTheme", wxCheckBox);
- cbNativeDocks = XRCCTRL(*tabInterface, wxT("cbNativeDocks"), wxCheckBox);
+ cbNativeDocks = XRCCTRL(*tabInterface, "cbNativeDocks", wxCheckBox);
- rgbOpenStyle = XRCCTRL(*tabInterface, wxT("rgbOpenStyle"), wxRadioBox);
+ rgbOpenStyle = XRCCTRL(*tabInterface, "rgbOpenStyle", wxRadioBox);
rgbOpenStyle->SetSelection(0);
- cbShowProgress = XRCCTRL(*tabInterface, wxT("cbShowProgress"), wxCheckBox);
+ cbShowProgress = XRCCTRL(*tabInterface, "cbShowProgress", wxCheckBox);
- cbAutoCloseProgress = XRCCTRL(*tabInterface, wxT("cbAutoCloseProgress"), wxCheckBox);
+ cbAutoCloseProgress = XRCCTRL(*tabInterface, "cbAutoCloseProgress", wxCheckBox);
- tabPaths = XRCCTRL(*PagesMain, wxT("tabPaths"), wxPanel);
+ tabPaths = XRCCTRL(*PagesMain, "tabPaths", wxPanel);
- chkAltConfig = XRCCTRL(*tabPaths, wxT("chkAltConfig"), wxCheckBox);
+ chkAltConfig = XRCCTRL(*tabPaths, "chkAltConfig", wxCheckBox);
- edAltConfig = XRCCTRL(*tabPaths, wxT("edAltConfig"), wxTextCtrl);
+ edAltConfig = XRCCTRL(*tabPaths, "edAltConfig", wxTextCtrl);
- btnAltConfig = XRCCTRL(*tabPaths, wxT("btnAltConfig"), wxBitmapButton);
+ btnAltConfig = XRCCTRL(*tabPaths, "btnAltConfig", wxBitmapButton);
- lblUserDir = XRCCTRL(*tabPaths, wxT("lblUserDir"), wxStaticText);
+ lblUserDir = XRCCTRL(*tabPaths, "lblUserDir", wxStaticText);
- edUserDir = XRCCTRL(*tabPaths, wxT("edUserDir"), wxTextCtrl);
+ edUserDir = XRCCTRL(*tabPaths, "edUserDir", wxTextCtrl);
- btnDefBrws = XRCCTRL(*tabPaths, wxT("btnDefBrws"), wxBitmapButton);
+ btnDefBrws = XRCCTRL(*tabPaths, "btnDefBrws", wxBitmapButton);
- lblTemplatesDir = XRCCTRL(*tabPaths, wxT("lblTemplatesDir"), wxStaticText);
+ lblTemplatesDir = XRCCTRL(*tabPaths, "lblTemplatesDir", wxStaticText);
- edTemplatesDir = XRCCTRL(*tabPaths, wxT("edTemplatesDir"), wxTextCtrl);
+ edTemplatesDir = XRCCTRL(*tabPaths, "edTemplatesDir", wxTextCtrl);
- btnOutputbrws = XRCCTRL(*tabPaths, wxT("btnOutputbrws"), wxBitmapButton);
+ btnOutputbrws = XRCCTRL(*tabPaths, "btnOutputbrws", wxBitmapButton);
- lblIcoLib = XRCCTRL(*tabPaths, wxT("lblIcoLib"), wxStaticText);
+ lblIcoLib = XRCCTRL(*tabPaths, "lblIcoLib", wxStaticText);
- edIcoLib = XRCCTRL(*tabPaths, wxT("edIcoLib"), wxTextCtrl);
+ edIcoLib = XRCCTRL(*tabPaths, "edIcoLib", wxTextCtrl);
- btnBrwIcon = XRCCTRL(*tabPaths, wxT("btnBrwIcon"), wxBitmapButton);
+ btnBrwIcon = XRCCTRL(*tabPaths, "btnBrwIcon", wxBitmapButton);
- lblLangPath = XRCCTRL(*tabPaths, wxT("lblLangPath"), wxStaticText);
+ lblLangPath = XRCCTRL(*tabPaths, "lblLangPath", wxStaticText);
- edLang = XRCCTRL(*tabPaths, wxT("edLang"), wxTextCtrl);
+ edLang = XRCCTRL(*tabPaths, "edLang", wxTextCtrl);
- btnBrwLang = XRCCTRL(*tabPaths, wxT("btnBrwLang"), wxBitmapButton);
+ btnBrwLang = XRCCTRL(*tabPaths, "btnBrwLang", wxBitmapButton);
- lblSplash = XRCCTRL(*tabPaths, wxT("lblSplash"), wxStaticText);
+ lblSplash = XRCCTRL(*tabPaths, "lblSplash", wxStaticText);
- edSplash = XRCCTRL(*tabPaths, wxT("edSplash"), wxTextCtrl);
+ edSplash = XRCCTRL(*tabPaths, "edSplash", wxTextCtrl);
- btnBrwSplash = XRCCTRL(*tabPaths, wxT("btnBrwSplash"), wxBitmapButton);
+ btnBrwSplash = XRCCTRL(*tabPaths, "btnBrwSplash", wxBitmapButton);
- tabExternal = XRCCTRL(*PagesMain, wxT("tabExternal"), wxPanel);
+ tabExternal = XRCCTRL(*PagesMain, "tabExternal", wxPanel);
- lblExternal = XRCCTRL(*tabExternal, wxT("lblExternal"), wxStaticText);
+ lblExternal = XRCCTRL(*tabExternal, "lblExternal", wxStaticText);
- vleExternal = XRCCTRL(*tabExternal, wxT("vleExternal"), wxListCtrl);
- vleExternal->InsertColumn(0,wxT("External Program"),wxLIST_FORMAT_LEFT,393 );
- vleExternal->InsertColumn(0,wxT("Extension"),wxLIST_FORMAT_LEFT,50 );
+ vleExternal = XRCCTRL(*tabExternal, "vleExternal", wxListCtrl);
+ vleExternal->InsertColumn(0,"External Program",wxLIST_FORMAT_LEFT,393 );
+ vleExternal->InsertColumn(0,"Extension",wxLIST_FORMAT_LEFT,50 );
- btnExtAdd = XRCCTRL(*tabExternal, wxT("btnExtAdd"), wxButton);
+ btnExtAdd = XRCCTRL(*tabExternal, "btnExtAdd", wxButton);
- btnExtDel = XRCCTRL(*tabExternal, wxT("btnExtDel"), wxButton);
+ btnExtDel = XRCCTRL(*tabExternal, "btnExtDel", wxButton);
- tabAssocs = XRCCTRL(*PagesMain, wxT("tabAssocs"), wxPanel);
+ tabAssocs = XRCCTRL(*PagesMain, "tabAssocs", wxPanel);
- lblAssocFileTypes = XRCCTRL(*tabAssocs, wxT("lblAssocFileTypes"), wxStaticText);
+ lblAssocFileTypes = XRCCTRL(*tabAssocs, "lblAssocFileTypes", wxStaticText);
- lstAssocFileTypes = XRCCTRL(*tabAssocs, wxT("lstAssocFileTypes"), wxCheckListBox);
+ lstAssocFileTypes = XRCCTRL(*tabAssocs, "lstAssocFileTypes", wxCheckListBox);
- lblAssocDesc = XRCCTRL(*tabAssocs, wxT("lblAssocDesc"), wxStaticText);
+ lblAssocDesc = XRCCTRL(*tabAssocs, "lblAssocDesc", wxStaticText);
- tabCVS = XRCCTRL(*PagesMain, wxT("tabCVS"), wxPanel);
+ tabCVS = XRCCTRL(*PagesMain, "tabCVS", wxPanel);
- lblCVSExec = XRCCTRL(*tabCVS, wxT("lblCVSExec"), wxStaticText);
+ lblCVSExec = XRCCTRL(*tabCVS, "lblCVSExec", wxStaticText);
- edCVSExec = XRCCTRL(*tabCVS, wxT("edCVSExec"), wxTextCtrl);
+ edCVSExec = XRCCTRL(*tabCVS, "edCVSExec", wxTextCtrl);
- WxBitmapButton1 = XRCCTRL(*tabCVS, wxT("WxBitmapButton1"), wxBitmapButton);
+ WxBitmapButton1 = XRCCTRL(*tabCVS, "WxBitmapButton1", wxBitmapButton);
- lblCVSCompression = XRCCTRL(*tabCVS, wxT("lblCVSCompression"), wxStaticText);
+ lblCVSCompression = XRCCTRL(*tabCVS, "lblCVSCompression", wxStaticText);
- spnCVSCompression = XRCCTRL(*tabCVS, wxT("spnCVSCompression"), wxSpinCtrl);
+ spnCVSCompression = XRCCTRL(*tabCVS, "spnCVSCompression", wxSpinCtrl);
- chkCVSUseSSH = XRCCTRL(*tabCVS, wxT("chkCVSUseSSH"), wxCheckBox);
+ chkCVSUseSSH = XRCCTRL(*tabCVS, "chkCVSUseSSH", wxCheckBox);
- SetTitle(wxT("Environment Options"));
+ SetTitle("Environment Options");
SetIcon(wxNullIcon);
-
+
GetSizer()->Layout();
GetSizer()->Fit(this);
GetSizer()->SetSizeHints(this);
Center();
-
+
////GUI Items Creation End
// lblAssocDesc->Wrap(GetSizer()->GetSize().GetWidth());
}
@@ -215,7 +215,7 @@
{
extern TdevData * DevData;
extern TdevDirs * DevDirs;
-
+
//General Info First
cbSingleInstance->SetValue(DevData->GetSingleInstance());
cbBackups->SetValue(DevData->GetBackUps());
@@ -226,7 +226,7 @@
rgbAutoOpen->SetSelection(DevData->GetAutoOpen());
cbWatchHint->SetValue(DevData->GetWatchHint());
cbWatchError->SetValue(DevData->GetWatchError());
-
+
//Interface Window Next
seMRUMax->SetValue(DevData->GetMRUMax());
// cboTabsTop->SetValue(DevData->GetMsgTabs());
@@ -234,14 +234,14 @@
// Fill the Language combo with the language list here
// Fill the Theme Combobox here
cboTheme->Clear();
-
+
cbNoSplashScreen->SetValue(DevData->GetNoSplashScreen());
cbXPTheme->SetValue(DevData->GetXPTheme());
cbNativeDocks->SetValue(DevData->GetNativeDocks());
rgbOpenStyle->SetSelection(DevData->GetOpenStyle());
cbShowProgress->SetValue(DevData->GetShowProgress());
cbAutoCloseProgress->SetValue(DevData->GetAutoCloseProgress());
-
+
//Files and Directories
chkAltConfig->SetValue(DevData->GetUseAltConfigFile());
edAltConfig->SetValue(DevData->GetAltConfigFile());
@@ -250,17 +250,17 @@
edIcoLib->SetValue(DevDirs->GetIcons());
edLang->SetValue(DevDirs->GetLang());
edSplash->SetValue(DevData->GetSplash());
-
+
//External programs
//fill the view with our data
//vleExternal->
-
+
//File Associations
//lstAssocFileTypes->
-
+
//Source Code Control
//edCVSExec->
-
+
return true;
}
/*!
@@ -270,7 +270,7 @@
{
extern TdevData * DevData;
extern TdevDirs * DevDirs;
-
+
//General Info First
DevData->SetSingleInstance(cbSingleInstance->GetValue());
DevData->SetBackUps(cbBackups->GetValue());
@@ -281,7 +281,7 @@
DevData->SetAutoOpen(rgbAutoOpen->GetSelection());
DevData->SetWatchHint(cbWatchHint->GetValue());
DevData->SetWatchError(cbWatchError->GetValue());
-
+
//Interface Window Next
seMRUMax->SetValue(DevData->GetMRUMax());
// cboTabsTop->SetValue(DevData->GetMsgTabs());
@@ -316,6 +316,6 @@
//Source Code Control
//edCVSExec->
-
+
return true;
}
Modified: trunk/wxdevide/source/LangFrm.cpp
===================================================================
--- trunk/wxdevide/source/LangFrm.cpp 2009-09-16 20:17:38 UTC (rev 14)
+++ trunk/wxdevide/source/LangFrm.cpp 2010-09-05 18:22:36 UTC (rev 15)
@@ -13,6 +13,8 @@
#include "Utils.h"
#include "devcfg.h" //To access singleton data objects
#include "DevTheme.h" //To access DevTheme
+#include <wx/tokenzr.h> //Used in StrToList
+
//Do not add custom headers
//wxDev-C++ designer will remove them
////Header Include Start
@@ -34,7 +36,7 @@
BEGIN_EVENT_TABLE(LangFrm,wxDialog)
////Manual Code Start
////Manual Code End
-
+
EVT_CLOSE(LangFrm::OnClose)
EVT_BUTTON(ID_OKBTN,LangFrm::OkBtnClick)
EVT_CHECKBOX(ID_XPCHECKBOX,LangFrm::XPCheckBoxClick)
@@ -52,7 +54,7 @@
LangFrm::~LangFrm()
{
-}
+}
void LangFrm::CreateGUIControls()
{
@@ -187,12 +189,12 @@
SetTitle(_("wxDev-C++ First-Run Configuration"));
SetIcon(wxNullIcon);
-
+
GetSizer()->Layout();
GetSizer()->Fit(this);
GetSizer()->SetSizeHints(this);
Center();
-
+
////GUI Items Creation End
OkBtnTag = 0;
FormActivate();
@@ -331,13 +333,13 @@
//MainForm.ClassBrowser1.SetUpdateOff;
if( ( DirCheckBox->IsChecked() ) )
- StrToList( DirEdit->GetValue() , s );
+ ;//mn StrToList( DirEdit->GetValue() , s );
else
{
//we add the wx's MSW dir because lot of wx classes get screwed up
//by the forward declaration. Stupid C++ Forward declarations!
- StrToList( DevDirs->GetCpp() + wxT(";"), s );
+ ;//mn StrToList( (DevDirs->GetCpp() + wxT(";")), s );
}
for( i = 0 ; i < s.Count() ; ++i )
@@ -348,7 +350,7 @@
GetParent()->SetCursor(*wxHOURGLASS_CURSOR);
wxSafeYield(GetParent());
for( j = 0 ; j < f.Count() ; ++j )
- {
+ {
//MainForm.CppParser1.AddFileToScan( f[ j ] );
}
}
@@ -371,7 +373,7 @@
//s.Free;
//f.Free;
}
- else
+ else
{
DevClassBrowsing->SetEnabled(true);
DevClassBrowsing->SetParseLocalHeaders(true);
@@ -410,7 +412,7 @@
}
void LangFrm::FormActivate()
-{
+{
wxString s;
wxArrayString sl;
@@ -422,7 +424,7 @@
Image2->SetBitmap(_wxGetBitmapFromMemory(themeblue_bmp,sizeof(themenewlook_bmp)));
s = wxGetUserName();
#ifdef BETAVERSION
- wxMessageBox(wxString(wxT("This is a beta version of wxDev-C++.\n))
+ wxMessageBox(wxString(wxT("This is a beta version of wxDev-C++.\n"))
+wxT("Please report bugs to https://sourceforge.net/tracker/?group_id=95606&atid=611982.\n")
+wxT("Your configuration files will be stored in ") + ExtractFileDir( devData.INIFile ) + wxT(".\n")
+wxT("You can change the directory in Tools > Environment Options > Files & Directories or \n")
Modified: trunk/wxdevide/source/LangFrm.h
===================================================================
--- trunk/wxdevide/source/LangFrm.h 2009-09-16 20:17:38 UTC (rev 14)
+++ trunk/wxdevide/source/LangFrm.h 2010-09-05 18:22:36 UTC (rev 15)
@@ -21,7 +21,7 @@
#include <wx/wxprec.h>
#endif
-//Do not add custom headers between
+//Do not add custom headers between
//Header Include Start and Header Include End.
//wxDev-C++ designer will remove them. Add custom headers after the block.
////Header Include Start
@@ -39,6 +39,8 @@
#include <wx/statbmp.h>
#include <wx/panel.h>
#include <wx/sizer.h>
+#include <wx/tokenzr.h> //Used in StrToList
+
////Header Include End
#include "oysUtils.h" //To access ToysStringList
////Dialog Style Start
@@ -50,7 +52,7 @@
{
private:
DECLARE_EVENT_TABLE();
-
+
public:
LangFrm(wxWindow *parent, wxWindowID id = 1, const wxString &title = wxT("wxDev-C++ First-Run Configuration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = LangFrm_STYLE);
virtual ~LangFrm();
@@ -59,9 +61,9 @@
void ThemeBoxSelected(wxCommandEvent& event );
void XPCheckBoxClick(wxCommandEvent& event);
void OkBtnClick(wxCommandEvent& event);
-
+
private:
- //Do not add custom control declarations between
+ //Do not add custom control declarations between
//GUI Control Declaration Start and GUI Control Declaration End.
//wxDev-C++ will remove them. Add custom code after the block.
////GUI Control Declaration Start
@@ -104,7 +106,7 @@
////GUI Control Declaration End
int OkBtnTag;
bool HasProgressStarted;
-
+
private:
//Note: if you receive any error with these enum IDs, then you need to
//change your old form code that are based on the #define control IDs.
@@ -150,7 +152,7 @@
////GUI Enum Control ID End
ID_DUMMY_VALUE_ //don't remove this value unless you have other enum values
};
-
+
private:
void OnClose(wxCl...
[truncated message content] |
|
From: <tb...@us...> - 2011-12-04 03:10:48
|
Revision: 16
http://wxdevide.svn.sourceforge.net/wxdevide/?rev=16&view=rev
Author: tbreina
Date: 2011-12-04 03:10:39 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Updated source code for wxDev-C++ 7.4. Project should open correctly and build with wxWidgets 2.8.12 monolithic unicode. Needs unicode build of stc library. Program is still just a skeleton pre-alpha of original Delphi source code for Dev-C++.
Modified Paths:
--------------
trunk/wxdevide/source/AddToDoFrm.cpp
trunk/wxdevide/source/AddToDoFrm.h
trunk/wxdevide/source/AddToDoFrm.wxform
trunk/wxdevide/source/ColorEditDlg.cpp
trunk/wxdevide/source/ColorEditDlg.wxform
trunk/wxdevide/source/CompileProgressForm.cpp
trunk/wxdevide/source/CompileProgressForm.h
trunk/wxdevide/source/CompileProgressForm.wxform
trunk/wxdevide/source/Compiler.cpp
trunk/wxdevide/source/Compiler.h
trunk/wxdevide/source/DevCfg.cpp
trunk/wxdevide/source/DevCpp.dev
trunk/wxdevide/source/DevCpp.layout
trunk/wxdevide/source/DevTheme.cpp
trunk/wxdevide/source/Editor.cpp
trunk/wxdevide/source/EditorOptfrm.cpp
trunk/wxdevide/source/EditorOptfrm.wxform
trunk/wxdevide/source/EnviroFrm.cpp
trunk/wxdevide/source/EnviroFrm.h
trunk/wxdevide/source/EnviroFrm.wxform
trunk/wxdevide/source/FilePropertiesfrm.cpp
trunk/wxdevide/source/FilePropertiesfrm.wxform
trunk/wxdevide/source/GotoLineFrm.cpp
trunk/wxdevide/source/GotoLineFrm.wxform
trunk/wxdevide/source/Images/LangFrm_LoadBtn_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnAbout_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnAddToProject_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnClose_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnCompileAndRun_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnCompile_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnDebugPause_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnDebugRestart_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnDebugStepInto_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnDebugStepOver_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnDebugStop_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnDebug_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnFindNext_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnFind_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnGotoLine_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnGoto_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnHelp_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnInsert_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnNewAll_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnNewFile_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnNewProject_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnOpen_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnPrint_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnProgramReset_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnProjectOptions_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnRebuildAll_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnRedo_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnRemoveFromProject_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnReplace_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnRun_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnSaveAll_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnSaveUnit_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnToggle_XPM.xpm
trunk/wxdevide/source/Images/MainFrm_BtnUndo_XPM.xpm
trunk/wxdevide/source/Images/Self_MainFrm_XPM.xpm
trunk/wxdevide/source/Images/TEditorOptForm_btnSaveSyntax_XPM.xpm
trunk/wxdevide/source/Images/ToolFrm_btnAdd_XPM.xpm
trunk/wxdevide/source/Images/ToolFrm_btnClose_XPM.xpm
trunk/wxdevide/source/Images/ToolFrm_btnDelete_XPM.xpm
trunk/wxdevide/source/Images/ToolFrm_btnDown_XPM.xpm
trunk/wxdevide/source/Images/ToolFrm_btnEdit_XPM.xpm
trunk/wxdevide/source/Images/ToolFrm_btnUp_XPM.xpm
trunk/wxdevide/source/LangFrm.cpp
trunk/wxdevide/source/LangFrm.h
trunk/wxdevide/source/LangFrm.wxform
trunk/wxdevide/source/MainFrm.cpp
trunk/wxdevide/source/MainFrm.h
trunk/wxdevide/source/MainFrm.wxform
trunk/wxdevide/source/Makefile.win
trunk/wxdevide/source/NewProjectFrm.cpp
trunk/wxdevide/source/NewProjectFrm.wxform
trunk/wxdevide/source/Project.cpp
trunk/wxdevide/source/SearchCenter.h
trunk/wxdevide/source/SplashFrm.cpp
trunk/wxdevide/source/SplashFrm.wxform
trunk/wxdevide/source/ToolEditForm.cpp
trunk/wxdevide/source/ToolEditForm.wxform
trunk/wxdevide/source/ToolFrm.cpp
trunk/wxdevide/source/ToolFrm.wxform
trunk/wxdevide/source/Utils.cpp
trunk/wxdevide/source/Version.h
trunk/wxdevide/source/devcppApp.cpp
trunk/wxdevide/source/oysUtils.cpp
Modified: trunk/wxdevide/source/AddToDoFrm.cpp
===================================================================
--- trunk/wxdevide/source/AddToDoFrm.cpp 2010-09-05 18:22:36 UTC (rev 15)
+++ trunk/wxdevide/source/AddToDoFrm.cpp 2011-12-04 03:10:39 UTC (rev 16)
@@ -29,8 +29,8 @@
////Manual Code End
EVT_CLOSE(AddToDoFrm::OnClose)
- EVT_BUTTON(wxID_CANCEL,AddToDoFrm::BtnCancelClick)
- EVT_BUTTON(wxID_OK,AddToDoFrm::BtnOKClick)
+ EVT_BUTTON(wxID_OK, AddToDoFrm::BtnOKClick)
+ EVT_BUTTON(wxID_CANCEL, AddToDoFrm::BtnCancelClick)
END_EVENT_TABLE()
////Event Table End
@@ -56,51 +56,56 @@
this->SetSizer(DialogSizer);
this->SetAutoLayout(true);
- WxPanel1 = new wxPanel(this, ID_WXPANEL1, wxDefaultPosition, wxDefaultSize);
- WxPanel1->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
- DialogSizer->Add(WxPanel1,0,wxALIGN_CENTER | wxALL,5);
+ WxPanel1 = new wxPanel(this, ID_WXPANEL1, wxPoint(1, 1), wxSize(301, 285));
+ WxPanel1->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
+ DialogSizer->Add(WxPanel1, 0, wxALIGN_CENTER | wxALL, 5);
PanelSizer = new wxBoxSizer(wxVERTICAL);
WxPanel1->SetSizer(PanelSizer);
WxPanel1->SetAutoLayout(true);
- LblDescription = new wxStaticText(WxPanel1, ID_LBLDESCRIPTION, _("Description:"), wxDefaultPosition, wxDefaultSize, 0, _("LblDescription"));
- LblDescription->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
- PanelSizer->Add(LblDescription,0,wxALIGN_LEFT | wxALL,5);
+ LblDescription = new wxStaticText(WxPanel1, ID_LBLDESCRIPTION, wxT("Description:"), wxPoint(118, 5), wxDefaultSize, 0, wxT("LblDescription"));
+ LblDescription->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
+ PanelSizer->Add(LblDescription, 0, wxALIGN_LEFT | wxALL, 5);
- MemDescription = new wxTextCtrl(WxPanel1, ID_MEMDESCRIPTION, _(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE, wxDefaultValidator, _("MemDescription"));
+ MemDescription = new wxTextCtrl(WxPanel1, ID_MEMDESCRIPTION, wxEmptyString, wxPoint(9, 32), wxSize(277, 95), wxTE_MULTILINE, wxDefaultValidator, wxT("MemDescription"));
MemDescription->SetMaxLength(0);
MemDescription->SetFocus();
MemDescription->SetInsertionPointEnd();
- MemDescription->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
- PanelSizer->Add(MemDescription,1,wxEXPAND | wxALL,5);
+ MemDescription->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
+ PanelSizer->Add(MemDescription, 1, wxEXPAND | wxALL, 5);
WxFlexGridSizer1 = new wxFlexGridSizer(0, 2, 0, 0);
PanelSizer->Add(WxFlexGridSizer1, 0, wxALIGN_CENTER | wxALL, 5);
- LblPriority = new wxStaticText(WxPanel1, ID_LBLPRIORITY, _("Priority:"), wxDefaultPosition, wxDefaultSize, 0, _("LblPriority"));
- LblPriority->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
- WxFlexGridSizer1->Add(LblPriority,0,wxALIGN_LEFT | wxALL,5);
+ LblPriority = new wxStaticText(WxPanel1, ID_LBLPRIORITY, wxT("Priority:"), wxPoint(42, 5), wxDefaultSize, 0, wxT("LblPriority"));
+ LblPriority->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
+ WxFlexGridSizer1->Add(LblPriority, 0, wxALIGN_LEFT | wxALL, 5);
- LblUser = new wxStaticText(WxPanel1, ID_LBLUSER, _("User:"), wxDefaultPosition, wxDefaultSize, 0, _("LblUser"));
- LblUser->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
- WxFlexGridSizer1->Add(LblUser,1,wxALIGN_LEFT | wxALL,5);
+ LblUser = new wxStaticText(WxPanel1, ID_LBLUSER, wxT("User:"), wxPoint(190, 5), wxDefaultSize, 0, wxT("LblUser"));
+ LblUser->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
+ WxFlexGridSizer1->Add(LblUser, 1, wxALIGN_LEFT | wxALL, 5);
- SpnPriority = new wxSpinCtrl(WxPanel1, ID_SPNPRIORITY, _("1"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 9, 1);
- SpnPriority->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
- WxFlexGridSizer1->Add(SpnPriority,0,wxALIGN_LEFT | wxALL,5);
+ SpnPriority = new wxSpinCtrl(WxPanel1, ID_SPNPRIORITY, wxT("1"), wxPoint(5, 32), wxSize(113, 22), wxSP_ARROW_KEYS, 1, 9, 1);
+ SpnPriority->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
+ WxFlexGridSizer1->Add(SpnPriority, 0, wxALIGN_LEFT | wxALL, 5);
- EdtUser = new wxTextCtrl(WxPanel1, ID_EDTUSER, _(""), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator(wxFILTER_ALPHANUMERIC, NULL), _("EdtUser"));
- EdtUser->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
- WxFlexGridSizer1->Add(EdtUser,1,0 | wxALL,5);
+ EdtUser = new wxTextCtrl(WxPanel1, ID_EDTUSER, wxT(""), wxPoint(128, 32), wxSize(153, 22), 0, wxTextValidator(wxFILTER_ALPHANUMERIC, NULL), wxT("EdtUser"));
+ EdtUser->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
+ WxFlexGridSizer1->Add(EdtUser, 1, 0 | wxALL, 5);
- WxStdDialogButtonSizer1 = CreateButtonSizer(wxOK | wxCANCEL);
+ WxStdDialogButtonSizer1 = new wxStdDialogButtonSizer;
+ btnOK = new wxButton( this, wxID_OK );
+ WxStdDialogButtonSizer1->AddButton( btnOK );
+ btnCANCEL = new wxButton( this, wxID_CANCEL );
+ WxStdDialogButtonSizer1->AddButton( btnCANCEL );
+ WxStdDialogButtonSizer1->Realize();
DialogSizer->Add(WxStdDialogButtonSizer1, 0, wxALIGN_CENTER | wxALL, 5);
- SetTitle(_("Add To-Do Item"));
+ SetTitle(wxT("Add To-Do Item"));
SetIcon(wxNullIcon);
- GetSizer()->Layout();
+ Layout();
GetSizer()->Fit(this);
GetSizer()->SetSizeHints(this);
Center();
Modified: trunk/wxdevide/source/AddToDoFrm.h
===================================================================
--- trunk/wxdevide/source/AddToDoFrm.h 2010-09-05 18:22:36 UTC (rev 15)
+++ trunk/wxdevide/source/AddToDoFrm.h 2011-12-04 03:10:39 UTC (rev 16)
@@ -53,7 +53,9 @@
//GUI Control Declaration Start and GUI Control Declaration End.
//wxDev-C++ will remove them. Add custom code after the block.
////GUI Control Declaration Start
- wxSizer *WxStdDialogButtonSizer1;
+ wxStdDialogButtonSizer *WxStdDialogButtonSizer1;
+ wxButton *btnOK;
+ wxButton *btnCANCEL;
wxTextCtrl *EdtUser;
wxSpinCtrl *SpnPriority;
wxStaticText *LblUser;
Modified: trunk/wxdevide/source/AddToDoFrm.wxform
===================================================================
--- trunk/wxdevide/source/AddToDoFrm.wxform 2010-09-05 18:22:36 UTC (rev 15)
+++ trunk/wxdevide/source/AddToDoFrm.wxform 2011-12-04 03:10:39 UTC (rev 16)
@@ -15,6 +15,7 @@
OldCreateOrder = True
PopupMenu = DesignerPopup.Owner
Visible = True
+ OnClick = FormClick
OnCreate = FormCreate
OnDestroy = FormDestroy
OnResize = FormResize
@@ -31,6 +32,7 @@
Wx_DialogStyle = [wxCAPTION, wxSYSTEM_MENU, wxDIALOG_NO_PARENT, wxMINIMIZE_BOX, wxCLOSE_BOX, wxFRAME_TOOL_WINDOW]
Wx_Border = 0
Wx_BorderAlignment = []
+ isAuimanagerAvailable = False
PixelsPerInch = 96
TextHeight = 13
object DialogSizer: TWxBoxSizer
@@ -51,19 +53,35 @@
Top = 1
Width = 301
Height = 285
- Align = alClient
- TabOrder = 0
- Wx_BKColor = clBlack
- Wx_Class = 'wxPanel'
+ Align = alClient
+ TabOrder = 0
+ Wx_BKColor = clBlack
+ Wx_Class = 'wxPanel'
Wx_ControlOrientation = wxControlVertical
- Wx_Default = False
- Wx_EventList.Strings = (
- 'EVT_UPDATE_UI:OnUpdateUI')
- Wx_FGColor = clBlack
- Wx_GeneralStyle = []
- Wx_Hidden = False
- Wx_IDName = 'ID_WXPANEL1'
- Wx_IDValue = 1002
+ Wx_Default = False
+ Wx_EventList.Strings = (
+ 'EVT_UPDATE_UI:OnUpdateUI')
+ Wx_FGColor = clBlack
+ Wx_GeneralStyle = []
+ Wx_Hidden = False
+ Wx_IDName = 'ID_WXPANEL1'
+ Wx_IDValue = 1002
+ Wx_PaneCaption = 'WxPanel1'
+ Wx_PaneName = 'WxPanel1_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
object PanelSizer: TWxBoxSizer
Left = 1
Top = 1
@@ -78,44 +96,76 @@
Wx_IDValue = 1006
Wx_Alignment = [wxEXPAND]
Wx_StretchFactor = 1
- object LblDescription: TWxStaticText
+ object LblDescription: TWxStaticText
Left = 118
Top = 5
- Width = 60
- Height = 17
- Caption = 'Description:'
- TabOrder = 0
- Wx_BGColor = clBlack
- Wx_Class = 'wxStaticText'
+ Width = 60
+ Height = 17
+ Caption = 'Description:'
+ TabOrder = 0
+ Wx_BGColor = clBlack
+ Wx_Class = 'wxStaticText'
Wx_ControlOrientation = wxControlVertical
- Wx_FGColor = clBlack
- Wx_GeneralStyle = []
- Wx_Hidden = False
- Wx_IDName = 'ID_LBLDESCRIPTION'
- Wx_IDValue = 1003
- Wx_LabelStyle = []
+ Wx_FGColor = clBlack
+ Wx_GeneralStyle = []
+ Wx_Hidden = False
+ Wx_IDName = 'ID_LBLDESCRIPTION'
+ Wx_IDValue = 1003
+ Wx_LabelStyle = []
Wx_Alignment = [wxALIGN_LEFT]
- end
- object MemDescription: TWxMemo
+ Wx_PaneCaption = 'LblDescription'
+ Wx_PaneName = 'LblDescription_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
+ end
+ object MemDescription: TWxMemo
Left = 9
Top = 32
- Width = 277
- Height = 95
- BevelInner = bvNone
- BevelOuter = bvNone
- TabOrder = 1
- Wx_BGColor = clBlack
- Wx_Class = 'wxTextCtrl'
+ Width = 277
+ Height = 95
+ BevelInner = bvNone
+ BevelOuter = bvNone
+ TabOrder = 1
+ Wx_BGColor = clBlack
+ Wx_Class = 'wxTextCtrl'
Wx_ControlOrientation = wxControlVertical
- Wx_EditStyle = [wxTE_MULTILINE]
- Wx_FGColor = clBlack
- Wx_GeneralStyle = []
- Wx_IDName = 'ID_MEMDESCRIPTION'
- Wx_IDValue = 1004
- Wx_MaxLength = 0
+ Wx_EditStyle = [wxTE_MULTILINE]
+ Wx_FGColor = clBlack
+ Wx_GeneralStyle = []
+ Wx_IDName = 'ID_MEMDESCRIPTION'
+ Wx_IDValue = 1004
+ Wx_MaxLength = 0
Wx_Alignment = [wxEXPAND]
Wx_StretchFactor = 1
- end
+ Wx_PaneCaption = 'MemDescription'
+ Wx_PaneName = 'MemDescription_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
+ end
object WxFlexGridSizer1: TWxFlexGridSizer
Left = 5
Top = 137
@@ -126,89 +176,152 @@
Wx_ControlOrientation = wxControlVertical
Wx_IDName = 'ID_WXFLEXGRIDSIZER1'
Wx_IDValue = 1013
- object LblPriority: TWxStaticText
+ object LblPriority: TWxStaticText
Left = 42
Top = 5
- Width = 38
- Height = 17
- Caption = 'Priority:'
+ Width = 38
+ Height = 17
+ Caption = 'Priority:'
TabOrder = 0
- Wx_BGColor = clBlack
- Wx_Class = 'wxStaticText'
+ Wx_BGColor = clBlack
+ Wx_Class = 'wxStaticText'
Wx_ControlOrientation = wxControlVertical
- Wx_FGColor = clBlack
- Wx_GeneralStyle = []
- Wx_Hidden = False
- Wx_IDName = 'ID_LBLPRIORITY'
+ Wx_FGColor = clBlack
+ Wx_GeneralStyle = []
+ Wx_Hidden = False
+ Wx_IDName = 'ID_LBLPRIORITY'
Wx_IDValue = 1014
- Wx_LabelStyle = []
+ Wx_LabelStyle = []
Wx_Alignment = [wxALIGN_LEFT]
- end
- object LblUser: TWxStaticText
+ Wx_PaneCaption = 'LblPriority'
+ Wx_PaneName = 'LblPriority_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
+ end
+ object LblUser: TWxStaticText
Left = 190
Top = 5
- Width = 29
- Height = 17
- Caption = 'User:'
+ Width = 29
+ Height = 17
+ Caption = 'User:'
TabOrder = 1
- Wx_BGColor = clBlack
- Wx_Class = 'wxStaticText'
+ Wx_BGColor = clBlack
+ Wx_Class = 'wxStaticText'
Wx_ControlOrientation = wxControlVertical
- Wx_FGColor = clBlack
- Wx_GeneralStyle = []
- Wx_Hidden = False
- Wx_IDName = 'ID_LBLUSER'
+ Wx_FGColor = clBlack
+ Wx_GeneralStyle = []
+ Wx_Hidden = False
+ Wx_IDName = 'ID_LBLUSER'
Wx_IDValue = 1015
- Wx_LabelStyle = []
+ Wx_LabelStyle = []
Wx_Alignment = [wxALIGN_LEFT]
Wx_StretchFactor = 1
- end
- object SpnPriority: TWxSpinCtrl
+ Wx_PaneCaption = 'LblUser'
+ Wx_PaneName = 'LblUser_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
+ end
+ object SpnPriority: TWxSpinCtrl
Left = 5
Top = 32
- Width = 113
- Height = 22
- MaxValue = 9
- MinValue = 1
+ Width = 113
+ Height = 22
+ MaxValue = 9
+ MinValue = 1
TabOrder = 2
- Value = 1
- Wx_BGColor = clBlack
- Wx_Class = 'wxSpinCtrl'
- Wx_SpinButtonStyle = []
- Wx_EditStyle = []
+ Value = 1
+ Wx_BGColor = clBlack
+ Wx_Class = 'wxSpinCtrl'
+ Wx_SpinButtonStyle = []
+ Wx_EditStyle = []
Wx_ControlOrientation = wxControlVertical
- Wx_FGColor = clBlack
- Wx_GeneralStyle = []
- Wx_Hidden = False
- Wx_IDName = 'ID_SPNPRIORITY'
+ Wx_FGColor = clBlack
+ Wx_GeneralStyle = []
+ Wx_Hidden = False
+ Wx_IDName = 'ID_SPNPRIORITY'
Wx_IDValue = 1016
Wx_Alignment = [wxALIGN_LEFT]
- end
- object EdtUser: TWxEdit
+ Wx_PaneCaption = 'SpnPriority'
+ Wx_PaneName = 'SpnPriority_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
+ end
+ object EdtUser: TWxEdit
Left = 128
Top = 32
- Width = 153
- Height = 22
- BevelInner = bvNone
- BevelOuter = bvNone
- Modified = False
- AutoSize = False
+ Width = 153
+ Height = 22
+ BevelInner = bvNone
+ BevelOuter = bvNone
+ AutoSize = False
TabOrder = 3
- Wx_BGColor = clBlack
- Wx_Class = 'wxTextCtrl'
+ Wx_BGColor = clBlack
+ Wx_Class = 'wxTextCtrl'
Wx_ControlOrientation = wxControlVertical
- Wx_EditStyle = []
- Wx_FGColor = clBlack
- Wx_GeneralStyle = []
- Wx_Hidden = False
- Wx_IDName = 'ID_EDTUSER'
+ Wx_EditStyle = []
+ Wx_FGColor = clBlack
+ Wx_GeneralStyle = []
+ Wx_Hidden = False
+ Wx_IDName = 'ID_EDTUSER'
Wx_IDValue = 1017
- Wx_Validator = 'wxTextValidator(wxFILTER_ALPHANUMERIC, NULL)'
+ Wx_Validator = 'wxTextValidator(wxFILTER_ALPHANUMERIC, NULL)'
Wx_Alignment = []
Wx_StretchFactor = 1
- Wx_MaxLength = 0
- end
- end
+ Wx_MaxLength = 0
+ Wx_PaneCaption = 'EdtUser'
+ Wx_PaneName = 'EdtUser_Pane'
+ Wx_Aui_Dock_Direction = wxAUI_DOCK_NONE
+ Wx_Aui_Dockable_Direction = []
+ Wx_Aui_Pane_Style = []
+ Wx_Aui_Pane_Buttons = []
+ Wx_BestSize_Height = 0
+ Wx_BestSize_Width = 0
+ Wx_MinSize_Height = 0
+ Wx_MinSize_Width = 0
+ Wx_MaxSize_Height = 0
+ Wx_MaxSize_Width = 0
+ Wx_Floating_Height = 0
+ Wx_Floating_Width = 0
+ Wx_Floating_X_Pos = 0
+ Wx_Floating_Y_Pos = 0
+ end
+ end
end
end
object WxStdDialogButtonSizer1: TWxStdDialogButtonSizer
Modified: trunk/wxdevide/source/ColorEditDlg.cpp
===================================================================
--- trunk/wxdevide/source/ColorEditDlg.cpp 2010-09-05 18:22:36 UTC (rev 15)
+++ trunk/wxdevide/source/ColorEditDlg.cpp 2011-12-04 03:10:39 UTC (rev 16)
@@ -58,99 +58,114 @@
//Add the custom code before or after the blocks
////GUI Items Creation Start
- WxPanel1 = new wxPanel(this, ID_WXPANEL1, wxPoint(0,0), wxSize(472,166));
+ WxPanel1 = new wxPanel(this, ID_WXPANEL1, wxPoint(0, 0), wxSize(472, 166));
+ WxPanel1->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
- RadDefaultColour = new wxRadioButton(WxPanel1, ID_RADDEFAULTCOLOUR, _("Use Default Colour"), wxPoint(8,16), wxSize(113,17), 0, wxDefaultValidator, _("RadDefaultColour"));
+ RadDefaultColour = new wxRadioButton(WxPanel1, ID_RADDEFAULTCOLOUR, wxT("Use Default Colour"), wxPoint(8, 16), wxSize(113, 17), 0, wxDefaultValidator, wxT("RadDefaultColour"));
RadDefaultColour->SetValue(true);
+ RadDefaultColour->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
- RadStandardColour = new wxRadioButton(WxPanel1, ID_RADSTANDARDCOLOUR, _("Use Standard Colour"), wxPoint(8,48), wxSize(118,17), 0, wxDefaultValidator, _("RadStandardColour"));
+ RadStandardColour = new wxRadioButton(WxPanel1, ID_RADSTANDARDCOLOUR, wxT("Use Standard Colour"), wxPoint(8, 48), wxSize(118, 17), 0, wxDefaultValidator, wxT("RadStandardColour"));
+ RadStandardColour->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
- RadSystemColour = new wxRadioButton(WxPanel1, ID_RADSYSTEMCOLOUR, _("Use System Colour"), wxPoint(8,80), wxSize(113,17), 0, wxDefaultValidator, _("RadSystemColour"));
+ RadSystemColour = new wxRadioButton(WxPanel1, ID_RADSYSTEMCOLOUR, wxT("Use System Colour"), wxPoint(8, 80), wxSize(113, 17), 0, wxDefaultValidator, wxT("RadSystemColour"));
+ RadSystemColour->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
- RadCustomColour = new wxRadioButton(WxPanel1, ID_RADCUSTOMCOLOUR, _("Use Custom Colour"), wxPoint(8,112), wxSize(113,17), 0, wxDefaultValidator, _("RadCustomColour"));
+ RadCustomColour = new wxRadioButton(WxPanel1, ID_RADCUSTOMCOLOUR, wxT("Use Custom Colour"), wxPoint(8, 112), wxSize(113, 17), 0, wxDefaultValidator, wxT("RadCustomColour"));
+ RadCustomColour->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
- WxStaticText1 = new wxStaticText(WxPanel1, ID_WXSTATICTEXT1, _("Color Preview"), wxPoint(381,8), wxDefaultSize, 0, _("WxStaticText1"));
+ WxStaticText1 = new wxStaticText(WxPanel1, ID_WXSTATICTEXT1, wxT("Color Preview"), wxPoint(381, 8), wxDefaultSize, 0, wxT("WxStaticText1"));
+ WxStaticText1->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
- PnlPreview = new wxPanel(WxPanel1, ID_PNLPREVIEW, wxPoint(368,24), wxSize(97,113), wxSIMPLE_BORDER);
+ PnlPreview = new wxPanel(WxPanel1, ID_PNLPREVIEW, wxPoint(368, 24), wxSize(97, 113), wxSIMPLE_BORDER);
+ PnlPreview->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
- BtnOK = new wxButton(WxPanel1, ID_BTNOK, _("OK"), wxPoint(309,139), wxSize(75,25), 0, wxDefaultValidator, _("BtnOK"));
+ BtnOK = new wxButton(WxPanel1, ID_BTNOK, wxT("OK"), wxPoint(309, 139), wxSize(75, 25), 0, wxDefaultValidator, wxT("BtnOK"));
+ BtnOK->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
- BtnCancel = new wxButton(WxPanel1, wxID_CANCEL, _("Cancel"), wxPoint(390,139), wxSize(75,25), 0, wxDefaultValidator, _("BtnCancel"));
+ BtnCancel = new wxButton(WxPanel1, wxID_CANCEL, wxT("Cancel"), wxPoint(390, 139), wxSize(75, 25), 0, wxDefaultValidator, wxT("BtnCancel"));
+ BtnCancel->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
wxArrayString arrayStringFor_CmbStandardColour;
- arrayStringFor_CmbStandardColour.Add(_("wxBLACK"));
- arrayStringFor_CmbStandardColour.Add(_("wxWHITE"));
- arrayStringFor_CmbStandardColour.Add(_("wxRED"));
- arrayStringFor_CmbStandardColour.Add(_("wxBLUE"));
- arrayStringFor_CmbStandardColour.Add(_("wxGREEN"));
- arrayStringFor_CmbStandardColour.Add(_("wxCYAN"));
- arrayStringFor_CmbStandardColour.Add(_("wxLIGHT_GREY"));
- CmbStandardColour = new wxComboBox(WxPanel1, ID_CMBSTANDARDCOLOUR, _("wxBLACK"), wxPoint(128,48), wxSize(230,21), arrayStringFor_CmbStandardColour, wxCB_READONLY, wxDefaultValidator, _("CmbStandardColour"));
+ arrayStringFor_CmbStandardColour.Add(wxT("wxBLACK"));
+ arrayStringFor_CmbStandardColour.Add(wxT("wxWHITE"));
+ arrayStringFor_CmbStandardColour.Add(wxT("wxRED"));
+ arrayStringFor_CmbStandardColour.Add(wxT("wxBLUE"));
+ arrayStringFor_CmbStandardColour.Add(wxT("wxGREEN"));
+ arrayStringFor_CmbStandardColour.Add(wxT("wxCYAN"));
+ arrayStringFor_CmbStandardColour.Add(wxT("wxLIGHT_GREY"));
+ CmbStandardColour = new wxComboBox(WxPanel1, ID_CMBSTANDARDCOLOUR, wxT("wxBLACK"), wxPoint(128, 48), wxSize(230, 21), arrayStringFor_CmbStandardColour, wxCB_READONLY, wxDefaultValidator, wxT("CmbStandardColour"));
CmbStandardColour->Enable(false);
+ CmbStandardColour->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
wxArrayString arrayStringFor_CmbSystemColour;
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_SCROLLBAR "));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_BACKGROUND "));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_ACTIVECAPTION "));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_INACTIVECAPTION"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_MENU"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_WINDOW"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_WINDOWFRAME"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_MENUTEXT"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_WINDOWTEXT"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_CAPTIONTEXT"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_ACTIVEBORDER"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_INACTIVEBORDER"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_APPWORKSPACE"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_HIGHLIGHT"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_HIGHLIGHTTEXT"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_BTNFACE"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_BTNSHADOW"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_GRAYTEXT"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_BTNTEXT"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_INACTIVECAPTIONTEXT"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_BTNHIGHLIGHT"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_3DDKSHADOW"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_3DLIGHT"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_INFOTEXT"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS_COLOUR_INFOBK"));
- arrayStringFor_CmbSystemColour.Add(_("wxSYS...
[truncated message content] |
|
From: <tb...@us...> - 2011-12-29 17:11:02
|
Revision: 19
http://wxdevide.svn.sourceforge.net/wxdevide/?rev=19&view=rev
Author: tbreina
Date: 2011-12-29 17:10:50 +0000 (Thu, 29 Dec 2011)
Log Message:
-----------
Changes for building under wxWidgets 2.9.
Modified Paths:
--------------
trunk/wxdevide/source/DevCfg.cpp
trunk/wxdevide/source/DevCpp.dev
trunk/wxdevide/source/DevCpp.layout
trunk/wxdevide/source/MainFrm.cpp
trunk/wxdevide/source/MainFrm.h
trunk/wxdevide/source/MainFrm.wxform
trunk/wxdevide/source/Makefile.win
trunk/wxdevide/source/NewProjectFrm.cpp
trunk/wxdevide/source/SplashFrm.wxform
trunk/wxdevide/source/ToolEditForm.cpp
trunk/wxdevide/source/ToolEditFrm.cpp
trunk/wxdevide/source/ToolFrm.cpp
trunk/wxdevide/source/Utils.cpp
trunk/wxdevide/source/Version.h
trunk/wxdevide/source/devcfg.h
Modified: trunk/wxdevide/source/DevCfg.cpp
===================================================================
--- trunk/wxdevide/source/DevCfg.cpp 2011-12-11 03:29:29 UTC (rev 18)
+++ trunk/wxdevide/source/DevCfg.cpp 2011-12-29 17:10:50 UTC (rev 19)
@@ -162,11 +162,8 @@
BadDirs = BadDirs.AfterFirst(';');
wxSetWorkingDirectory(currdir);
-#ifndef WXW29
- if(badDirs)
-#else
+
if(badDirs.IsEmpty())
-#endif
{
badDirs.Empty();
badDirs.Append(BadDirs);
@@ -1830,60 +1827,49 @@
if(!tempStr.IsEmpty()) //Temp string does not equal ''
{
msg += wxT("Following Bin directories don't exist:\n");
-#ifndef WXW29
- msg += tempStr.Replace(wxString(wxT(";")).c_str(),wxString(wxT("\r\n")).c_str());
-#else
+
tempStr.Replace( wxT(";"), wxT("\r\n"));
msg += tempStr;
-#endif
msg += wxT("\r\n\r\n");
}
goodCDir = ValidatePaths(fCDir, tempStr);
if(!tempStr.IsEmpty())
{
msg += wxT("Following C Include directories don't exist:\r\n");
-#ifndef WXW29
- msg += tempStr.Replace(wxString(wxT(";")).c_str(),wxString(wxT("\r\n")).c_str());
-#else
+
tempStr.Replace( wxT(";"), wxT("\r\n"));
msg += tempStr;
-#endif
+
msg += wxT("\r\n\r\n");
}
goodCppDir = ValidatePaths(fCppDir, tempStr);
if(!tempStr.IsEmpty())
{
msg += wxT("Following C++ Include directories don''t exist:\r\n");
-#ifndef WXW29
- msg += tempStr.Replace(wxString(wxT(";")).c_str(),wxString(wxT("\r\n")).c_str());
-#else
+
tempStr.Replace( wxT(";"), wxT("\r\n"));
msg += tempStr;
-#endif
+
msg += wxT("\r\n\r\n");
}
goodLibDir = ValidatePaths(fLibDir, tempStr);
if(!tempStr.IsEmpty())
{
msg += wxT("Following Libs directories don''t exist:\r\n");
-#ifndef WXW29
- msg += tempStr.Replace(wxString(wxT(";")).c_str(),wxString(wxT("\r\n")).c_str());
-#else
+
tempStr.Replace( wxT(";"), wxT("\r\n"));
msg += tempStr;
-#endif
+
msg += wxT("\r\n\r\n");
}
goodRCDir = ValidatePaths(fRCDir, tempStr);
if(!tempStr.IsEmpty())
{
msg += wxT("Following resource compiler directories don''t exist:\r\n");
-#ifndef WXW29
- msg += tempStr.Replace(wxString(wxT(";")).c_str(),wxString(wxT("\r\n")).c_str());
-#else
+
tempStr.Replace( wxT(";"), wxT("\r\n"));
msg += tempStr;
-#endif
+
msg += wxT("\r\n\r\n");
}
if(!msg.IsEmpty())
Modified: trunk/wxdevide/source/DevCpp.dev
===================================================================
--- trunk/wxdevide/source/DevCpp.dev 2011-12-11 03:29:29 UTC (rev 18)
+++ trunk/wxdevide/source/DevCpp.dev 2011-12-29 17:10:50 UTC (rev 19)
@@ -1,6 +1,6 @@
[Project]
FileName=DevCpp.dev
-Name=DevCpp
+Name=wxDevIDE
UnitCount=99
PchHead=-1
PchSource=-1
@@ -39,8 +39,8 @@
MakeIncludes=
Compiler=
CppCompiler=
-Linker=-mwindows_@@_-l$(WXLIBNAME)_stc_@@_-l$(WXLIBNAME)_@@_-l$(WXLIBNAME)_gl_@@_-lwxtiff_@@_-lwxjpeg_@@_-lwxpng_@@_-lwxzlib_@@_-lwxregexu_@@_-lwxexpat_@@_-lkernel32_@@_-luser32_@@_-lgdi32_@@_-lcomdlg32_@@_-lwinspool_@@_-lwinmm_@@_-lshell32_@@_-lcomctl32_@@_-lole32_@@_-loleaut32_@@_-luuid_@@_-lrpcrt4_@@_-ladvapi32_@@_-lwsock32_@@_-lodbc32_@@_-lopengl32_@@_
-PreprocDefines=__WXMSW___@@___GNUWIN32___@@__UNICODE_@@_
+Linker=-mwindows_@@_-l$(WXLIBNAME)_stc_@@_-l$(WXLIBNAME)_@@_-l$(WXLIBNAME)_gl_@@_-lwxscintilla_@@_-lwxtiff_@@_-lwxjpeg_@@_-lwxpng_@@_-lwxzlib_@@_-lwxregexu_@@_-lwxexpat_@@_-lkernel32_@@_-luser32_@@_-lgdi32_@@_-lcomdlg32_@@_-lwinspool_@@_-lwinmm_@@_-lshell32_@@_-lcomctl32_@@_-lole32_@@_-loleaut32_@@_-luuid_@@_-lrpcrt4_@@_-ladvapi32_@@_-lwsock32_@@_-lodbc32_@@_-lopengl32_@@_
+PreprocDefines=__WXMSW___@@___GNUWIN32___@@__UNICODE_@@_wxNO_RTTI_@@__@@_
CompilerSettings=0000000001001000000000
Icon=
ExeOutput=Output\MingW
Modified: trunk/wxdevide/source/DevCpp.layout
===================================================================
--- trunk/wxdevide/source/DevCpp.layout 2011-12-11 03:29:29 UTC (rev 18)
+++ trunk/wxdevide/source/DevCpp.layout 2011-12-29 17:10:50 UTC (rev 19)
@@ -20,8 +20,8 @@
Open=0
Top=0
[Editors]
-Focused=90
-Order=61,59,60,68,73,75,76,77,79,78,88,89,87,85,84,90,5,96,97,98,11,92,22,21,-1,18
+Focused=64
+Order=61,60,59,11,21,20,84,86,87,90,64
[Editor_3]
Open=0
Top=0
@@ -37,7 +37,7 @@
TopLine=1
LeftChar=1
[Editor_5]
-Open=1
+Open=0
Top=0
CursorCol=6
CursorRow=38
@@ -81,9 +81,9 @@
[Editor_11]
Open=1
Top=0
-CursorCol=19
-CursorRow=1857
-TopLine=1848
+CursorCol=1
+CursorRow=13
+TopLine=7
LeftChar=1
[Editor_12]
Open=0
@@ -128,7 +128,7 @@
TopLine=74
LeftChar=1
[Editor_18]
-Open=1
+Open=0
Top=0
CursorCol=17
CursorRow=17
@@ -142,21 +142,21 @@
TopLine=4
LeftChar=1
[Editor_20]
-Open=0
+Open=1
Top=0
-CursorCol=7
-CursorRow=70
-TopLine=55
+CursorCol=1
+CursorRow=1872
+TopLine=2331
LeftChar=1
[Editor_21]
Open=1
Top=0
-CursorCol=1
-CursorRow=49
-TopLine=394
+CursorCol=23
+CursorRow=29
+TopLine=19
LeftChar=1
[Editor_22]
-Open=1
+Open=0
Top=0
CursorCol=1
CursorRow=25
@@ -417,16 +417,16 @@
[Editor_59]
Open=1
Top=0
-CursorCol=1
-CursorRow=5608
-TopLine=5596
+CursorCol=23
+CursorRow=6247
+TopLine=6231
LeftChar=1
[Editor_60]
Open=1
Top=0
-CursorCol=2
-CursorRow=54
-TopLine=46
+CursorCol=23
+CursorRow=35
+TopLine=25
LeftChar=1
[Editor_61]
Open=1
@@ -450,11 +450,11 @@
TopLine=46
LeftChar=1
[Editor_64]
-Open=0
-Top=0
-CursorCol=1
-CursorRow=1
-TopLine=1
+Open=1
+Top=1
+CursorCol=39
+CursorRow=247
+TopLine=229
LeftChar=1
[Editor_65]
Open=0
@@ -478,10 +478,10 @@
TopLine=1
LeftChar=1
[Editor_68]
-Open=1
+Open=0
Top=0
-CursorCol=2
-CursorRow=93
+CursorCol=7
+CursorRow=85
TopLine=79
LeftChar=1
[Editor_69]
@@ -513,10 +513,10 @@
TopLine=1
LeftChar=1
[Editor_73]
-Open=1
+Open=0
Top=0
-CursorCol=7
-CursorRow=1832
+CursorCol=2
+CursorRow=1827
TopLine=1825
LeftChar=1
[Editor_74]
@@ -527,35 +527,35 @@
TopLine=86
LeftChar=1
[Editor_75]
-Open=1
+Open=0
Top=0
CursorCol=1
-CursorRow=10
+CursorRow=9
TopLine=1
LeftChar=1
[Editor_76]
-Open=1
+Open=0
Top=0
CursorCol=32
CursorRow=72
TopLine=57
LeftChar=1
[Editor_77]
-Open=1
+Open=0
Top=0
CursorCol=1
CursorRow=55
TopLine=72
LeftChar=1
[Editor_78]
-Open=1
+Open=0
Top=0
CursorCol=1
-CursorRow=1
-TopLine=1
+CursorRow=12
+TopLine=56
LeftChar=1
[Editor_79]
-Open=1
+Open=0
Top=0
CursorCol=1
CursorRow=1
@@ -592,40 +592,40 @@
[Editor_84]
Open=1
Top=0
-CursorCol=23
-CursorRow=15
-TopLine=12
+CursorCol=1
+CursorRow=58
+TopLine=34
LeftChar=1
[Editor_85]
-Open=1
+Open=0
Top=0
CursorCol=1
CursorRow=1
TopLine=1
LeftChar=1
[Editor_86]
-Open=0
+Open=1
Top=0
-CursorCol=18
-CursorRow=9
-TopLine=87
+CursorCol=1
+CursorRow=79
+TopLine=68
LeftChar=1
[Editor_87]
Open=1
Top=0
-CursorCol=2
-CursorRow=422
-TopLine=403
+CursorCol=21
+CursorRow=450
+TopLine=433
LeftChar=1
[Editor_88]
-Open=1
+Open=0
Top=0
CursorCol=1
CursorRow=1
TopLine=1
LeftChar=1
[Editor_89]
-Open=1
+Open=0
Top=0
CursorCol=1
CursorRow=1
@@ -633,10 +633,10 @@
LeftChar=1
[Editor_90]
Open=1
-Top=1
-CursorCol=5
-CursorRow=571
-TopLine=562
+Top=0
+CursorCol=47
+CursorRow=1486
+TopLine=1470
LeftChar=1
[Editor_91]
Open=0
@@ -646,11 +646,11 @@
TopLine=1
LeftChar=1
[Editor_92]
-Open=1
+Open=0
Top=0
-CursorCol=20
-CursorRow=38
-TopLine=28
+CursorCol=1
+CursorRow=41
+TopLine=32
LeftChar=1
[Editor_93]
Open=0
@@ -666,21 +666,21 @@
Open=0
Top=0
[Editor_96]
-Open=1
+Open=0
Top=0
CursorCol=1
CursorRow=1
TopLine=1
LeftChar=1
[Editor_97]
-Open=1
+Open=0
Top=0
CursorCol=1
CursorRow=1
TopLine=1
LeftChar=1
[Editor_98]
-Open=1
+Open=0
Top=0
CursorCol=1
CursorRow=1
Modified: trunk/wxdevide/source/MainFrm.cpp
===================================================================
--- trunk/wxdevide/source/MainFrm.cpp 2011-12-11 03:29:29 UTC (rev 18)
+++ trunk/wxdevide/source/MainFrm.cpp 2011-12-29 17:10:50 UTC (rev 19)
@@ -13,7 +13,7 @@
//Header Include Start and Header Include End
//wxDev-C++ desig1ner will remove them
////Header Include Start
-#include "Images/Self_MainFrm_XPM.xpm"
+#include "Images/MainFrm_frmNewForm_XPM.xpm"
#include "Images/MainFrm_BtnDebugStepInto_XPM.xpm"
#include "Images/MainFrm_BtnDebugStepOver_XPM.xpm"
#include "Images/MainFrm_BtnDebugRestart_XPM.xpm"
@@ -83,6 +83,36 @@
EVT_CLOSE(MainFrm::OnClose)
EVT_ACTIVATE(MainFrm::MainFrmActivate)
+ EVT_MENU(wxID_UNDO , MainFrm::ActionUndoExecute)
+ EVT_UPDATE_UI(wxID_UNDO , MainFrm::ActionUndoUpdate)
+ EVT_MENU(wxID_REDO , MainFrm::ActionRedoExecute)
+ EVT_UPDATE_UI(wxID_REDO , MainFrm::ActionRedoUpdate)
+ EVT_MENU(wxID_CUT , MainFrm::ActionCutExecute)
+ EVT_UPDATE_UI(wxID_CUT , MainFrm::ActionCutUpdate)
+ EVT_MENU(wxID_COPY , MainFrm::ActionCopyExecute)
+ EVT_UPDATE_UI(wxID_COPY , MainFrm::ActionCopyUpdate)
+ EVT_MENU(wxID_PASTE , MainFrm::ActionPasteExecute)
+ EVT_UPDATE_UI(wxID_PASTE , MainFrm::ActionPasteUpdate)
+ EVT_MENU(wxID_SELECTALL , MainFrm::ActionSelectAllExecute)
+ EVT_MENU(wxID_DELETE , MainFrm::ActionDeleteExecute)
+ EVT_MENU(ID_MNU_SWAPHEADER_SOURCE_1105 , MainFrm::ActionSwapHeaderSourceExecute)
+ EVT_UPDATE_UI(ID_MNU_SWAPHEADER_SOURCE_1105 , MainFrm::ActionSwapHeaderSourceUpdate)
+ EVT_MENU(INT_TRY_CATCH , MainFrm::SurroundWithClick)
+ EVT_MENU(INT_TRY_FINALLY , MainFrm::SurroundWithClick)
+ EVT_MENU(INT_TRY_CATCH_FINALLY , MainFrm::SurroundWithClick)
+ EVT_MENU(INT_FOR , MainFrm::SurroundWithClick)
+ EVT_MENU(INT_FOR_I , MainFrm::SurroundWithClick)
+ EVT_MENU(INT_WHILE , MainFrm::SurroundWithClick)
+ EVT_MENU(INT_DO_WHILE , MainFrm::SurroundWithClick)
+ EVT_MENU(INT_IF , MainFrm::SurroundWithClick)
+ EVT_MENU(INT_IF_ELSE , MainFrm::SurroundWithClick)
+ EVT_MENU(INT_SWITCH , MainFrm::SurroundWithClick)
+ EVT_MENU(INT_BRACES , MainFrm::SurroundWithClick)
+ EVT_MENU(INT_C_COMMENT , MainFrm::SurroundWithClick)
+ EVT_MENU(INT_CPP_COMMENT , MainFrm::SurroundWithClick)
+ EVT_MENU(ID_MNU_TOGGLEBREAKPOINT_1145 , MainFrm::ActionBreakPointExecute)
+ EVT_MENU(ID_MNU_ADDTO_DOITEM____TSHIFT_CTRL_T_1149 , MainFrm::ActionAddToDoExecute)
+ EVT_MENU(wxID_PROPERTIES , MainFrm::ActionFilePropertiesExecute)
EVT_MENU(ID_MNU_SOURCEFILE_1410, MainFrm::ActionNewSourceExecute)
EVT_MENU(ID_MNU_PROJECT_1412, MainFrm::ActionNewProjectExecute)
EVT_MENU(ID_MNU_RESOURCE_1414, MainFrm::ActionNewResExecute)
@@ -166,36 +196,6 @@
EVT_MENU(ID_MNU_HELPONWXDEV_C___1168 , MainFrm::ActionShowMainHelpFile)
EVT_MENU(ID_MNU_ADDFILE____1231 , MainFrm::ActionProjectAddExecute)
EVT_MENU(ID_MNU_PROPERTIES_1443 , MainFrm::ActionFilePropertiesExecute)
- EVT_MENU(wxID_UNDO , MainFrm::ActionUndoExecute)
- EVT_UPDATE_UI(wxID_UNDO , MainFrm::ActionUndoUpdate)
- EVT_MENU(wxID_REDO , MainFrm::ActionRedoExecute)
- EVT_UPDATE_UI(wxID_REDO , MainFrm::ActionRedoUpdate)
- EVT_MENU(wxID_CUT , MainFrm::ActionCutExecute)
- EVT_UPDATE_UI(wxID_CUT , MainFrm::ActionCutUpdate)
- EVT_MENU(wxID_COPY , MainFrm::ActionCopyExecute)
- EVT_UPDATE_UI(wxID_COPY , MainFrm::ActionCopyUpdate)
- EVT_MENU(wxID_PASTE , MainFrm::ActionPasteExecute)
- EVT_UPDATE_UI(wxID_PASTE , MainFrm::ActionPasteUpdate)
- EVT_MENU(wxID_SELECTALL , MainFrm::ActionSelectAllExecute)
- EVT_MENU(wxID_DELETE , MainFrm::ActionDeleteExecute)
- EVT_MENU(ID_MNU_SWAPHEADER_SOURCE_1105 , MainFrm::ActionSwapHeaderSourceExecute)
- EVT_UPDATE_UI(ID_MNU_SWAPHEADER_SOURCE_1105 , MainFrm::ActionSwapHeaderSourceUpdate)
- EVT_MENU(INT_TRY_CATCH , MainFrm::SurroundWithClick)
- EVT_MENU(INT_TRY_FINALLY , MainFrm::SurroundWithClick)
- EVT_MENU(INT_TRY_CATCH_FINALLY , MainFrm::SurroundWithClick)
- EVT_MENU(INT_FOR , MainFrm::SurroundWithClick)
- EVT_MENU(INT_FOR_I , MainFrm::SurroundWithClick)
- EVT_MENU(INT_WHILE , MainFrm::SurroundWithClick)
- EVT_MENU(INT_DO_WHILE , MainFrm::SurroundWithClick)
- EVT_MENU(INT_IF , MainFrm::SurroundWithClick)
- EVT_MENU(INT_IF_ELSE , MainFrm::SurroundWithClick)
- EVT_MENU(INT_SWITCH , MainFrm::SurroundWithClick)
- EVT_MENU(INT_BRACES , MainFrm::SurroundWithClick)
- EVT_MENU(INT_C_COMMENT , MainFrm::SurroundWithClick)
- EVT_MENU(INT_CPP_COMMENT , MainFrm::SurroundWithClick)
- EVT_MENU(ID_MNU_TOGGLEBREAKPOINT_1145 , MainFrm::ActionBreakPointExecute)
- EVT_MENU(ID_MNU_ADDTO_DOITEM____TSHIFT_CTRL_T_1149 , MainFrm::ActionAddToDoExecute)
- EVT_MENU(wxID_PROPERTIES , MainFrm::ActionFilePropertiesExecute)
EVT_MENU(ID_BTNGOTOLINE,MainFrm::ActionGotoExecute)
EVT_MENU(wxID_REDO,MainFrm::ActionRedoExecute)
EVT_UPDATE_UI(wxID_REDO,MainFrm::ActionRedoUpdate)
@@ -501,131 +501,14 @@
StbStatusBar_Widths[3] = -1;
StbStatusBar->SetStatusWidths(4,StbStatusBar_Widths);
- MnuMessagePopup = new wxMenu(wxT(""));MnuMessagePopup->Append(ID_MNU_COPY_1253, wxT("&Copy"), wxT(""), wxITEM_NORMAL);
- MnuMessagePopup->Append(ID_MNU_CLEAR_1254, wxT("C&lear"), wxT(""), wxITEM_NORMAL);
-
- /* Main popup menu for the editor
+ /* Debug popup menu
*/
- MnuEditorPopup = new wxMenu(wxT(""));MnuEditorPopup->Append(ID_MNU_CLOSE_1092, wxT("C&lose\tCtrl+F4"), wxT("Close current page"), wxITEM_NORMAL);
- MnuEditorPopup->Append(ID_MNU_CLOSEALL_1093, wxT("Close All"), wxT("Close all pages"), wxITEM_NORMAL);
- MnuEditorPopup->Append(ID_MNU_CLOSEALLEXCEPTTHIS_1094, wxT("Close all except this"), wxT(""), wxITEM_NORMAL);
- MnuEditorPopup->AppendSeparator();
- MnuEditorPopup->Append(wxID_UNDO, wxT("&Undo\tCtrl+Z"), wxT(""), wxITEM_NORMAL);
- MnuEditorPopup->Append(wxID_REDO, wxT("&Redo\tShift+Ctrl+Z"), wxT(""), wxITEM_NORMAL);
- MnuEditorPopup->AppendSeparator();
- MnuEditorPopup->Append(wxID_CUT, wxT("C&ut\tCtrl+X"), wxT(""), wxITEM_NORMAL);
- MnuEditorPopup->Append(wxID_COPY, wxT("&Copy\tCtrl+C"), wxT(""), wxITEM_NORMAL);
- MnuEditorPopup->Append(wxID_PASTE, wxT("&Paste\tCtrl+V"), wxT(""), wxITEM_NORMAL);
- MnuEditorPopup->Append(wxID_SELECTALL, wxT("&Select All\tCtrl+A"), wxT(""), wxITEM_NORMAL);
- MnuEditorPopup->Append(wxID_DELETE, wxT("Delete"), wxT(""), wxITEM_NORMAL);
- MnuEditorPopup->AppendSeparator();
- MnuEditorPopup->Append(ID_MNU_SWAPHEADER_SOURCE_1105, wxT("Swap header/source"), wxT(""), wxITEM_NORMAL);
- MnuEditorPopup->AppendSeparator();
- wxMenu *ID_MNU_INSERT_1107_Obj = new wxMenu();
- ID_MNU_INSERT_1107_Obj->Append(ID_MNU_COMMENTHEADER_1108, wxT("Comment header"), wxT(""), wxITEM_NORMAL);
- ID_MNU_INSERT_1107_Obj->Append(ID_MNU_DATEANDTIME_1109, wxT("Date and time"), wxT(""), wxITEM_NORMAL);
- ID_MNU_INSERT_1107_Obj->AppendSeparator();
- ID_MNU_INSERT_1107_Obj->Append(ID_MNU_MAINFUNCTION_1111, wxT("Main function"), wxT(""), wxITEM_NORMAL);
- ID_MNU_INSERT_1107_Obj->Append(ID_MNU_WINMAINFUNCTION_1112, wxT("WinMain function"), wxT(""), wxITEM_NORMAL);
- ID_MNU_INSERT_1107_Obj->AppendSeparator();
- ID_MNU_INSERT_1107_Obj->Append(ID_MNU__IFDEF_1114, wxT("#ifdef"), wxT(""), wxITEM_NORMAL);
- ID_MNU_INSERT_1107_Obj->Append(ID_MNU__IFNDEF_1115, wxT("#ifndef"), wxT(""), wxITEM_NORMAL);
- ID_MNU_INSERT_1107_Obj->Append(ID_MNU__INCLUDE_1116, wxT("#include"), wxT(""), wxITEM_NORMAL);
- ID_MNU_INSERT_1107_Obj->AppendSeparator();
- ID_MNU_INSERT_1107_Obj->Append(ID_MNU_IF___1118, wxT("if()"), wxT(""), wxITEM_NORMAL);
- ID_MNU_INSERT_1107_Obj->Append(ID_MNU_WHILE___1119, wxT("while()"), wxT(""), wxITEM_NORMAL);
- ID_MNU_INSERT_1107_Obj->Append(ID_MNU_DO___WHILE___1120, wxT("do...while()"), wxT(""), wxITEM_NORMAL);
- ID_MNU_INSERT_1107_Obj->Append(ID_MNU_FOR___1121, wxT("for()"), wxT(""), wxITEM_NORMAL);
- ID_MNU_INSERT_1107_Obj->AppendSeparator();
- ID_MNU_INSERT_1107_Obj->Append(ID_MNU_MESSAGEBOX_1123, wxT("MessageBox"), wxT(""), wxITEM_NORMAL);
- MnuEditorPopup->Append(ID_MNU_INSERT_1107, wxT("&Insert"), ID_MNU_INSERT_1107_Obj);
- wxMenu *ID_MNU_SURROUNDWITH_1124_Obj = new wxMenu();
- ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_TRY_CATCH, wxT("try...catch"), wxT(""), wxITEM_NORMAL);
- ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_TRY_FINALLY, wxT("t&ry...finally"), wxT(""), wxITEM_NORMAL);
- ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_TRY_CATCH_FINALLY, wxT("tr&y...catch...finally"), wxT(""), wxITEM_NORMAL);
- ID_MNU_SURROUNDWITH_1124_Obj->AppendSeparator();
- ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_FOR, wxT("for"), wxT(""), wxITEM_NORMAL);
- ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_FOR_I, wxT("for(int i..."), wxT(""), wxITEM_NORMAL);
- ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_WHILE, wxT("while"), wxT(""), wxITEM_NORMAL);
- ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_DO_WHILE, wxT("do...while"), wxT(""), wxITEM_NORMAL);
- ID_MNU_SURROUNDWITH_1124_Obj->AppendSeparator();
- ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_IF, wxT("if"), wxT(""), wxITEM_NORMAL);
- ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_IF_ELSE, wxT("if...else"), wxT(""), wxITEM_NORMAL);
- ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_SWITCH, wxT("switch"), wxT(""), wxITEM_NORMAL);
- ID_MNU_SURROUNDWITH_1124_Obj->AppendSeparator();
- ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_BRACES, wxT("{...}"), wxT(""), wxITEM_NORMAL);
- ID_MNU_SURROUNDWITH_1124_Obj->AppendSeparator();
- ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_C_COMMENT, wxT("C Style Comment"), wxT(""), wxITEM_NORMAL);
- ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_CPP_COMMENT, wxT("C++ Style Comment"), wxT(""), wxITEM_NORMAL);
- MnuEditorPopup->Append(ID_MNU_SURROUNDWITH_1124, wxT("Surround with"), ID_MNU_SURROUNDWITH_1124_Obj);
- MnuEditorPopup->AppendSeparator();
- MnuEditorPopup->Append(ID_MNU_TOGGLEBOOKMARKS_1141, wxT("&Toggle bookmarks"), wxT(""), wxITEM_NORMAL);
- MnuEditorPopup->Append(ID_MNU_GOTOBOOKMARKS_1142, wxT("&Goto bookmarks"), wxT(""), wxITEM_NORMAL);
- MnuEditorPopup->AppendSeparator();
- MnuEditorPopup->Append(ID_MNU_TOGGLEBREAKPOINT_1145, wxT("Toggle Breakpoint"), wxT(""), wxITEM_NORMAL);
- MnuEditorPopup->Append(ID_MNU_ADDWATCH_1146, wxT("&Add Watch"), wxT(""), wxITEM_NORMAL);
- MnuEditorPopup->Append(ID_MNU_RUNTOCURSOR_1147, wxT("&Run to cursor"), wxT(""), wxITEM_NORMAL);
- MnuEditorPopup->AppendSeparator();
- MnuEditorPopup->Append(ID_MNU_ADDTO_DOITEM____TSHIFT_CTRL_T_1149, wxT("Add To-Do Item...\tShift+Ctrl+T"), wxT(""), wxITEM_NORMAL);
- MnuEditorPopup->AppendSeparator();
- wxMenu *ID_MNU_VERSIONCONTROL_1151_Obj = new wxMenu();
-
- wxMenu *ID_MNU_CVS_1255_Obj = new wxMenu();
- ID_MNU_CVS_1255_Obj->Append(ID_MNU_UPDATE_1256, wxT("Update"), wxT(""), wxITEM_NORMAL);
- ID_MNU_CVS_1255_Obj->Append(ID_MNU_DIFF_1258, wxT("Diff"), wxT(""), wxITEM_NORMAL);
- ID_MNU_CVS_1255_Obj->AppendSeparator();
- ID_MNU_CVS_1255_Obj->Append(ID_MNU_COMMIT_1260, wxT("Commit"), wxT(""), wxITEM_NORMAL);
- ID_MNU_CVS_1255_Obj->AppendSeparator();
- ID_MNU_CVS_1255_Obj->Append(ID_MNU_LOG_1262, wxT("Log"), wxT(""), wxITEM_NORMAL);
- ID_MNU_VERSIONCONTROL_1151_Obj->Append(ID_MNU_CVS_1255, wxT("CVS"), ID_MNU_CVS_1255_Obj);
-
- wxMenu *ID_MNU_SVN_1263_Obj = new wxMenu();
- ID_MNU_SVN_1263_Obj->Append(ID_MNU_UPDATE_1264, wxT("Update"), wxT(""), wxITEM_NORMAL);
- ID_MNU_SVN_1263_Obj->Append(ID_MNU_DIFF_1265, wxT("Diff"), wxT(""), wxITEM_NORMAL);
- ID_MNU_SVN_1263_Obj->AppendSeparator();
- ID_MNU_SVN_1263_Obj->Append(ID_MNU_COMMIT_1267, wxT("Commit"), wxT(""), wxITEM_NORMAL);
- ID_MNU_SVN_1263_Obj->AppendSeparator();
- ID_MNU_SVN_1263_Obj->Append(ID_MNU_LOG_1269, wxT("Log"), wxT(""), wxITEM_NORMAL);
- ID_MNU_VERSIONCONTROL_1151_Obj->Append(ID_MNU_SVN_1263, wxT("SVN"), ID_MNU_SVN_1263_Obj);
- MnuEditorPopup->Append(ID_MNU_VERSIONCONTROL_1151, wxT("Version Control"), ID_MNU_VERSIONCONTROL_1151_Obj);
- MnuEditorPopup->AppendSeparator();
- MnuEditorPopup->Append(wxID_PROPERTIES, wxT("Properties"), wxT(""), wxITEM_NORMAL);
+ MnuDebugPopup = new wxMenu(wxT(""));MnuDebugPopup->Append(ID_MNU_ADDWATCH_TF4_1189, wxT("&Add watch\tF4"), wxT(""), wxITEM_NORMAL);
+ MnuDebugPopup->Append(ID_MNU_MODIFYVALUE_1190, wxT("&Modify value"), wxT(""), wxITEM_NORMAL);
+ MnuDebugPopup->AppendSeparator();
+ MnuDebugPopup->Append(ID_MNU_REMOVEWATCH_1192, wxT("&Remove Watch"), wxT(""), wxITEM_NORMAL);
+ MnuDebugPopup->Append(ID_MNU_CLEARALLWATCHES_1193, wxT("&Clear all Watches"), wxT(""), wxITEM_NORMAL);
- /* Project popup menu
- */
- MnuProjectPopup = new wxMenu(wxT(""));MnuProjectPopup->Append(ID_MNU_NEWUNIT_1230, wxT("&New Unit"), wxT(""), wxITEM_NORMAL);
- MnuProjectPopup->Append(ID_MNU_ADDFILE____1231, wxT("&Add file..."), wxT(""), wxITEM_NORMAL);
- MnuProjectPopup->Append(ID_MNU_REMOVEFILE____1233, wxT("&Remove file..."), wxT(""), wxITEM_NORMAL);
- MnuProjectPopup->AppendSeparator();
- MnuProjectPopup->Append(ID_MNU_ADDFOLDER_1234, wxT("Add &folder"), wxT(""), wxITEM_NORMAL);
- MnuProjectPopup->AppendSeparator();
- MnuProjectPopup->Append(ID_MNU_OPTIONS_1236, wxT("&Options"), wxT(""), wxITEM_NORMAL);
- MnuProjectPopup->AppendSeparator();
- wxMenu *ID_MNU_VERSIONCONTROL_1238_Obj = new wxMenu();
-
- wxMenu *ID_MNU_CVS_1290_Obj = new wxMenu();
- ID_MNU_CVS_1290_Obj->Append(ID_MNU_UPDATE_1291, wxT("Update"), wxT(""), wxITEM_NORMAL);
- ID_MNU_CVS_1290_Obj->Append(ID_MNU_DIFF_1292, wxT("Diff"), wxT(""), wxITEM_NORMAL);
- ID_MNU_CVS_1290_Obj->AppendSeparator();
- ID_MNU_CVS_1290_Obj->Append(ID_MNU_COMMIT_1294, wxT("Commit"), wxT(""), wxITEM_NORMAL);
- ID_MNU_CVS_1290_Obj->AppendSeparator();
- ID_MNU_CVS_1290_Obj->Append(ID_MNU_LOG_1296, wxT("Log"), wxT(""), wxITEM_NORMAL);
- ID_MNU_VERSIONCONTROL_1238_Obj->Append(ID_MNU_CVS_1290, wxT("CVS"), ID_MNU_CVS_1290_Obj);
-
- wxMenu *ID_MNU_SVN_1297_Obj = new wxMenu();
- ID_MNU_SVN_1297_Obj->Append(ID_MNU_UPDATE_1298, wxT("Update"), wxT(""), wxITEM_NORMAL);
- ID_MNU_SVN_1297_Obj->Append(ID_MNU_DIFF_1299, wxT("Diff"), wxT(""), wxITEM_NORMAL);
- ID_MNU_SVN_1297_Obj->AppendSeparator();
- ID_MNU_SVN_1297_Obj->Append(ID_MNU_COMMIT_1301, wxT("Commit"), wxT(""), wxITEM_NORMAL);
- ID_MNU_SVN_1297_Obj->AppendSeparator();
- ID_MNU_SVN_1297_Obj->Append(ID_MNU_LOG_1303, wxT("Log"), wxT(""), wxITEM_NORMAL);
- ID_MNU_VERSIONCONTROL_1238_Obj->Append(ID_MNU_SVN_1297, wxT("SVN"), ID_MNU_SVN_1297_Obj);
- MnuProjectPopup->Append(ID_MNU_VERSIONCONTROL_1238, wxT("Version Control"), ID_MNU_VERSIONCONTROL_1238_Obj);
- MnuProjectPopup->AppendSeparator();
- MnuProjectPopup->Append(ID_MNU_PROPERTIES_1443, wxT("Proper&ties"), wxT(""), wxITEM_NORMAL);
-
- WxPopupMenu1 = new wxMenu(wxT(""));
-
/* Browser popup menu
*/
MnuBrowserPopup = new wxMenu(wxT(""));MnuBrowserPopup->Append(ID_MNU_GOTODECLARATION_1170, wxT("Goto declaration"), wxT(""), wxITEM_NORMAL);
@@ -649,16 +532,6 @@
ID_MNU_VIEWMODE_1182_Obj->Append(ID_MNU_SHOWINHERITED_1188, wxT("Show inherited members"), wxT(""), wxITEM_NORMAL);
MnuBrowserPopup->Append(ID_MNU_VIEWMODE_1182, wxT("View mode"), ID_MNU_VIEWMODE_1182_Obj);
- DlgOpenDialog = new wxFileDialog(this, wxT("Choose a file"), wxT(""), wxT(""), wxT("*.*"), wxOPEN | wxMULTIPLE);
-
- /* Debug popup menu
- */
- MnuDebugPopup = new wxMenu(wxT(""));MnuDebugPopup->Append(ID_MNU_ADDWATCH_TF4_1189, wxT("&Add watch\tF4"), wxT(""), wxITEM_NORMAL);
- MnuDebugPopup->Append(ID_MNU_MODIFYVALUE_1190, wxT("&Modify value"), wxT(""), wxITEM_NORMAL);
- MnuDebugPopup->AppendSeparator();
- MnuDebugPopup->Append(ID_MNU_REMOVEWATCH_1192, wxT("&Remove Watch"), wxT(""), wxITEM_NORMAL);
- MnuDebugPopup->Append(ID_MNU_CLEARALLWATCHES_1193, wxT("&Clear all Watches"), wxT(""), wxITEM_NORMAL);
-
/* Unit popup menu
*/
MnuUnitPopup = new wxMenu(wxT(""));MnuUnitPopup->Append(ID_MNU_REMOVEFROMPROJECT_1194, wxT("&Remove from project"), wxT(""), wxITEM_NORMAL);
@@ -703,6 +576,46 @@
MnuUnitPopup->AppendSeparator();
MnuUnitPopup->Append(wxID_PROPERTIES, wxT("Properties"), wxT(""), wxITEM_NORMAL);
+ DlgOpenDialog = new wxFileDialog(this, wxT("Choose a file"), wxT(""), wxT(""), wxT("*.*"), wxFD_OPEN | wxFD_MULTIPLE);
+
+ /* Project popup menu
+ */
+ MnuProjectPopup = new wxMenu(wxT(""));MnuProjectPopup->Append(ID_MNU_NEWUNIT_1230, wxT("&New Unit"), wxT(""), wxITEM_NORMAL);
+ MnuProjectPopup->Append(ID_MNU_ADDFILE____1231, wxT("&Add file..."), wxT(""), wxITEM_NORMAL);
+ MnuProjectPopup->Append(ID_MNU_REMOVEFILE____1233, wxT("&Remove file..."), wxT(""), wxITEM_NORMAL);
+ MnuProjectPopup->AppendSeparator();
+ MnuProjectPopup->Append(ID_MNU_ADDFOLDER_1234, wxT("Add &folder"), wxT(""), wxITEM_NORMAL);
+ MnuProjectPopup->AppendSeparator();
+ MnuProjectPopup->Append(ID_MNU_OPTIONS_1236, wxT("&Options"), wxT(""), wxITEM_NORMAL);
+ MnuProjectPopup->AppendSeparator();
+ wxMenu *ID_MNU_VERSIONCONTROL_1238_Obj = new wxMenu();
+
+ wxMenu *ID_MNU_CVS_1290_Obj = new wxMenu();
+ ID_MNU_CVS_1290_Obj->Append(ID_MNU_UPDATE_1291, wxT("Update"), wxT(""), wxITEM_NORMAL);
+ ID_MNU_CVS_1290_Obj->Append(ID_MNU_DIFF_1292, wxT("Diff"), wxT(""), wxITEM_NORMAL);
+ ID_MNU_CVS_1290_Obj->AppendSeparator();
+ ID_MNU_CVS_1290_Obj->Append(ID_MNU_COMMIT_1294, wxT("Commit"), wxT(""), wxITEM_NORMAL);
+ ID_MNU_CVS_1290_Obj->AppendSeparator();
+ ID_MNU_CVS_1290_Obj->Append(ID_MNU_LOG_1296, wxT("Log"), wxT(""), wxITEM_NORMAL);
+ ID_MNU_VERSIONCONTROL_1238_Obj->Append(ID_MNU_CVS_1290, wxT("CVS"), ID_MNU_CVS_1290_Obj);
+
+ wxMenu *ID_MNU_SVN_1297_Obj = new wxMenu();
+ ID_MNU_SVN_1297_Obj->Append(ID_MNU_UPDATE_1298, wxT("Update"), wxT(""), wxITEM_NORMAL);
+ ID_MNU_SVN_1297_Obj->Append(ID_MNU_DIFF_1299, wxT("Diff"), wxT(""), wxITEM_NORMAL);
+ ID_MNU_SVN_1297_Obj->AppendSeparator();
+ ID_MNU_SVN_1297_Obj->Append(ID_MNU_COMMIT_1301, wxT("Commit"), wxT(""), wxITEM_NORMAL);
+ ID_MNU_SVN_1297_Obj->AppendSeparator();
+ ID_MNU_SVN_1297_Obj->Append(ID_MNU_LOG_1303, wxT("Log"), wxT(""), wxITEM_NORMAL);
+ ID_MNU_VERSIONCONTROL_1238_Obj->Append(ID_MNU_SVN_1297, wxT("SVN"), ID_MNU_SVN_1297_Obj);
+ MnuProjectPopup->Append(ID_MNU_VERSIONCONTROL_1238, wxT("Version Control"), ID_MNU_VERSIONCONTROL_1238_Obj);
+ MnuProjectPopup->AppendSeparator();
+ MnuProjectPopup->Append(ID_MNU_PROPERTIES_1443, wxT("Proper&ties"), wxT(""), wxITEM_NORMAL);
+
+ DlgSaveDialog = new wxFileDialog(this, wxT("Choose a file"), wxT(""), wxT(""), wxT("*.*"), wxFD_SAVE);
+
+ MnuMessagePopup = new wxMenu(wxT(""));MnuMessagePopup->Append(ID_MNU_COPY_1253, wxT("&Copy"), wxT(""), wxITEM_NORMAL);
+ MnuMessagePopup->Append(ID_MNU_CLEAR_1254, wxT("C&lear"), wxT(""), wxITEM_NORMAL);
+
/* Help popup menu
*/
MnuHelpPopup = new wxMenu(wxT(""));MnuHelpPopup->Append(ID_MNU_HELPONWXDEV_C___1168, wxT("&Help on wxDev-C++"), wxT(""), wxITEM_NORMAL);
@@ -903,8 +816,95 @@
WxMenuBar1->Append(ID_MNU_HELP_1011_Mnu_Obj, wxT("&Help"));
SetMenuBar(WxMenuBar1);
- DlgSaveDialog = new wxFileDialog(this, wxT("Choose a file"), wxT(""), wxT(""), wxT("*.*"), wxSAVE);
+ /* Main popup menu for the editor
+ */
+ MnuEditorPopup = new wxMenu(wxT(""));MnuEditorPopup->Append(ID_MNU_CLOSE_1092, wxT("C&lose\tCtrl+F4"), wxT("Close current page"), wxITEM_NORMAL);
+ MnuEditorPopup->Append(ID_MNU_CLOSEALL_1093, wxT("Close All"), wxT("Close all pages"), wxITEM_NORMAL);
+ MnuEditorPopup->Append(ID_MNU_CLOSEALLEXCEPTTHIS_1094, wxT("Close all except this"), wxT(""), wxITEM_NORMAL);
+ MnuEditorPopup->AppendSeparator();
+ MnuEditorPopup->Append(wxID_UNDO, wxT("&Undo\tCtrl+Z"), wxT(""), wxITEM_NORMAL);
+ MnuEditorPopup->Append(wxID_REDO, wxT("&Redo\tShift+Ctrl+Z"), wxT(""), wxITEM_NORMAL);
+ MnuEditorPopup->AppendSeparator();
+ MnuEditorPopup->Append(wxID_CUT, wxT("C&ut\tCtrl+X"), wxT(""), wxITEM_NORMAL);
+ MnuEditorPopup->Append(wxID_COPY, wxT("&Copy\tCtrl+C"), wxT(""), wxITEM_NORMAL);
+ MnuEditorPopup->Append(wxID_PASTE, wxT("&Paste\tCtrl+V"), wxT(""), wxITEM_NORMAL);
+ MnuEditorPopup->Append(wxID_SELECTALL, wxT("&Select All\tCtrl+A"), wxT(""), wxITEM_NORMAL);
+ MnuEditorPopup->Append(wxID_DELETE, wxT("Delete"), wxT(""), wxITEM_NORMAL);
+ MnuEditorPopup->AppendSeparator();
+ MnuEditorPopup->Append(ID_MNU_SWAPHEADER_SOURCE_1105, wxT("Swap header/source"), wxT(""), wxITEM_NORMAL);
+ MnuEditorPopup->AppendSeparator();
+ wxMenu *ID_MNU_INSERT_1107_Obj = new wxMenu();
+ ID_MNU_INSERT_1107_Obj->Append(ID_MNU_COMMENTHEADER_1108, wxT("Comment header"), wxT(""), wxITEM_NORMAL);
+ ID_MNU_INSERT_1107_Obj->Append(ID_MNU_DATEANDTIME_1109, wxT("Date and time"), wxT(""), wxITEM_NORMAL);
+ ID_MNU_INSERT_1107_Obj->AppendSeparator();
+ ID_MNU_INSERT_1107_Obj->Append(ID_MNU_MAINFUNCTION_1111, wxT("Main function"), wxT(""), wxITEM_NORMAL);
+ ID_MNU_INSERT_1107_Obj->Append(ID_MNU_WINMAINFUNCTION_1112, wxT("WinMain function"), wxT(""), wxITEM_NORMAL);
+ ID_MNU_INSERT_1107_Obj->AppendSeparator();
+ ID_MNU_INSERT_1107_Obj->Append(ID_MNU__IFDEF_1114, wxT("#ifdef"), wxT(""), wxITEM_NORMAL);
+ ID_MNU_INSERT_1107_Obj->Append(ID_MNU__IFNDEF_1115, wxT("#ifndef"), wxT(""), wxITEM_NORMAL);
+ ID_MNU_INSERT_1107_Obj->Append(ID_MNU__INCLUDE_1116, wxT("#include"), wxT(""), wxITEM_NORMAL);
+ ID_MNU_INSERT_1107_Obj->AppendSeparator();
+ ID_MNU_INSERT_1107_Obj->Append(ID_MNU_IF___1118, wxT("if()"), wxT(""), wxITEM_NORMAL);
+ ID_MNU_INSERT_1107_Obj->Append(ID_MNU_WHILE___1119, wxT("while()"), wxT(""), wxITEM_NORMAL);
+ ID_MNU_INSERT_1107_Obj->Append(ID_MNU_DO___WHILE___1120, wxT("do...while()"), wxT(""), wxITEM_NORMAL);
+ ID_MNU_INSERT_1107_Obj->Append(ID_MNU_FOR___1121, wxT("for()"), wxT(""), wxITEM_NORMAL);
+ ID_MNU_INSERT_1107_Obj->AppendSeparator();
+ ID_MNU_INSERT_1107_Obj->Append(ID_MNU_MESSAGEBOX_1123, wxT("MessageBox"), wxT(""), wxITEM_NORMAL);
+ MnuEditorPopup->Append(ID_MNU_INSERT_1107, wxT("&Insert"), ID_MNU_INSERT_1107_Obj);
+ wxMenu *ID_MNU_SURROUNDWITH_1124_Obj = new wxMenu();
+ ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_TRY_CATCH, wxT("try...catch"), wxT(""), wxITEM_NORMAL);
+ ID_MNU_SURROUNDWITH_1124_Obj->Append(INT_TRY_FINALLY, wxT("t&ry...finally"), wxT(""), wxITEM_NORMA...
[truncated message content] |
|
From: <tb...@us...> - 2012-01-09 18:17:58
|
Revision: 21
http://wxdevide.svn.sourceforge.net/wxdevide/?rev=21&view=rev
Author: tbreina
Date: 2012-01-09 18:17:44 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
Update to compile with wxWidgets 2.9.3
Modified Paths:
--------------
trunk/wxdevide/source/AboutDlg.cpp
trunk/wxdevide/source/AboutDlg.wxform
trunk/wxdevide/source/DevCpp.dev
trunk/wxdevide/source/DevCpp.layout
trunk/wxdevide/source/Images/AboutDlg_ImgBanner_XPM.xpm
trunk/wxdevide/source/MainFrm.cpp
trunk/wxdevide/source/MainFrm.h
trunk/wxdevide/source/MainFrm.wxform
trunk/wxdevide/source/Makefile.win
Modified: trunk/wxdevide/source/AboutDlg.cpp
===================================================================
--- trunk/wxdevide/source/AboutDlg.cpp 2011-12-30 04:02:01 UTC (rev 20)
+++ trunk/wxdevide/source/AboutDlg.cpp 2012-01-09 18:17:44 UTC (rev 21)
@@ -55,511 +55,506 @@
//Add the custom code before or after the blocks
////GUI Items Creation Start
+ wxInitAllImageHandlers(); //Initialize graphic format handlers
+
WxBoxSizer1 = new wxBoxSizer(wxVERTICAL);
this->SetSizer(WxBoxSizer1);
this->SetAutoLayout(true);
wxBitmap ImgBanner_BITMAP(AboutDlg_ImgBanner_XPM);
- ImgBanner = new wxStaticBitmap(this, ID_IMGBANNER, ImgBanner_BITMAP, wxDefaultPosition, wxDefaultSize);
+ ImgBanner = new wxStaticBitmap(this, ID_IMGBANNER, ImgBanner_BITMAP, wxPoint(9, 5), wxSize(376, 61));
ImgBanner->Enable(false);
- ImgBanner->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
- WxBoxSizer1->Add(ImgBanner,0,wxALIGN_TOP | wxALL,5);
+ ImgBanner->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
+ WxBoxSizer1->Add(ImgBanner, 0, wxALIGN_TOP | wxALL, 5);
- NbkContainer = new wxNotebook(this, ID_NBKCONTAINER, wxDefaultPosition, wxDefaultSize, wxNB_DEFAULT);
- NbkContainer->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
- WxBoxSizer1->Add(NbkContainer,0,wxEXPAND | wxALL,5);
+ NbkContainer = new wxNotebook(this, ID_NBKCONTAINER, wxPoint(5, 68), wxSize(334, 231), wxNB_DEFAULT);
+ NbkContainer->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
+ WxBoxSizer1->Add(NbkContainer, 0, wxEXPAND | wxALL, 5);
- 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"));
+ NpgVersion = new wxPanel(NbkContainer, ID_NPGVERSION, wxPoint(4, 24), wxSize(326, 203));
+ NpgVersion->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
+ NbkContainer->AddPage(NpgVersion, wxT("Version Information"));
WxBoxSizer3 = new wxBoxSizer(wxVERTICAL);
NpgVersion->SetSizer(WxBoxSizer3);
NpgVersion->SetAutoLayout(true);
- LblDevCppCopyright = new wxStaticText(NpgVersion, ID_LBLDEVCPPCOPYRIGHT, _("Dev-C++ Code Base Copyright (c) Bloodshed Software"), wxDefaultPosition, wxDefaultSize, 0, _("LblDevCppCopyright"));
- LblDevCppCopyright->SetFont(wxFont(7, wxSWISS, wxNORMAL, wxBOLD, false, _("MS Sans Serif")));
- WxBoxSizer3->Add(LblDevCppCopyright,0,0 | wxALL,5);
+ LblDevCppCopyright = new wxStaticText(NpgVersion, ID_LBLDEVCPPCOPYRIGHT, wxT("Dev-C++ Code Base Copyright (c) Bloodshed Software"), wxPoint(20, 5), wxDefaultSize, 0, wxT("LblDevCppCopyright"));
+ LblDevCppCopyright->SetFont(wxFont(7, wxSWISS, wxNORMAL, wxBOLD, false, wxT("MS Sans Serif")));
+ WxBoxSizer3->Add(LblDevCppCopyright, 0, 0 | wxALL, 5);
- LblwxDevCppCopyright = new wxStaticText(NpgVersion, ID_LBLWXDEVCPPCOPYRIGHT, _("Form Designer Copyright (c) wxDev-C++ Development Team"), wxDefaultPosition, wxDefaultSize, 0, _("LblwxDevCppCopyright"));
- LblwxDevCppCopyright->SetFont(wxFont(7, wxSWISS, wxNORMAL, wxBOLD, false, _("MS Sans Serif")));
- WxBoxSizer3->Add(LblwxDevCppCopyright,0,wxALIGN_LEFT | wxALL,5);
+ LblwxDevCppCopyright = new wxStaticText(NpgVersion, ID_LBLWXDEVCPPCOPYRIGHT, wxT("Form Designer Copyright (c) wxDev-C++ Development Team"), wxPoint(5, 32), wxDefaultSize, 0, wxT("LblwxDevCppCopyright"));
+ LblwxDevCppCopyright->SetFont(wxFont(7, wxSWISS, wxNORMAL, wxBOLD, false, wxT("MS Sans Serif")));
+ WxBoxSizer3->Add(LblwxDevCppCopyright, 0, wxALIGN_LEFT | wxALL, 5);
WxFlexGridSizer1 = new wxFlexGridSizer(0, 2, 0, 0);
WxBoxSizer3->Add(WxFlexGridSizer1, 0, wxALIGN_CENTER | wxALL, 5);
- LblwxdevcppWebsite = new wxStaticText(NpgVersion, ID_LBLWXDEVCPPWEBSITE, _("wxDev-C++ Website:"), wxDefaultPosition, wxDefaultSize, 0, _("LblwxdevcppWebsite"));
- LblwxdevcppWebsite->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
- WxFlexGridSizer1->Add(LblwxdevcppWebsite,0,wxALIGN_LEFT | wxALL,5);
+ LblwxdevcppWebsite = new wxStaticText(NpgVersion, ID_LBLWXDEVCPPWEBSITE, wxT("wxDev-C++ Website:"), wxPoint(20, 5), wxDefaultSize, 0, wxT("LblwxdevcppWebsite"));
+ LblwxdevcppWebsite->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
+ WxFlexGridSizer1->Add(LblwxdevcppWebsite, 0, wxALIGN_LEFT | wxALL, 5);
- 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(7, wxSWISS, wxNORMAL, wxNORMAL, true, _("MS Sans Serif")));
- WxFlexGridSizer1->Add(HlkwxdevcppWebsite,0,wxALIGN_LEFT | wxALL,5);
+ HlkwxdevcppWebsite = new wxHyperlinkCtrl(NpgVersion, ID_HLKWXDEVCPPWEBSITE, wxT("http://wxdsgn.sourceforge.net/"), wxT("http://wxdsgn.sourceforge.net/"), wxPoint(173, 6), wxSize(139, 15), wxNO_BORDER | wxHL_CONTEXTMENU, wxT("HlkwxdevcppWebsite"));
+ HlkwxdevcppWebsite->SetFont(wxFont(7, wxSWISS, wxNORMAL, wxNORMAL, true, wxT("MS Sans Serif")));
+ WxFlexGridSizer1->Add(HlkwxdevcppWebsite, 0, wxALIGN_LEFT | wxALL, 5);
- 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")));
- WxFlexGridSizer1->Add(LblForum,0,wxALIGN_LEFT | wxALL,5);
+ LblForum = new wxStaticText(NpgVersion, ID_LBLFORUM, wxT("wxDev-C++ Support Forum:"), wxPoint(5, 32), wxDefaultSize, 0, wxT("LblForum"));
+ LblForum->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
+ WxFlexGridSizer1->Add(LblForum, 0, wxALIGN_LEFT | wxALL, 5);
- 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(7, wxSWISS, wxNORMAL, wxNORMAL, true, _("MS Sans Serif")));
- WxFlexGridSizer1->Add(HlkForumSite,0,wxALIGN_CENTER | wxALL,5);
+ HlkForumSite = new wxHyperlinkCtrl(NpgVersion, ID_HLKFORUMSITE, wxT("http://wxforum.shadonet.com/viewforum.php?f=28"), wxT("http://wxforum.shadonet.com/viewforum.php?f=28"), wxPoint(149, 33), wxSize(188, 15), wxNO_BORDER | wxHL_CONTEXTMENU, wxT("HlkForumSite"));
+ HlkForumSite->SetFont(wxFont(7, wxSWISS, wxNORMAL, wxNORMAL, true, wxT("MS Sans Serif")));
+ WxFlexGridSizer1->Add(HlkForumSite, 0, wxALIGN_CENTER | wxALL, 5);
- LblwxWeb = new wxStaticText(NpgVersion, ID_LBLWXWEB, _("wxWidget Site"), wxDefaultPosition, wxDefaultSize, 0, _("LblwxWeb"));
- LblwxWeb->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
- WxFlexGridSizer1->Add(LblwxWeb,0,wxALIGN_LEFT | wxALL,5);
+ LblwxWeb = new wxStaticText(NpgVersion, ID_LBLWXWEB, wxT("wxWidget Site"), wxPoint(36, 59), wxDefaultSize, 0, wxT("LblwxWeb"));
+ LblwxWeb->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
+ WxFlexGridSizer1->Add(LblwxWeb, 0, wxALIGN_LEFT | wxALL, 5);
- 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(7, wxSWISS, wxNORMAL, wxNORMAL, true, _("MS Sans Serif")));
- WxFlexGridSizer1->Add(HlkwxWebsite,0,wxALIGN_LEFT | wxALL,5);
+ HlkwxWebsite = new wxHyperlinkCtrl(NpgVersion, ID_HLKWXWEBSITE, wxT("http://wxwidgets.org"), wxT("http://wxwidgets.org"), wxPoint(171, 60), wxSize(144, 15), wxNO_BORDER | wxHL_CONTEXTMENU, wxT("HlkwxWebsite"));
+ HlkwxWebsite->SetFont(wxFont(7, wxSWISS, wxNORMAL, wxNORMAL, true, wxT("MS Sans Serif")));
+ WxFlexGridSizer1->Add(HlkwxWebsite, 0, wxALIGN_LEFT | wxALL, 5);
- LblBook = new wxStaticText(NpgVersion, ID_LBLBOOK, _("wxDev-C++ Book :"), wxDefaultPosition, wxDefaultSize, 0, _("LblBook"));
- LblBook->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
- WxFlexGridSizer1->Add(LblBook,0,0 | wxALL,5);
+ LblBook = new wxStaticText(NpgVersion, ID_LBLBOOK, wxT("wxDev-C++ Book :"), wxPoint(25, 86), wxDefaultSize, 0, wxT("LblBook"));
+ LblBook->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
+ WxFlexGridSizer1->Add(LblBook, 0, 0 | wxALL, 5);
- 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(7, wxSWISS, wxNORMAL, wxNORMAL, true, _("MS Sans Serif")));
- WxFlexGridSizer1->Add(HlkBook,0,wxALIGN_LEFT | wxALL,5);
+ HlkBook = new wxHyperlinkCtrl(NpgVersion, ID_HLKBOOK, wxT("http://wxdevcpp-book.sourceforge.net/"), wxT("http://wxdevcpp-book.sourceforge.net/"), wxPoint(159, 87), wxSize(168, 15), wxNO_BORDER | wxHL_CONTEXTMENU, wxT("HlkBook"));
+ HlkBook->SetFont(wxFont(7, wxSWISS, wxNORMAL, wxNORMAL, true, wxT("MS Sans Serif")));
+ WxFlexGridSizer1->Add(HlkBook, 0, wxALIGN_LEFT | wxALL, 5);
- 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"));
+ NpgLicense = new wxPanel(NbkContainer, ID_NPGLICENSE, wxPoint(4, 24), wxSize(326, 203));
+ NpgLicense->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, wxT("MS Sans Serif")));
+ NbkContainer->AddPage(NpgLicense, wxT("GNU General Public License"));
WxBoxSizer4 = new wxBoxSizer(wxHORIZONTAL);
NpgLicense->SetSizer(WxBoxSizer4);
NpgLicense->SetAutoLayout(true);
- 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\r\nthis license 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\r\nfreedom to share and change it. By contrast, the GNU General\r\nPublic License is intended to guarantee your freedom to share\r\nand change free software--to make sure the software is free for\r\nall its users. This General Public License applies to most of the\r\nFree Software Foundation's software and to any other program\r\nwhose authors commit to using it. (Some other Free Software\r\nFoundation 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\r\nprice. Our General Public Licenses are designed to make sure\r\nthat you have the freedom to distribute copies of free software\r\n(and charge for this service if you wish), that you receive source\r\ncode or can get it if you want it, that you can change the\r\nsoftware or use pieces of it in new free programs; and that you\r\nknow you can do these things.\r\n\r\nTo protect your rights, we need to make restrictions that forbid\r\nanyone to deny you these rights or to ask you to surrender the\r\nrights. These restrictions translate to certain responsibilities for\r\nyou if you distribute copies of the software, or if you modify it.\r\n\r\nFor example, if you distribute copies of such a program, whether\r\ngratis or for a fee, you must give the recipients all the rights that\r\nyou have. You must make sure that they, too, receive or can get\r\nthe source code. And you must show them these terms so they\r\nknow their rights.\r\n\r\nWe protect your rights with two steps: (1) copyright the\r\nsoftware, and (2) offer you this license which gives you legal\r\npermission to copy, distribute and/or modify the software.\r\n\r\nAlso, for each author's protection and ours, we want to make\r\ncertain that everyone understands that there is no warranty for\r\nthis free software. If the software is modified by someone else\r\nand passed on, we want its recipients to know that what they\r\nhave is not the original, so that any problems introduced by\r\nothers will not reflect on the original authors' reputations.\r\n\r\nFinally, any free program is threatened constantly by software\r\npatents. We wish to avoid the danger that redistributors of a\r\nfree program will individually obtain patent licenses, in effect\r\nmaking the program proprietary. To prevent this, we have made\r\nit clear that any patent must be licensed for everyone's free use\r\nor 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 \r\nAND \r\nMODIFICATION\r\n\r\n 0. This License applies to any program or other work which\r\ncontains a notice placed by the copyright holder saying it may\r\nbe distributed under the terms of this General Public License.\r\nThe \"Program\", below, refers to any such program or work,\r\nand a \"work based on the Program\" means either the Program\r\nor any derivative work under copyright law: that is to say, a work\r\ncontaining the Program or a portion of it, either verbatim or with\r\nmodifications and/or translated into another language.\r\n(Hereinafter, translation is included without limitation in the\r\nterm \"modification\".) Each licensee is addressed as \"you\".\r\n\r\nActivities other than copying, distribution and modification are\r\nnot covered by this License; they are outside its scope. The\r\nact of running the Program is not restricted, and the output\r\nfrom the Program is covered only if its contents constitute a\r\nwork based on the Program (independent of having been made\r\nby running the Program). Whether that is true depends on what\r\nthe Program does.\r\n\r\n 1. You may copy and distribute verbatim copies of the\r\nProgram's source code as you receive it, in any medium,\r\nprovided that you conspicuously and appropriately publish\r\non each copy an appropriate copyright notice and disclaimer\r\nof warranty; keep intact all the notices that refer to this License\r\nand to the absence of any warranty; and give any other\r\nrecipients of the Program a copy of this License along with\r\nthe Program.\r\n\r\nYou may charge a fee for the physical act of transferring a copy,\r\nand you may at your option offer warranty protection in\r\nexchange for a fee.\r\n\r\n 2. You may modify your copy or copies of the Program or any\r\nportion of it, thus forming a work based on the Program, and\r\ncopy and distribute such modifications or work under the terms\r\nof Section 1 above, provided that you also meet all of these\r\nconditions:\r\n\r\n a) You must cause the modified files to carry prominent\r\n notices stating that you changed the files and the date\r\n of any change.\r\n\r\n b) You must cause any work that you distribute or publish,\r\n that in whole or in part contains or is derived from the\r\n Program or any part thereof, to be licensed as a whole at\r\n no charge to all third parties under the terms of this License.\r\n\r\n c) If the modified program normally reads commands\r\n interactively when run, you must cause it, when started\r\n running for such interactive use in the most ordinary way,\r\n to print or display an announcement including an\r\n appropriate copyright notice and a notice that there is no\r\n warranty (or else, saying that you provide a warranty) and\r\n that users may redistribute the program under these\r\n conditions, and telling the user how to view a copy of this\r\n License. (Exception: if the Program itself is interactive but\r\n does not normally print such an announcement, your work\r\n based on the Program is not required to print an\r\n announcement.)\r\n\r\nThese requirements apply to the modified work as a whole. If\r\nidentifiable sections of that work are not derived from the\r\nProgram, and can be reasonably considered independent and\r\nseparate works in themselves, then this License, and its terms,\r\ndo not apply to those sections when you distribute them as\r\nseparate works. But when you distribute the same sections as\r\npart 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,\r\nwhose permissions for other licensees extend to the entire\r\nwhole, and thus to each 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\r\nyour rights to work written entirely by you; rather, the intent is to\r\nexercise the right to control the distribution of derivative or\r\ncollective works based on the Program.\r\n\r\nIn addition, mere aggregation of another work not based on the\r\nProgram with the Program (or with a work based on the\r\nProgram) on a volume of a storage or distribution medium does\r\nnot bring the other work under the scope of this License.\r\n\r\n 3. You may copy and distribute the Program (or a work based\r\non it, under Section 2) in object code or executable form under\r\nthe terms of Sections 1 and 2 above provided that you also do\r\none of the following:\r\n\r\n a) Accompany it with the complete corresponding machine-\r\n readable source code, which must be distributed under the\r\n terms of Sections 1 and 2 above on a medium customarily\r\n used for software interchange; or,\r\n\r\n b) Accompany it with a written offer, valid for at least three\r\n years, to give any third party, for a charge no more than your\r\n cost of physically performing source distribution, a complete\r\n machine-readable copy of the corresponding source code,\r\n to be distributed under the terms of Sections 1 and 2 above\r\n on a medium customarily used for software interchange; or,\r\n\r\n c) Accompany it with the information you received as to the\r\n offer to distribute corresponding source code. (This\r\n alternative is allowed only for noncommercial distribution\r\n and only if you received the program in object code or\r\n executable form with such an offer, in accord with Subsection\r\n b above.)\r\n\r\nThe source code for a work means the preferred form of the\r\nwork for making modifications to it. For an executable work,\r\ncomplete source code means all the source code for all modules\r\nit contains, plus any associated interface definition files,\r\nplus the scripts used to control compilation and installation\r\nof the executable. However, as a special exception, the source\r\ncode distributed need not include anything that is normally\r\ndistributed (in either source or binary form) with the major\r\ncomponents (compiler, kernel, and so on) of the operating\r\nsystem on which the executable runs, unless that component\r\nitself accompanies the executable.\r\n\r\nIf distribution of executable or object code is made by offering\r\naccess to copy from a designated place, then offering equivalent\r\naccess to copy the source code from the same place counts as\r\ndistribution of the source code, even though third parties are\r\nnot compelled to copy the source along with the object code.\r\n\r\n 4. You may not copy, modify, sublicense, or distribute the\r\nProgram except as expressly provided under this License. Any\r\nattempt otherwise to copy, modify, sublicense or distribute the\r\nProgram is void, and will automatically terminate your rights\r\nunder this License. However, parties who have received copies,\r\nor rights, from you under this License will not have their\r\nlicenses terminated so long as such parties remain in full\r\ncompliance.\r\n\r\n 5. You are not required to accept this License, since you have\r\nnot signed it. However, nothing else grants you permission to\r\nmodify or distribute the Program or its derivative works. These\r\nactions are prohibited by law if you do not accept this License.\r\nTherefore, by modifying or distributing the Program (or any\r\nwork based on the Program), you indicate your acceptance of\r\nthis License to do so, and all its terms and conditions for\r\ncopying, distributing or modifying the Program or works based\r\non it.\r\n\r\n 6. Each time you redistribute the Program (or any work based\r\non the Program), the recipient automatically receives a license\r\nfrom the original licensor to copy, distribute or modify the\r\nProgram subject to these terms and conditions. You may not\r\nimpose any further restrictions on the recipients' exercise of\r\nthe rights granted herein. You are not responsible for enforcing\r\ncompliance by third parties to this License.\r\n\r\n 7. If, as a consequence of a court judgment or allegation of\r\npatent infringement or for any other reason (not limited to\r\npatent issues), conditions are imposed on you (whether by court\r\norder, agreement or otherwise) that contradict the conditions\r\nof this License, they do not excuse you from the conditions of\r\nthis License. If you cannot distribute so as to satisfy\r\nsimultaneously your obligations under this License and any\r\nother pertinent obligations, then as a consequence you may not\r\ndistribute the Program at all. For example, if a patent license\r\nwould not permit royalty-free redistribution of the Program by\r\nall those who receive copies directly or indirectly through you,\r\nthen the only way you could satisfy both it and this License\r\nwould be to refrain entirely from distribution of the Program.\r\n\r\nIf any portion of this section is held invalid or unenforceable\r\nunder any particular circumstance, the balance of the section\r\nis intended to apply and the section as a whole is intended to\r\napply in other circumstances.\r\n\r\nIt is not the purpose of this section to induce you to infringe\r\nany patents or other property right claims or to contest validity\r\nof any such claims; this section has the sole purpose of\r\nprotecting the integrity of the free software distribution system,\r\nwhich is implemented by public license practices. Many people\r\nhave made generous contributions to the wide range of software\r\ndistributed through that system in reliance on consistent\r\napplication of that system; it is up to the author/donor to\r\ndecide if he or she is willing to distribute software through\r\nany other system and a licensee cannot impose that choice.\r\n\r\nThis section is intended to make thoroughly clear what is\r\nbelieved to be a consequence of the rest of this License.\r\n\r\n 8. If the distribution and/or use of the Program is restricted in\r\ncertain countries either by patents or by copyrighted interfaces,\r\nthe original copyright holder who places the Program under this\r\nLicense may add an explicit geographical distribution limitation\r\nexcluding those countries, so that distribution is permitted only\r\nin or among countries not thus excluded. In such case, this\r\nLicense incorporates the limitation as if written in the body of\r\nthis License.\r\n\r\n 9. The Free Software Foundation may publish revised and/or\r\nnew versions of the General Public License from time to time.\r\nSuch new versions will be similar in spirit to the present\r\nversion, but may differ in detail to address new problems or\r\nconcerns.\r\n\r\nEach version is given a distinguishing version number. If the\r\nProgram specifies a version number of this License which\r\napplies to it and \"any later version\", you have the option of\r\nfollowing the terms and conditions either of that version or\r\nof any later version published by the Free Software Foundation.\r\nIf the Program does not specify a version number of this License,\r\nyou may choose any version ever published by the Free Software\r\nFoundation.\r\n\r\n 10. If you wish to incorporate parts of the Program into\r\nother free programs whose distribution conditions are different,\r\nwrite to the author to ask for permission. For software which\r\nis copyrighted by the Free Software Foundation, write to the\r\nFree Software Foundation; we sometimes make exceptions for\r\nthis. Our decision will be guided by the two goals of preserving\r\nthe free status of all derivatives of our free software and of\r\npromoting 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 \r\nCHARGE, \r\nTHERE IS NO WARRANTY FOR THE PROGRAM, TO THE \r\nEXTENT \r\nPERMITTED BY APPLICABLE LAW. EXCEPT WHEN \r\nOTHERWISE \r\nSTATED IN WRITING THE COPYRIGHT HOLDERS AND/OR \r\nOTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" \r\nWITHOUT \r\nWARRANTY OF ANY KIND, EITHER EXPRESSED OR \r\nIMPLIED, \r\nINCLUDING, BUT NOT LIMITED TO, THE IMPLIED \r\nWARRANTIES\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 \r\nTHE\r\nPROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF \r\nALL\r\nNECESSARY SERVICING, REPAIR OR CORRECTION.\r\n\r\n 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW \r\nOR \r\nAGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, \r\nOR \r\nANY OTHER PARTY WHO MAY MODIFY AND/OR \r\nREDISTRIBUTE \r\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU \r\nFOR \r\nDAMAGES, INCLUDING ANY GENERAL, SPECIAL, \r\nINCIDENTAL\r\nOR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE \r\nOR \r\nINABILITY TO USE THE PROGRAM (INCLUDING BUT NOT\r\nLIMITED TO LOSS OF DATA OR DATA BEING RENDERED\r\nINACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\r\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE \r\nWITH\r\nANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR \r\nOTHER\r\nPARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH\r\nDAMAGES.\r\n\r\n END OF TERMS AND CONDITIONS\r\n"), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE, wxDefaultValidator, _("MmoLicense"));
+ MmoLicense = new wxTextCtrl(NpgLicense, ID_MMOLICENSE, wxEmptyString, wxPoint(5, 5), wxSize(317, 201), wxTE_MULTILINE, wxDefaultValidator, wxT("MmoLicense"));
MmoLicense->SetMaxLength(0);
- MmoLicense->AppendText(_(" GNU GENERAL PUBLIC LICENSE"));
- MmoLicense->AppendText(_(" Version 2, June 1991"));
- MmoLicense->AppendText(_(""));
- MmoLicense->AppendText(_("Copyright (C) 1989, 1991 Free Software Foundation, Inc."));
- MmoLicense->AppendText(_("675 Mass Ave, Cambridge, MA 02139, USA"));
- MmoLicense->AppendText(_("Everyone is permitted to copy and distribute verbatim copies of"));
- MmoLicense->AppendText(_("this license document, but changing it is not allowed."));
- MmoLicense->AppendText(_(""));
- MmoLicense->AppendText(_("Preamble"));
- MmoLicense->AppendText(_(""));
- MmoLicense->AppendText(_("The licenses for most software are designed to take away your"));
- MmoLicense->AppendText(_("freedom to share and change it. By contrast, the GNU General"));
- MmoLicense->AppendText(_("Public License is intended to guarantee your freedom to share"));
- MmoLicense->AppendText(_("and change free software--to make sure the software is free for"));
- MmoLicense->AppendText(_("all its users. This General Public License applies to most of the"));
- MmoLicense->AppendText(_("Free Software Foundation's software and to any other program"));
- MmoLicense->AppendText(_("whose authors commit to using it. (Some other Free Software"));
- MmoLicense->AppendText(_("Foundation software is covered by the GNU Library General"));
- MmoLicense->AppendText(_("Public License instead.) You can apply it to your programs, too."));
- MmoLicense->AppendText(_(""));
- MmoLicense->AppendText(_("When we speak of free software, we are referring to freedom, not"));
- MmoLicense->AppendText(_("price. Our General Public Licenses are designed to make sure"));
- MmoLicense->AppendText(_("that you have the freedom to distribute copies of free software"));
- MmoLicense->AppendText(_("(and charge for this service if you wish), that you receive source"));
- MmoLicense->AppendText(_("code or can get it if you want it, that you can change the"));
- MmoLicense->AppendText(_("software or use pieces of it in new free programs; and that you"));
- MmoLicense->AppendText(_("know you can do these things."));
- MmoLicense->AppendText(_(""));
- MmoLicense->AppendText(_("To protect your rights, we need to make restrictions that forbid"));
- MmoLicense->AppendText(_("anyone to deny you these rights or to ask you to surrender the"));
- MmoLicense->AppendText(_("rights. These restrictions translate to certain responsibilities for"));
- MmoLicense->AppendText(_("you if you distribute copies of the software, or if you modify it."));
- MmoLicense->AppendText(_(""));
- MmoLicense->AppendText(_("For example, if you distribute copies of such a program, whether"));
- MmoLicense->AppendText(_("gratis or for a fee, you must give the recipients all the rights that"));
- MmoLicense->AppendText(_("you have. You must make sure that they, too, receiv...
[truncated message content] |
|
From: <tb...@us...> - 2012-02-26 18:53:37
|
Revision: 22
http://wxdevide.svn.sourceforge.net/wxdevide/?rev=22&view=rev
Author: tbreina
Date: 2012-02-26 18:53:31 +0000 (Sun, 26 Feb 2012)
Log Message:
-----------
Update project to work with wxDev-C++ 7.4.2
Modified Paths:
--------------
trunk/wxdevide/source/Compiler.h
trunk/wxdevide/source/DevCpp.dev
trunk/wxdevide/source/DevCpp.layout
trunk/wxdevide/source/Makefile.win
trunk/wxdevide/source/devMonitorTypes.h
Modified: trunk/wxdevide/source/Compiler.h
===================================================================
--- trunk/wxdevide/source/Compiler.h 2012-01-09 18:17:44 UTC (rev 21)
+++ trunk/wxdevide/source/Compiler.h 2012-02-26 18:53:31 UTC (rev 22)
@@ -70,7 +70,7 @@
static const wxString RmExe = wxT("rm -f");
-typedef enum TTarget { ctNone, ctFile, ctProject };
+enum TTarget { ctNone, ctFile, ctProject };
class TCompiler
{
Modified: trunk/wxdevide/source/DevCpp.dev
===================================================================
--- trunk/wxdevide/source/DevCpp.dev 2012-01-09 18:17:44 UTC (rev 21)
+++ trunk/wxdevide/source/DevCpp.dev 2012-02-26 18:53:31 UTC (rev 22)
@@ -6,7 +6,7 @@
PchSource=-1
Ver=3
IsCpp=1
-ProfilesCount=3
+ProfilesCount=2
ProfileIndex=0
Folders=
@@ -30,7 +30,7 @@
AutoIncBuildNrOnCompile=0
[Profile1]
-ProfileName=MingW gcc 3.4.5
+ProfileName=MingW gcc
Type=0
ObjFiles=
Includes=
@@ -58,34 +58,6 @@
CompilerType=0
[Profile2]
-ProfileName=Visual C++ 2005
-Type=0
-ObjFiles=
-Includes=
-Libs=
-ResourceIncludes=
-MakeIncludes=
-Compiler=
-CppCompiler=
-Linker=$(WXLIBNAME).lib_@@_$(WXLIBNAME)_gl.lib_@@_wxtiff.lib_@@_wxjpeg.lib_@@_wxpng.lib_@@_wxzlib.lib_@@_wxregexu.lib_@@_wxexpat.lib_@@_kernel32.lib_@@_user32.lib_@@_gdi32.lib_@@_comdlg32.lib_@@_winspool.lib_@@_winmm.lib_@@_shell32.lib_@@_comctl32.lib_@@_ole32.lib_@@_oleaut32.lib_@@_uuid.lib_@@_rpcrt4.lib_@@_advapi32.lib_@@_wsock32.lib_@@_odbc32.lib_@@_opengl32.lib_@@_
-PreprocDefines=_@@_
-CompilerSettings=000000000000010000000000000000000000
-Icon=
-ExeOutput=Output\Visual C++ 2005
-ImagesOutput=Images\
-ObjectOutput=Objects\Visual C++ 2005
-OverrideOutput=0
-OverrideOutputName=
-HostApplication=
-CommandLine=
-UseCustomMakefile=0
-CustomMakefile=
-IncludeVersionInfo=0
-SupportXPThemes=0
-CompilerSet=1
-CompilerType=1
-
-[Profile3]
ProfileName=MS Visual C++
Type=0
ObjFiles=
@@ -103,15 +75,15 @@
ImagesOutput=Images\
ObjectOutput=Objects\Visual C++
OverrideOutput=0
-OverrideOutputName=
+OverrideOutputName=DevCpp.exe
HostApplication=
CommandLine=
UseCustomMakefile=0
CustomMakefile=
IncludeVersionInfo=0
SupportXPThemes=0
-CompilerSet=5
-CompilerType=5
+CompilerSet=9
+CompilerType=9
[Unit1]
FileName=AboutDlg.cpp
Modified: trunk/wxdevide/source/DevCpp.layout
===================================================================
--- trunk/wxdevide/source/DevCpp.layout 2012-01-09 18:17:44 UTC (rev 21)
+++ trunk/wxdevide/source/DevCpp.layout 2012-02-26 18:53:31 UTC (rev 22)
@@ -88,9 +88,9 @@
[Editor_12]
Open=0
Top=0
-CursorCol=1
-CursorRow=1
-TopLine=1
+CursorCol=10
+CursorRow=71
+TopLine=64
LeftChar=1
[Editor_13]
Open=0
@@ -186,7 +186,7 @@
[Editor_26]
Open=0
Top=0
-CursorCol=34
+CursorCol=1
CursorRow=35
TopLine=22
LeftChar=1
@@ -207,9 +207,9 @@
[Editor_29]
Open=0
Top=0
-CursorCol=1
-CursorRow=6
-TopLine=1
+CursorCol=12
+CursorRow=26
+TopLine=3
LeftChar=1
[Editor_30]
Open=0
@@ -242,9 +242,9 @@
[Editor_34]
Open=0
Top=0
-CursorCol=55
-CursorRow=66
-TopLine=40
+CursorCol=32
+CursorRow=3543
+TopLine=3523
LeftChar=1
[Editor_35]
Open=0
@@ -417,8 +417,8 @@
[Editor_59]
Open=1
Top=0
-CursorCol=1
-CursorRow=10
+CursorCol=24
+CursorRow=28
TopLine=10
LeftChar=1
[Editor_60]
@@ -494,9 +494,9 @@
[Editor_70]
Open=0
Top=0
-CursorCol=32
-CursorRow=22
-TopLine=30
+CursorCol=5
+CursorRow=13
+TopLine=5
LeftChar=1
[Editor_71]
Open=0
@@ -508,15 +508,15 @@
[Editor_72]
Open=0
Top=0
-CursorCol=72
-CursorRow=24
-TopLine=1
+CursorCol=26
+CursorRow=36
+TopLine=19
LeftChar=1
[Editor_73]
Open=1
Top=1
-CursorCol=1
-CursorRow=1805
+CursorCol=10
+CursorRow=1792
TopLine=1786
LeftChar=1
[Editor_74]
Modified: trunk/wxdevide/source/Makefile.win
===================================================================
--- trunk/wxdevide/source/Makefile.win 2012-01-09 18:17:44 UTC (rev 21)
+++ trunk/wxdevide/source/Makefile.win 2012-02-26 18:53:31 UTC (rev 22)
@@ -1,7 +1,7 @@
# Project: wxDevIDE
# Compiler: Default GCC compiler
# Compiler Type: MingW 3
-# Makefile created by wxDev-C++ wxDev-C++ IDE 7.4.1.42 on 07/01/12 19:58
+# Makefile created by wxDev-C++ IDE 7.4.2.140 on 26/02/12 10:48
WXLIBNAME = wxmsw29u
CPP = g++.exe
@@ -9,23 +9,29 @@
WINDRES = "windres.exe"
OBJ = Objects/MingW/AboutDlg.o Objects/MingW/AddToDoFrm.o Objects/MingW/CFGData.o Objects/MingW/ColorEditDlg.o Objects/MingW/Compiler.o Objects/MingW/CompilerFunctions.o Objects/MingW/CustomComponents.o Objects/MingW/DelphiSub.o Objects/MingW/DevCfg.o Objects/MingW/devcppApp.o Objects/MingW/devFileMonitor.o Objects/MingW/devFileMonitorThread.o Objects/MingW/DevResource.o Objects/MingW/DevTheme.o Objects/MingW/Editor.o Objects/MingW/EditorOptfrm.o Objects/MingW/ELDsgnr.o Objects/MingW/EnviroFrm.o Objects/MingW/FileAssocs.o Objects/MingW/FilePropertiesfrm.o Objects/MingW/GotoLineFrm.o Objects/MingW/LangFrm.o Objects/MingW/Macros.o Objects/MingW/MainFrm.o Objects/MingW/MultiLangSupport.o Objects/MingW/NewProjectFrm.o Objects/MingW/oysUtils.o Objects/MingW/PrjTypes.o Objects/MingW/Project.o Objects/MingW/SearchCenter.o Objects/MingW/SplashFrm.o Objects/MingW/Template.o Objects/MingW/ToolEditForm.o Objects/MingW/ToolEditFrm.o Objects/MingW/ToolFrm.o Objects/MingW/Utils.o Objects/MingW/WebUpdateDlg.o Objects/MingW/CompileProgressForm.o Objects/MingW/DevCpp_private.res
LINKOBJ = "Objects/MingW/AboutDlg.o" "Objects/MingW/AddToDoFrm.o" "Objects/MingW/CFGData.o" "Objects/MingW/ColorEditDlg.o" "Objects/MingW/Compiler.o" "Objects/MingW/CompilerFunctions.o" "Objects/MingW/CustomComponents.o" "Objects/MingW/DelphiSub.o" "Objects/MingW/DevCfg.o" "Objects/MingW/devcppApp.o" "Objects/MingW/devFileMonitor.o" "Objects/MingW/devFileMonitorThread.o" "Objects/MingW/DevResource.o" "Objects/MingW/DevTheme.o" "Objects/MingW/Editor.o" "Objects/MingW/EditorOptfrm.o" "Objects/MingW/ELDsgnr.o" "Objects/MingW/EnviroFrm.o" "Objects/MingW/FileAssocs.o" "Objects/MingW/FilePropertiesfrm.o" "Objects/MingW/GotoLineFrm.o" "Objects/MingW/LangFrm.o" "Objects/MingW/Macros.o" "Objects/MingW/MainFrm.o" "Objects/MingW/MultiLangSupport.o" "Objects/MingW/NewProjectFrm.o" "Objects/MingW/oysUtils.o" "Objects/MingW/PrjTypes.o" "Objects/MingW/Project.o" "Objects/MingW/SearchCenter.o" "Objects/MingW/SplashFrm.o" "Objects/MingW/Template.o" "Objects/MingW/ToolEditForm.o" "Objects/MingW/ToolEditFrm.o" "Objects/MingW/ToolFrm.o" "Objects/MingW/Utils.o" "Objects/MingW/WebUpdateDlg.o" "Objects/MingW/CompileProgressForm.o" Objects/MingW/DevCpp_private.res
-LIBS = -L"H:/TDM-MinGW32/lib" -L"H:/wxWidgets-2.9.3/lib/gcc_lib" -mwindows -l$(WXLIBNAME) -l$(WXLIBNAME)_gl -lwxscintilla -lwxtiff -lwxjpeg -lwxpng -lwxzlib -lwxregexu -lwxexpat -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 -lopengl32
-INCS = -I"C:/Program Files/Dev-Cpp/Include"
-CXXINCS = -I"H:/TDM-MinGW32/include" -I"H:/wxWidgets-2.9.3/include"
-RCINCS = --include-dir "H:/WXWIDG~1.3/include"
+LIBS = -L"C:/Program Files (x86)/Dev-Cpp/lib/wx/gcc_lib" -L"C:/Program Files (x86)/Dev-Cpp/lib" -L"C:/Program Files (x86)/Dev-Cpp/MinGW32/lib" -mwindows -l$(WXLIBNAME) -l$(WXLIBNAME)_gl -lwxscintilla -lwxtiff -lwxjpeg -lwxpng -lwxzlib -lwxregexu -lwxexpat -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 -lopengl32
+INCS = -I"C:/Program Files (x86)/Dev-Cpp/MinGW32/include"
+CXXINCS = -I"C:/Program Files (x86)/Dev-Cpp/MinGW32/include" -I"C:/Program Files (x86)/Dev-Cpp/include/common"
+RCINCS = --include-dir "C:/PROGRA~2/Dev-Cpp/include/common"
BIN = Output/MingW/DevCpp.exe
DEFINES = -D__WXMSW__ -D__GNUWIN32__ -DwxUSE_UNICODE
CXXFLAGS = $(CXXINCS) $(DEFINES) -fexpensive-optimizations -O3
CFLAGS = $(INCS) $(DEFINES) -fexpensive-optimizations -O3
GPROF = gprof.exe
-RM = rm -f
+ifeq ($(OS),Windows_NT)
+ RM = del /Q
+ FixPath = $(subst /,\,$1)
+else
+ RM = rm -f
+ FixPath = $1
+endif
LINK = g++.exe
.PHONY: all all-before all-after clean clean-custom
all: all-before $(BIN) all-after
clean: clean-custom
- $(RM) $(LINKOBJ) "$(BIN)"
+ $(RM) $(call FixPath,$(LINKOBJ)) "$(call FixPath,$(BIN))"
$(BIN): $(OBJ)
$(LINK) $(LINKOBJ) -o "$(BIN)" $(LIBS)
Modified: trunk/wxdevide/source/devMonitorTypes.h
===================================================================
--- trunk/wxdevide/source/devMonitorTypes.h 2012-01-09 18:17:44 UTC (rev 21)
+++ trunk/wxdevide/source/devMonitorTypes.h 2012-02-26 18:53:31 UTC (rev 22)
@@ -28,7 +28,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-typedef enum TdevMonitorChangeType { mctChanged, mctDeleted };
+enum TdevMonitorChangeType { mctChanged, mctDeleted };
//typedef void (*TdevMonitorChange)(TObject Sender, TdevMonitorChangeType ChangeType, std::string Filename) /* of class: object *//*?*/;
#endif//DEV_MONITOR_TYPES_H
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ni...@us...> - 2008-10-23 16:46:30
|
Revision: 13
http://wxdevide.svn.sourceforge.net/wxdevide/?rev=13&view=rev
Author: ninjanl
Date: 2008-10-23 16:46:26 +0000 (Thu, 23 Oct 2008)
Log Message:
-----------
AboutDlg altered to be sizer based. Doesn't look too shabby if I do say so myself. Will continue to alter dialogs so that they are all sizer based.
Modified Paths:
--------------
trunk/wxdevide/source/AboutDlg.cpp
trunk/wxdevide/source/AboutDlg.h
trunk/wxdevide/source/AboutDlg.wxform
Modified: trunk/wxdevide/source/AboutDlg.cpp
===================================================================
--- trunk/wxdevide/source/AboutDlg.cpp 2008-10-07 18:02:56 UTC (rev 12)
+++ trunk/wxdevide/source/AboutDlg.cpp 2008-10-23 16:46:26 UTC (rev 13)
@@ -1,5 +1,5 @@
//---------------------------------------------------------------------------
-// // $Id$
+// $Id$
// Name: AboutDlg.cpp
// Author: Sof.T
// Created: 23/01/2007 22:21:49
@@ -37,453 +37,565 @@
END_EVENT_TABLE()
////Event Table End
-AboutDlg::AboutDlg(wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &position, const wxSize& size, long style)
-: wxDialog(parent, id, title, position, size, style)
+AboutDlg::AboutDlg( wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &position, const wxSize& size, long style )
+ : wxDialog( parent, id, title, position, size, style )
{
CreateGUIControls();
}
AboutDlg::~AboutDlg()
{
-}
+}
void AboutDlg::CreateGUIControls()
{
//Do not add custom code between
- //GUI Items Creation Start and GUI Items Creation End.
+ //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
+ WxBoxSizer1 = new wxBoxSizer(wxVERTICAL);
+ this->SetSizer(WxBoxSizer1);
+ this->SetAutoLayout(true);
+
wxBitmap ImgBanner_BITMAP(AboutDlg_ImgBanner_XPM);
ImgBanner = new wxStaticBitmap(this, ID_IMGBANNER, ImgBanner_BITMAP, wxDefaultPosition, wxDefaultSize);
ImgBanner->Enable(false);
ImgBanner->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
+ WxBoxSizer1->Add(ImgBanner,0,wxALIGN_TOP | wxALL,5);
NbkContainer = new wxNotebook(this, ID_NBKCONTAINER, wxDefaultPosition, wxDefaultSize, wxNB_DEFAULT);
NbkContainer->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
+ WxBoxSizer1->Add(NbkContainer,0,wxEXPAND | wxALL,5);
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"));
+ WxBoxSizer3 = new wxBoxSizer(wxVERTICAL);
+ NpgVersion->SetSizer(WxBoxSizer3);
+ NpgVersion->SetAutoLayout(true);
+
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")));
+ LblDevCppCopyright->SetFont(wxFont(7, wxSWISS, wxNORMAL, wxBOLD, false, _("MS Sans Serif")));
+ WxBoxSizer3->Add(LblDevCppCopyright,0,0 | wxALL,5);
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")));
+ LblwxDevCppCopyright->SetFont(wxFont(7, wxSWISS, wxNORMAL, wxBOLD, false, _("MS Sans Serif")));
+ WxBoxSizer3->Add(LblwxDevCppCopyright,0,wxALIGN_LEFT | wxALL,5);
+ WxFlexGridSizer1 = new wxFlexGridSizer(0, 2, 0, 0);
+ WxBoxSizer3->Add(WxFlexGridSizer1, 0, wxALIGN_CENTER | wxALL, 5);
+
LblwxdevcppWebsite = new wxStaticText(NpgVersion, ID_LBLWXDEVCPPWEBSITE, _("wxDev-C++ Website:"), wxDefaultPosition, wxDefaultSize, 0, _("LblwxdevcppWebsite"));
LblwxdevcppWebsite->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
+ WxFlexGridSizer1->Add(LblwxdevcppWebsite,0,wxALIGN_LEFT | wxALL,5);
+ 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(7, wxSWISS, wxNORMAL, wxNORMAL, true, _("MS Sans Serif")));
+ WxFlexGridSizer1->Add(HlkwxdevcppWebsite,0,wxALIGN_LEFT | wxALL,5);
+
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")));
+ WxFlexGridSizer1->Add(LblForum,0,wxALIGN_LEFT | wxALL,5);
+ 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(7, wxSWISS, wxNORMAL, wxNORMAL, true, _("MS Sans Serif")));
+ WxFlexGridSizer1->Add(HlkForumSite,0,wxALIGN_CENTER | wxALL,5);
+
LblwxWeb = new wxStaticText(NpgVersion, ID_LBLWXWEB, _("wxWidget Site"), wxDefaultPosition, wxDefaultSize, 0, _("LblwxWeb"));
LblwxWeb->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
+ WxFlexGridSizer1->Add(LblwxWeb,0,wxALIGN_LEFT | wxALL,5);
+ 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(7, wxSWISS, wxNORMAL, wxNORMAL, true, _("MS Sans Serif")));
+ WxFlexGridSizer1->Add(HlkwxWebsite,0,wxALIGN_LEFT | wxALL,5);
+
LblBook = new wxStaticText(NpgVersion, ID_LBLBOOK, _("wxDev-C++ Book :"), wxDefaultPosition, wxDefaultSize, 0, _("LblBook"));
LblBook->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, false, _("MS Sans Serif")));
+ WxFlexGridSizer1->Add(LblBook,0,0 | wxALL,5);
- 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, _("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"), wxDefaultPosition, wxDefaultSize, wxNO_BORDER | wxHL_CONTEXTMENU, _("HlkForumSite"));
- HlkForumSite->SetNormalColour(*wxBLUE);
- HlkForumSite->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxNORMAL, true, _("MS Sans Serif")));
-
- 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, _("MS Sans Serif")));
-
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, _("MS Sans Serif")));
+ HlkBook->SetFont(wxFont(7, wxSWISS, wxNORMAL, wxNORMAL, true, _("MS Sans Serif")));
+ WxFlexGridSizer1->Add(HlkBook,0,wxALIGN_LEFT | wxALL,5);
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, _(" 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"));
+ WxBoxSizer4 = new wxBoxSizer(wxHORIZONTAL);
+ NpgLicense->SetSizer(WxBoxSizer4);
+ NpgLicense->SetAutoLayout(true);
+
+ 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\r\nthis license 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\r\nfreedom to share and change it. By contrast, the GNU General\r\nPublic License is intended to guarantee your freedom to share\r\nand change free software--to make sure the software is free for\r\nall its users. This General Public License applies to most of the\r\nFree Software Foundation's software and to any other program\r\nwhose authors commit to using it. (Some other Free Software\r\nFoundation 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\r\nprice. Our General Public Licenses are designed to make sure\r\nthat you have the freedom to distribute copies of free software\r\n(and charge for this service if you wish), that you receive source\r\ncode or can get it if you want it, that you can change the\r\nsoftware or use pieces of it in new free programs; and that you\r\nknow you can do these things.\r\n\r\nTo protect your rights, we need to make restrictions that forbid\r\nanyone to deny you these rights or to ask you to surrender the\r\nrights. These restrictions translate to certain responsibilities for\r\nyou if you distribute copies of the software, or if you modify it.\r\n\r\nFor example, if you distribute copies of such a program, whether\r\ngratis or for a fee, you must give the recipients all the rights that\r\nyou have. You must make sure that they, too, receive or can get\r\nthe source code. And you must show them these terms so they\r\nknow their rights.\r\n\r\nWe protect your rights with two steps: (1) copyright the\r\nsoftware, and (2) offer you this license which gives you legal\r\npermission to copy, distribute and/or modify the software.\r\n\r\nAlso, for each author's protection and ours, we want to make\r\ncertain that everyone understands that there is no warranty for\r\nthis free software. If the software is modified by someone else\r\nand passed on, we want its recipients to know that what they\r\nhave is not the original, so that any problems introduced by\r\nothers will not reflect on the original authors' reputations.\r\n\r\nFinally, any free program is threatened constantly by software\r\npatents. We wish to avoid the danger that redistributors of a\r\nfree program will individually obtain patent licenses, in effect\r\nmaking the program proprietary. To prevent this, we have made\r\nit clear that any patent must be licensed for everyone's free use\r\nor 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 \r\nAND \r\nMODIFICATION\r\n\r\n 0. This License applies to any program or other work which\r\ncontains a notice placed by the copyright holder saying it may\r\nbe distributed under the terms of this General Public License.\r\nThe \"Program\", below, refers to any such program or work,\r\nand a \"work based on the Program\" means either the Program\r\nor any derivative work under copyright law: that is to say, a work\r\ncontaining the Program or a portion of it, either verbatim or with\r\nmodifications and/or translated into another language.\r\n(Hereinafter, translation is included without limitation in the\r\nterm \"modification\".) Each licensee is addressed as \"you\".\r\n\r\nActivities other than copying, distribution and modification are\r\nnot covered by this License; they are outside its scope. The\r\nact of running the Program is not restricted, and the output\r\nfrom the Program is covered only if its contents constitute a\r\nwork based on the Program (independent of having been made\r\nby running the Program). Whether that is true depends on what\r\nthe Program does.\r\n\r\n 1. You may copy and distribute verbatim copies of the\r\nProgram's source code as you receive it, in any medium,\r\nprovided that you conspicuously and appropriately publish\r\non each copy an appropriate copyright notice and disclaimer\r\nof warranty; keep intact all the notices that refer to this License\r\nand to the absence of any warranty; and give any other\r\nrecipients of the Program a copy of this License along with\r\nthe Program.\r\n\r\nYou may charge a fee for the physical act of transferring a copy,\r\nand you may at your option offer warranty protection in\r\nexchange for a fee.\r\n\r\n 2. You may modify your copy or copies of the Program or any\r\nportion of it, thus forming a work based on the Program, and\r\ncopy and distribute such modifications or work under the terms\r\nof Section 1 above, provided that you also meet all of these\r\nconditions:\r\n\r\n a) You must cause the modified files to carry prominent\r\n notices stating that you changed the files and the date\r\n of any change.\r\n\r\n b) You must cause any work that you distribute or publish,\r\n that in whole or in part contains or is derived from the\r\n Program or any part thereof, to be licensed as a whole at\r\n no charge to all third parties under the terms of this Lic...
[truncated message content] |