All occurances of #include <wx/wxprec.h> changed to #include "wx/wxprec.h"

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-30 13:33:34 +00:00 · 2001-10-30 13:33:34 +00:00 · 92a19c2e77
commit 92a19c2e77
parent 3a7bfa067e
59 changed files with 650 additions and 87 deletions
--- a/contrib/samples/applet/applet.cpp
+++ b/contrib/samples/applet/applet.cpp
@ -27,7 +27,7 @@
 ****************************************************************************/

 // For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 #ifdef __BORLANDC__
    #pragma hdrstop
 #endif
--- a/contrib/samples/applet/combobox.cpp
+++ b/contrib/samples/applet/combobox.cpp
@ -28,7 +28,7 @@
 ****************************************************************************/

 // For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 #ifdef __BORLANDC__
    #pragma hdrstop
 #endif
--- a/contrib/samples/ogl/ogledit/doc.cpp
+++ b/contrib/samples/ogl/ogledit/doc.cpp
@ -14,7 +14,7 @@
 #endif

 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/samples/ogl/ogledit/ogledit.cpp
+++ b/contrib/samples/ogl/ogledit/ogledit.cpp
@ -14,7 +14,7 @@
 #endif

 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/samples/ogl/ogledit/palette.cpp
+++ b/contrib/samples/ogl/ogledit/palette.cpp
@ -14,7 +14,7 @@
 #endif

 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/samples/ogl/ogledit/view.cpp
+++ b/contrib/samples/ogl/ogledit/view.cpp
@ -14,7 +14,7 @@
 #endif

 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/samples/ogl/studio/cspalette.cpp
+++ b/contrib/samples/ogl/studio/cspalette.cpp
@ -14,7 +14,7 @@
 #endif

 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/samples/ogl/studio/csprint.cpp
+++ b/contrib/samples/ogl/studio/csprint.cpp
@ -14,7 +14,7 @@
 #endif

 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/samples/ogl/studio/dialogs.cpp
+++ b/contrib/samples/ogl/studio/dialogs.cpp
@ -14,7 +14,7 @@
 #endif

 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/samples/ogl/studio/doc.cpp
+++ b/contrib/samples/ogl/studio/doc.cpp
@ -14,7 +14,7 @@
 #endif

 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/samples/ogl/studio/shapes.cpp
+++ b/contrib/samples/ogl/studio/shapes.cpp
@ -14,7 +14,7 @@
 #endif

 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/samples/ogl/studio/symbols.cpp
+++ b/contrib/samples/ogl/studio/symbols.cpp
@ -14,7 +14,7 @@
 #endif

 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/samples/ogl/studio/view.cpp
+++ b/contrib/samples/ogl/studio/view.cpp
@ -14,7 +14,7 @@
 #endif

 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/src/mmedia/g711.cpp
+++ b/contrib/src/mmedia/g711.cpp
@ -24,7 +24,7 @@
 * Mountain View, California  94043
 */

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 /*
 * g711.c
--- a/contrib/src/mmedia/g721.cpp
+++ b/contrib/src/mmedia/g721.cpp
@ -24,7 +24,7 @@
 * Mountain View, California  94043
 */

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 /*
 * g721.c
--- a/contrib/src/mmedia/g723_24.cpp
+++ b/contrib/src/mmedia/g723_24.cpp
@ -37,7 +37,7 @@
 * of workstation attributes, such as hardware 2's complement arithmetic.
 *
 */
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 #include "wx/mmedia/internal/g72x.h"

 /*
--- a/contrib/src/mmedia/g723_40.cpp
+++ b/contrib/src/mmedia/g723_40.cpp
@ -45,7 +45,7 @@
 * the name of the module which it is implementing.
 *
 */
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 #include "wx/mmedia/internal/g72x.h"

 /*
--- a/contrib/src/mmedia/g72x.cpp
+++ b/contrib/src/mmedia/g72x.cpp
@ -30,7 +30,7 @@
 * Common routines for G.721 and G.723 conversions.
 */

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 #include <stdlib.h>
 #include "wx/mmedia/internal/g72x.h"

--- a/contrib/src/mmedia/sndbase.cpp
+++ b/contrib/src/mmedia/sndbase.cpp
@ -9,7 +9,7 @@
 #pragma implementation "sndbase.cpp"
 #endif

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifndef WX_PRECOMP
 #include "wx/defs.h"
--- a/contrib/src/mmedia/sndfile.cpp
+++ b/contrib/src/mmedia/sndfile.cpp
@ -5,7 +5,7 @@
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999, 2000
 // CVSID: $Id$
 // --------------------------------------------------------------------------
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifndef WX_PRECOMP
 #include <wx/defs.h>
--- a/contrib/src/mmedia/sndg72x.cpp
+++ b/contrib/src/mmedia/sndg72x.cpp
@ -9,7 +9,7 @@
 #pragma implementation "sndg72x.cpp"
 #endif

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifndef WX_PRECOMP
    #include "wx/defs.h"
--- a/contrib/src/mmedia/sndmsad.cpp
+++ b/contrib/src/mmedia/sndmsad.cpp
@ -9,7 +9,7 @@
 #pragma implementation "sndmsad.cpp"
 #endif

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifndef WX_PRECOMP
  #include "wx/defs.h"
--- a/contrib/src/mmedia/sndpcm.cpp
+++ b/contrib/src/mmedia/sndpcm.cpp
@ -9,7 +9,7 @@
 #pragma implementation "sndpcm.cpp"
 #endif

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifndef WX_PRECOMP
    #include "wx/defs.h"
--- a/contrib/src/mmedia/sndwav.cpp
+++ b/contrib/src/mmedia/sndwav.cpp
@ -9,7 +9,7 @@
 #pragma implementation "sndwav.cpp"
 #endif

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifndef WX_PRECOMP
    #include "wx/defs.h"
--- a/contrib/src/mmedia/vidbase.cpp
+++ b/contrib/src/mmedia/vidbase.cpp
@ -11,7 +11,7 @@
 #pragma implementation "vidbase.h"
 #endif

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifndef WX_PRECOMP
 #include <wx/stream.h>
--- a/contrib/src/mmedia/vidxanm.cpp
+++ b/contrib/src/mmedia/vidxanm.cpp
@ -12,7 +12,7 @@
 #pragma implementation "vidxanm.h"
 #endif

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifndef WX_PRECOMP
 #include <wx/wx.h>
--- a/contrib/src/ogl/basic.cpp
+++ b/contrib/src/ogl/basic.cpp
@ -14,7 +14,7 @@
 #endif

 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/src/ogl/basic2.cpp
+++ b/contrib/src/ogl/basic2.cpp
@ -14,7 +14,7 @@
 #endif

 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/src/ogl/bmpshape.cpp
+++ b/contrib/src/ogl/bmpshape.cpp
@ -14,7 +14,7 @@
 #endif

 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/src/ogl/canvas.cpp
+++ b/contrib/src/ogl/canvas.cpp
@ -14,7 +14,7 @@
 #endif

 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/src/ogl/composit.cpp
+++ b/contrib/src/ogl/composit.cpp
@ -14,7 +14,7 @@
 #endif

 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/src/ogl/constrnt.cpp
+++ b/contrib/src/ogl/constrnt.cpp
@ -14,7 +14,7 @@
 #endif

 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/src/ogl/divided.cpp
+++ b/contrib/src/ogl/divided.cpp
@ -14,7 +14,7 @@
 #endif

 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/src/ogl/drawn.cpp
+++ b/contrib/src/ogl/drawn.cpp
@ -15,7 +15,7 @@
 #endif

 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/src/ogl/lines.cpp
+++ b/contrib/src/ogl/lines.cpp
@ -15,7 +15,7 @@
 #endif

 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/src/ogl/mfutils.cpp
+++ b/contrib/src/ogl/mfutils.cpp
@ -14,7 +14,7 @@
 #endif

 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/src/ogl/misc.cpp
+++ b/contrib/src/ogl/misc.cpp
@ -14,7 +14,7 @@
 #endif

 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/src/ogl/ogldiag.cpp
+++ b/contrib/src/ogl/ogldiag.cpp
@ -14,7 +14,7 @@
 #endif

 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/src/ogl/oglmisc.cpp
+++ b/contrib/src/ogl/oglmisc.cpp
@ -14,7 +14,7 @@
 #endif

 // For compilers that support precompilation, includes "wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/utils/convertrc/convert.cpp
+++ b/contrib/utils/convertrc/convert.cpp
@ -11,7 +11,7 @@
 #endif

 // For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/contrib/utils/convertrc/rc2wxr.cpp
+++ b/contrib/utils/convertrc/rc2wxr.cpp
--- a/contrib/utils/convertrc/rc2xml.cpp
+++ b/contrib/utils/convertrc/rc2xml.cpp
@ -21,7 +21,7 @@ cross platform (wxGTK,etc)
 #endif

 // For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
@ -68,11 +68,16 @@ bool rc2xml::Convert(wxString rcfile, wxString xmlfile)
    m_rc.Open(rcfile.c_str());
    m_filesize=m_rc.Length();
    
+
    m_workingpath=wxPathOnly(rcfile);
+
    m_targetpath=wxPathOnly(xmlfile)+"\\";

+
+
    wxSetWorkingDirectory(m_workingpath);

+
    bool result;
    result=m_xmlfile.Open(xmlfile.c_str(),"w+t");
    wxASSERT_MSG(result,"Couldn't create XML file");	
@ -1029,7 +1034,9 @@ wxString rc2xml::CleanName(wxString name)
    name.Replace("idr_","");
    name.Replace("idb_","");
    name.Replace("idc_","");
+
    name.Replace(".ico","");
+
    name.Replace(".bmp","");
    return name;
 }
@ -1184,6 +1191,7 @@ void rc2xml::WriteBitmap(wxString bitmapname)
    
    wxString *bitmappath;
    bitmappath=(wxString *)node->Data();
+
    bitmapname=wxFileNameFromPath(*bitmappath);
    wxBitmap bitmap;
    if (!bitmap.LoadFile(*bitmappath,wxBITMAP_TYPE_BMP ))
--- a/samples/caret/caret.cpp
+++ b/samples/caret/caret.cpp
@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////

 // For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
    #pragma hdrstop
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////

 // For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
    #pragma hdrstop
--- a/samples/html/about/about.cpp
+++ b/samples/html/about/about.cpp
@ -9,7 +9,7 @@
 #endif

 // For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
    #pragma hdrstop
--- a/samples/html/help/help.cpp
+++ b/samples/html/help/help.cpp
@ -10,7 +10,7 @@
 #endif

 // For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
    #pragma hdrstop
--- a/samples/html/helpview/helpview.cpp
+++ b/samples/html/helpview/helpview.cpp
@ -10,7 +10,7 @@
 #endif

 // For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/samples/html/printing/printing.cpp
+++ b/samples/html/printing/printing.cpp
@ -5,7 +5,7 @@


 // For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #pragma hdrstop
--- a/samples/html/test/test.cpp
+++ b/samples/html/test/test.cpp
@ -9,7 +9,7 @@
 #endif

 // For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
    #pragma hdrstop
--- a/samples/html/virtual/virtual.cpp
+++ b/samples/html/virtual/virtual.cpp
@ -10,7 +10,7 @@
 #endif

 // For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
    #pragma hdrstop
--- a/samples/html/widget/widget.cpp
+++ b/samples/html/widget/widget.cpp
@ -10,7 +10,7 @@
 #endif

 // For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
    #pragma hdrstop
--- a/samples/html/zip/zip.cpp
+++ b/samples/html/zip/zip.cpp
@ -9,7 +9,7 @@
 #endif

 // For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
    #pragma hdrstop
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------

 // For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
    #pragma hdrstop
--- a/samples/richedit/wxLayout.cpp
+++ b/samples/richedit/wxLayout.cpp
@ -11,7 +11,7 @@
 #pragma implementation "wxLayout.h"
 #endif

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 #ifdef __BORLANDC__
 #  pragma hdrstop
 #endif
--- a/samples/richedit/wxllist.cpp
+++ b/samples/richedit/wxllist.cpp
@ -25,7 +25,7 @@
 #   pragma implementation "wxllist.h"
 #endif

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #  pragma hdrstop
--- a/samples/richedit/wxlparser.cpp
+++ b/samples/richedit/wxlparser.cpp
@ -10,7 +10,7 @@
 #   pragma implementation "wxlparser.h"
 #endif

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #  pragma hdrstop
--- a/samples/richedit/wxlwindow.cpp
+++ b/samples/richedit/wxlwindow.cpp
@ -18,7 +18,7 @@
 #   pragma implementation "wxlwindow.h"
 #endif

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
 #  pragma hdrstop
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------

 // For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
    #pragma hdrstop
--- a/utils/Install/builder/wxib.cpp
+++ b/utils/Install/builder/wxib.cpp
@ -16,7 +16,7 @@
 // ----------------------------------------------------------------------------

 // For compilers that support precompilation, includes "wx/wx.h".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 #ifdef __BORLANDC__
    #pragma hdrstop