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
This commit is contained in:
George Tasker
2001-10-30 13:33:34 +00:00
parent 3a7bfa067e
commit 92a19c2e77
59 changed files with 650 additions and 87 deletions

View File

@@ -27,7 +27,7 @@
****************************************************************************/ ****************************************************************************/
// For compilers that support precompilation, includes "wx/wx.h". // For compilers that support precompilation, includes "wx/wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop
#endif #endif

View File

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

View File

@@ -14,7 +14,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -14,7 +14,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -14,7 +14,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -14,7 +14,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -14,7 +14,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -14,7 +14,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -14,7 +14,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -14,7 +14,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -14,7 +14,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -14,7 +14,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -14,7 +14,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -24,7 +24,7 @@
* Mountain View, California 94043 * Mountain View, California 94043
*/ */
#include <wx/wxprec.h> #include "wx/wxprec.h"
/* /*
* g711.c * g711.c

View File

@@ -24,7 +24,7 @@
* Mountain View, California 94043 * Mountain View, California 94043
*/ */
#include <wx/wxprec.h> #include "wx/wxprec.h"
/* /*
* g721.c * g721.c

View File

@@ -37,7 +37,7 @@
* of workstation attributes, such as hardware 2's complement arithmetic. * of workstation attributes, such as hardware 2's complement arithmetic.
* *
*/ */
#include <wx/wxprec.h> #include "wx/wxprec.h"
#include "wx/mmedia/internal/g72x.h" #include "wx/mmedia/internal/g72x.h"
/* /*

View File

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

View File

@@ -30,7 +30,7 @@
* Common routines for G.721 and G.723 conversions. * Common routines for G.721 and G.723 conversions.
*/ */
#include <wx/wxprec.h> #include "wx/wxprec.h"
#include <stdlib.h> #include <stdlib.h>
#include "wx/mmedia/internal/g72x.h" #include "wx/mmedia/internal/g72x.h"

View File

@@ -9,7 +9,7 @@
#pragma implementation "sndbase.cpp" #pragma implementation "sndbase.cpp"
#endif #endif
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/defs.h" #include "wx/defs.h"

View File

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

View File

@@ -9,7 +9,7 @@
#pragma implementation "sndg72x.cpp" #pragma implementation "sndg72x.cpp"
#endif #endif
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/defs.h" #include "wx/defs.h"

View File

@@ -9,7 +9,7 @@
#pragma implementation "sndmsad.cpp" #pragma implementation "sndmsad.cpp"
#endif #endif
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/defs.h" #include "wx/defs.h"

View File

@@ -9,7 +9,7 @@
#pragma implementation "sndpcm.cpp" #pragma implementation "sndpcm.cpp"
#endif #endif
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/defs.h" #include "wx/defs.h"

View File

@@ -9,7 +9,7 @@
#pragma implementation "sndwav.cpp" #pragma implementation "sndwav.cpp"
#endif #endif
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/defs.h" #include "wx/defs.h"

View File

@@ -11,7 +11,7 @@
#pragma implementation "vidbase.h" #pragma implementation "vidbase.h"
#endif #endif
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include <wx/stream.h> #include <wx/stream.h>

View File

@@ -12,7 +12,7 @@
#pragma implementation "vidxanm.h" #pragma implementation "vidxanm.h"
#endif #endif
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include <wx/wx.h> #include <wx/wx.h>

View File

@@ -14,7 +14,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -14,7 +14,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -14,7 +14,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -14,7 +14,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -14,7 +14,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -14,7 +14,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -14,7 +14,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -15,7 +15,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -15,7 +15,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -14,7 +14,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -14,7 +14,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -14,7 +14,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -14,7 +14,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -11,7 +11,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx/wx.h". // For compilers that support precompilation, includes "wx/wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

File diff suppressed because it is too large Load Diff

View File

@@ -21,7 +21,7 @@ cross platform (wxGTK,etc)
#endif #endif
// For compilers that support precompilation, includes "wx/wx.h". // For compilers that support precompilation, includes "wx/wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop
@@ -68,11 +68,16 @@ bool rc2xml::Convert(wxString rcfile, wxString xmlfile)
m_rc.Open(rcfile.c_str()); m_rc.Open(rcfile.c_str());
m_filesize=m_rc.Length(); m_filesize=m_rc.Length();
m_workingpath=wxPathOnly(rcfile); m_workingpath=wxPathOnly(rcfile);
m_targetpath=wxPathOnly(xmlfile)+"\\"; m_targetpath=wxPathOnly(xmlfile)+"\\";
wxSetWorkingDirectory(m_workingpath); wxSetWorkingDirectory(m_workingpath);
bool result; bool result;
result=m_xmlfile.Open(xmlfile.c_str(),"w+t"); result=m_xmlfile.Open(xmlfile.c_str(),"w+t");
wxASSERT_MSG(result,"Couldn't create XML file"); wxASSERT_MSG(result,"Couldn't create XML file");
@@ -1029,7 +1034,9 @@ wxString rc2xml::CleanName(wxString name)
name.Replace("idr_",""); name.Replace("idr_","");
name.Replace("idb_",""); name.Replace("idb_","");
name.Replace("idc_",""); name.Replace("idc_","");
name.Replace(".ico",""); name.Replace(".ico","");
name.Replace(".bmp",""); name.Replace(".bmp","");
return name; return name;
} }
@@ -1184,6 +1191,7 @@ void rc2xml::WriteBitmap(wxString bitmapname)
wxString *bitmappath; wxString *bitmappath;
bitmappath=(wxString *)node->Data(); bitmappath=(wxString *)node->Data();
bitmapname=wxFileNameFromPath(*bitmappath); bitmapname=wxFileNameFromPath(*bitmappath);
wxBitmap bitmap; wxBitmap bitmap;
if (!bitmap.LoadFile(*bitmappath,wxBITMAP_TYPE_BMP )) if (!bitmap.LoadFile(*bitmappath,wxBITMAP_TYPE_BMP ))

View File

@@ -10,7 +10,7 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx/wx.h". // For compilers that support precompilation, includes "wx/wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -10,7 +10,7 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx/wx.h". // For compilers that support precompilation, includes "wx/wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -9,7 +9,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx/wx.h". // For compilers that support precompilation, includes "wx/wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -10,7 +10,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx/wx.h". // For compilers that support precompilation, includes "wx/wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -10,7 +10,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx/wx.h". // For compilers that support precompilation, includes "wx/wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -5,7 +5,7 @@
// For compilers that support precompilation, includes "wx/wx.h". // For compilers that support precompilation, includes "wx/wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -9,7 +9,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx/wx.h". // For compilers that support precompilation, includes "wx/wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -10,7 +10,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx/wx.h". // For compilers that support precompilation, includes "wx/wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -10,7 +10,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx/wx.h". // For compilers that support precompilation, includes "wx/wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -9,7 +9,7 @@
#endif #endif
// For compilers that support precompilation, includes "wx/wx.h". // For compilers that support precompilation, includes "wx/wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -18,7 +18,7 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx/wx.h". // For compilers that support precompilation, includes "wx/wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -11,7 +11,7 @@
#pragma implementation "wxLayout.h" #pragma implementation "wxLayout.h"
#endif #endif
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
# pragma hdrstop # pragma hdrstop
#endif #endif

View File

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

View File

@@ -10,7 +10,7 @@
# pragma implementation "wxlparser.h" # pragma implementation "wxlparser.h"
#endif #endif
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
# pragma hdrstop # pragma hdrstop

View File

@@ -18,7 +18,7 @@
# pragma implementation "wxlwindow.h" # pragma implementation "wxlwindow.h"
#endif #endif
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
# pragma hdrstop # pragma hdrstop

View File

@@ -18,7 +18,7 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx/wx.h". // For compilers that support precompilation, includes "wx/wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop

View File

@@ -16,7 +16,7 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx/wx.h". // For compilers that support precompilation, includes "wx/wx.h".
#include <wx/wxprec.h> #include "wx/wxprec.h"
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop