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

diff --git a/contrib/samples/applet/applet.cpp b/contrib/samples/applet/applet.cpp
index 7046f7c5dbd2a85dc985fe288a69227d277de194..16fb1fb66c463a62914303e0024abeca5d89404c 100644 (file)
--- 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".
 ****************************************************************************/
 
 // For compilers that support precompilation, includes "wx/wx.h".

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

 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif

diff --git a/contrib/samples/applet/combobox.cpp b/contrib/samples/applet/combobox.cpp
index b7dcac51cc45ce6f9ce6d9839f226449c4e822a6..4214c41c0f9e11ddf4fbe570e10fc06502630d4e 100644 (file)
--- 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".
 ****************************************************************************/
 
 // For compilers that support precompilation, includes "wx/wx.h".

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

 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif

diff --git a/contrib/samples/ogl/ogledit/doc.cpp b/contrib/samples/ogl/ogledit/doc.cpp
index 25dae364c80af3d5e1e04f25c31ac16e05b7f829..017f34f8687e2fd0e3768e5d54fe8e32dba43803 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/samples/ogl/ogledit/ogledit.cpp b/contrib/samples/ogl/ogledit/ogledit.cpp
index 87f19e6e857143d5bddb83195e3a7ffc79981860..905b42f30d76864b88b835ac6b06e121e4f567a5 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/samples/ogl/ogledit/palette.cpp b/contrib/samples/ogl/ogledit/palette.cpp
index 84348c598240c31e3b156760b8f3f8558c53cd52..5df3af51e39837800bf8efe9f5636f1acf988ca0 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/samples/ogl/ogledit/view.cpp b/contrib/samples/ogl/ogledit/view.cpp
index 1784068187db10905611bd06b365ec34cbc8b792..2b5e571684f13ae9089ef2b918b9abe6758741c6 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/samples/ogl/studio/cspalette.cpp b/contrib/samples/ogl/studio/cspalette.cpp
index 6d18c070ab14ab428ffa899d78e473383bac1555..27eedbe400a7ae39cdb879f419a41253f1ed8723 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/samples/ogl/studio/csprint.cpp b/contrib/samples/ogl/studio/csprint.cpp
index 6bf5dad26e801da01548d1d8dde49656e4096cbf..3b2b1499f6024a69342f10868306b2882af9b252 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/samples/ogl/studio/dialogs.cpp b/contrib/samples/ogl/studio/dialogs.cpp
index 9fef6d120f3904674f6cb136657b8e4fc611f067..62b0ca2edd31b1113c9b2489f3123bdfdbe9a8f4 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/samples/ogl/studio/doc.cpp b/contrib/samples/ogl/studio/doc.cpp
index ea8cb82eb7448f5edad78b36ceb82a259d076ef9..bfedc4071e31b5b62052775f97b3b656d2c460d8 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/samples/ogl/studio/shapes.cpp b/contrib/samples/ogl/studio/shapes.cpp
index 7bf02edb5ceda6bad53aa9fc0b600aba03385359..84177d13318327c60e7e17a40200f96374b34db2 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/samples/ogl/studio/symbols.cpp b/contrib/samples/ogl/studio/symbols.cpp
index 9b0ab16f6b4b7e9dbdbd9fad6433566cfc497752..b96fb6931722bb1f83dd6dd3b79a542af90cac06 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/samples/ogl/studio/view.cpp b/contrib/samples/ogl/studio/view.cpp
index 6a66902f5acaef9c7e55dc63bde0d592c9654c59..f24da9d60cc40a4fbeaa85930eac3879cc80f266 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/src/mmedia/g711.cpp b/contrib/src/mmedia/g711.cpp
index 99fb3cafc0b90e75788ebce396f201e5046bcaaf..42c3abb639dbe930df0f9334f3202f1b18604725 100644 (file)
--- a/contrib/src/mmedia/g711.cpp
+++ b/contrib/src/mmedia/g711.cpp
@@ -24,7 +24,7 @@
  * Mountain View, California  94043
  */
 
  * Mountain View, California  94043
  */
 

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

 
 /*
  * g711.c
 
 /*
  * g711.c

diff --git a/contrib/src/mmedia/g721.cpp b/contrib/src/mmedia/g721.cpp
index 60b8f1c5ff3d85b27c6a64df2321a165f595a489..bfc561a7a6272eb09279851f0d2bd2cbcb1d855b 100644 (file)
--- a/contrib/src/mmedia/g721.cpp
+++ b/contrib/src/mmedia/g721.cpp
@@ -24,7 +24,7 @@
  * Mountain View, California  94043
  */
 
  * Mountain View, California  94043
  */
 

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

 
 /*
  * g721.c
 
 /*
  * g721.c

diff --git a/contrib/src/mmedia/g723_24.cpp b/contrib/src/mmedia/g723_24.cpp
index fe581c3de839914aa295bb9da5fae1a2308ff986..f17b1d676aac7fe1dcabee4641aab0ddfa57a4cc 100644 (file)
--- 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.
  *
  */
  * 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"
 
 /*

diff --git a/contrib/src/mmedia/g723_40.cpp b/contrib/src/mmedia/g723_40.cpp
index e736a5c24996154ba80266ea32ccb9f6314880b6..9a71969c633b67b120a38164d38f8e595509abc4 100644 (file)
--- 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.
  *
  */
  * 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"
 
 /*

diff --git a/contrib/src/mmedia/g72x.cpp b/contrib/src/mmedia/g72x.cpp
index d4e0740634b4441fd8b27c8e820c722f50fe0a61..c6f2a016c20228dc5494b3d480b0340f2e0baf94 100644 (file)
--- 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.
  */
 
  * 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"
 
 #include <stdlib.h>
 #include "wx/mmedia/internal/g72x.h"
 

diff --git a/contrib/src/mmedia/sndbase.cpp b/contrib/src/mmedia/sndbase.cpp
index ccd9882652c245b7bd89327b8071d9ab9ca03980..e331e0edce22ce51a22b5399484980d3bdd2990c 100644 (file)
--- a/contrib/src/mmedia/sndbase.cpp
+++ b/contrib/src/mmedia/sndbase.cpp
@@ -9,7 +9,7 @@
 #pragma implementation "sndbase.cpp"
 #endif
 
 #pragma implementation "sndbase.cpp"
 #endif
 

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

 
 #ifndef WX_PRECOMP
 #include "wx/defs.h"
 
 #ifndef WX_PRECOMP
 #include "wx/defs.h"

diff --git a/contrib/src/mmedia/sndfile.cpp b/contrib/src/mmedia/sndfile.cpp
index 48677ec1134cfb43237817c5abceb60f177d43a2..54e333b6c8e7283e602d6e00f9dc90fd5117cb74 100644 (file)
--- 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$
 // --------------------------------------------------------------------------
 // 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>
 
 #ifndef WX_PRECOMP
 #include <wx/defs.h>

diff --git a/contrib/src/mmedia/sndg72x.cpp b/contrib/src/mmedia/sndg72x.cpp
index 91245524b92684ebeddb10227546dae78825f80e..f9ce3ca8109448298897fbe1354b4fcddfc5f01f 100644 (file)
--- a/contrib/src/mmedia/sndg72x.cpp
+++ b/contrib/src/mmedia/sndg72x.cpp
@@ -9,7 +9,7 @@
 #pragma implementation "sndg72x.cpp"
 #endif
 
 #pragma implementation "sndg72x.cpp"
 #endif
 

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

 
 #ifndef WX_PRECOMP
     #include "wx/defs.h"
 
 #ifndef WX_PRECOMP
     #include "wx/defs.h"

diff --git a/contrib/src/mmedia/sndmsad.cpp b/contrib/src/mmedia/sndmsad.cpp
index 81068016fcb006fd3228308b15ebfe5b79b86906..6024e8e4c173b429d38738e3c86ac20f5a76d5ab 100644 (file)
--- a/contrib/src/mmedia/sndmsad.cpp
+++ b/contrib/src/mmedia/sndmsad.cpp
@@ -9,7 +9,7 @@
 #pragma implementation "sndmsad.cpp"
 #endif
 
 #pragma implementation "sndmsad.cpp"
 #endif
 

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

 
 #ifndef WX_PRECOMP
   #include "wx/defs.h"
 
 #ifndef WX_PRECOMP
   #include "wx/defs.h"

diff --git a/contrib/src/mmedia/sndpcm.cpp b/contrib/src/mmedia/sndpcm.cpp
index 0c1bc67a3c768962ab4b09084f34ed4668c740c7..a6a5a700801434eb079bc0230e8cf26d331ebfb1 100644 (file)
--- a/contrib/src/mmedia/sndpcm.cpp
+++ b/contrib/src/mmedia/sndpcm.cpp
@@ -9,7 +9,7 @@
 #pragma implementation "sndpcm.cpp"
 #endif
 
 #pragma implementation "sndpcm.cpp"
 #endif
 

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

 
 #ifndef WX_PRECOMP
     #include "wx/defs.h"
 
 #ifndef WX_PRECOMP
     #include "wx/defs.h"

diff --git a/contrib/src/mmedia/sndwav.cpp b/contrib/src/mmedia/sndwav.cpp
index 267f5a40905fb26d96ec99cd7597cac5ad7bb4aa..a9712d818939f778ed7470d4e0f555b2052d12eb 100644 (file)
--- a/contrib/src/mmedia/sndwav.cpp
+++ b/contrib/src/mmedia/sndwav.cpp
@@ -9,7 +9,7 @@
 #pragma implementation "sndwav.cpp"
 #endif
 
 #pragma implementation "sndwav.cpp"
 #endif
 

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

 
 #ifndef WX_PRECOMP
     #include "wx/defs.h"
 
 #ifndef WX_PRECOMP
     #include "wx/defs.h"

diff --git a/contrib/src/mmedia/vidbase.cpp b/contrib/src/mmedia/vidbase.cpp
index 1cd5a0632c2aff2501d927ecae438d8b152c6ee9..b3c8ac9195e946092204d7c9fcc482b903b49c7a 100644 (file)
--- a/contrib/src/mmedia/vidbase.cpp
+++ b/contrib/src/mmedia/vidbase.cpp
@@ -11,7 +11,7 @@
 #pragma implementation "vidbase.h"
 #endif
 
 #pragma implementation "vidbase.h"
 #endif
 

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

 
 #ifndef WX_PRECOMP
 #include <wx/stream.h>
 
 #ifndef WX_PRECOMP
 #include <wx/stream.h>

diff --git a/contrib/src/mmedia/vidxanm.cpp b/contrib/src/mmedia/vidxanm.cpp
index 60a45d87d4db48ba990f993705c7540c01aff8ec..9da2da3403d103e1418e2a37f7c8b7e5035b91c0 100644 (file)
--- a/contrib/src/mmedia/vidxanm.cpp
+++ b/contrib/src/mmedia/vidxanm.cpp
@@ -12,7 +12,7 @@
 #pragma implementation "vidxanm.h"
 #endif
 
 #pragma implementation "vidxanm.h"
 #endif
 

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

 
 #ifndef WX_PRECOMP
 #include <wx/wx.h>
 
 #ifndef WX_PRECOMP
 #include <wx/wx.h>

diff --git a/contrib/src/ogl/basic.cpp b/contrib/src/ogl/basic.cpp
index 0a85bbb517a4ea9f0129764b456ebbc8d2b6218e..f5bdab84e5a1b484e2789b5392c4a3563a92f3e2 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/src/ogl/basic2.cpp b/contrib/src/ogl/basic2.cpp
index 1cac6443a640eb67fbd2be674a40195c43a9ff7a..f329aa565496626cb4711a5aecf654cc27940ff2 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/src/ogl/bmpshape.cpp b/contrib/src/ogl/bmpshape.cpp
index fc6218e2347522a4e103a1683ae8e79b72ae14e0..10b17485170650f28b432806d32c63c82dec1445 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/src/ogl/canvas.cpp b/contrib/src/ogl/canvas.cpp
index e05066d4029f247c3796d4af920f5f92aa6b59a5..ac81c3d692a05a3589fe70292e6c09d38d903a30 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/src/ogl/composit.cpp b/contrib/src/ogl/composit.cpp
index 6dbc6190a7a4c712d63c5fbc9789bf6c1cefaec6..fd88350efc33e162893905f825e6c1c243d3122d 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/src/ogl/constrnt.cpp b/contrib/src/ogl/constrnt.cpp
index ed2562b2ab344c4048770bfac52f0d5277074ed2..c2addad443874a557f9a61c44af97b7499e1aea2 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/src/ogl/divided.cpp b/contrib/src/ogl/divided.cpp
index 8f6667731575bdc3255ad85305a840e6c8e308aa..16cbc34878f169f0c36515e96ad86b3d45c0d5a4 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/src/ogl/drawn.cpp b/contrib/src/ogl/drawn.cpp
index b4105372948ed9284871a50894c9b24cb0a1ba3c..67aa63f3fd90f9236316135e3683f7bb5fe538f7 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/src/ogl/lines.cpp b/contrib/src/ogl/lines.cpp
index fb7322ab3e72deb538f9706de59479609f9b45cd..60365d3a2dbdd1825b4a78bdb3ec1e405284706f 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/src/ogl/mfutils.cpp b/contrib/src/ogl/mfutils.cpp
index b2684836a161bc4030b4f9c26074f540773bda61..d64f41a2d425f29846811bc804b3ce0e31de228c 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/src/ogl/misc.cpp b/contrib/src/ogl/misc.cpp
index 169fc2c484451e8c41d7c798a9f83175e3eb6cf4..a9a466c2da6d7315d93c6d82ff9e788cab75416d 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/src/ogl/ogldiag.cpp b/contrib/src/ogl/ogldiag.cpp
index 4d7e36843ca053c8c7055c8e7bdac59edf87f85c..f6731b8400e0e24391587ea429b2cf771527f5bc 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/src/ogl/oglmisc.cpp b/contrib/src/ogl/oglmisc.cpp
index 169fc2c484451e8c41d7c798a9f83175e3eb6cf4..a9a466c2da6d7315d93c6d82ff9e788cab75416d 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/utils/convertrc/convert.cpp b/contrib/utils/convertrc/convert.cpp
index c4871d112c4291781e658c87dbe95cce0718ddfb..3368af3eb9ebe7d634f92ca778a33c09ee112913 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/contrib/utils/convertrc/rc2wxr.cpp b/contrib/utils/convertrc/rc2wxr.cpp
index 4d141c7edd273e49e83c3c7570f152dea5364870..30a0262a6c01efb375069de4295a23ac8ffcbe3d 100644 (file)
--- a/contrib/utils/convertrc/rc2wxr.cpp
+++ b/contrib/utils/convertrc/rc2wxr.cpp
@@ -1,555 +1,1110 @@
 // rc2wxr.cpp: implementation of the rc2wxr class.
 // rc2wxr.cpp: implementation of the rc2wxr class.

+

 //
 //

+

 //////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////

+

 //Author:  Brian Gavin 9/24/00
 //Author:  Brian Gavin 9/24/00

+

 //License: wxWindows License
 //License: wxWindows License

+

 /*
 /*

+

 WARNING- I know this code has some bugs to work out but
 WARNING- I know this code has some bugs to work out but

+

 I don't plan to fix them since I feel that wxr files will
 I don't plan to fix them since I feel that wxr files will

+

 not be used much longer.
 not be used much longer.

+

 This code was used as a starting point for my rc2xml converter
 This code was used as a starting point for my rc2xml converter

+

 */
 */

+

 #ifdef __GNUG__
 #ifdef __GNUG__

+

 #pragma implementation "rc2wxr.cpp"
 #pragma implementation "rc2wxr.cpp"

+

 #pragma interface "rc2wxr.cpp"
 #pragma interface "rc2wxr.cpp"

+

 #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

+

 #endif
 
 #endif
 

+
+

 // for all others, include the necessary headers (this file is usually all you
 // for all others, include the necessary headers (this file is usually all you

+

 // need because it includes almost all "standard" wxWindows headers
 // need because it includes almost all "standard" wxWindows headers

+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+

 #include <wx/wx.h>
 #include <wx/wx.h>

+

 #endif
 
 
 #endif
 
 

+
+
+

 #include "rc2wxr.h"
 #include "rc2wxr.h"

+

 #include "wx/image.h"
 #include "wx/image.h"

+

 #include "wx/resource.h"
 #include "wx/resource.h"

+

 //////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////

+

 // Construction/Destruction
 // Construction/Destruction

+

 //////////////////////////////////////////////////////////////////////
 
 //////////////////////////////////////////////////////////////////////
 

+
+

 rc2wxr::rc2wxr()
 rc2wxr::rc2wxr()

+

 {
 {

+

 m_done=FALSE;
 m_done=FALSE;

+

 m_controlid=6000;
 m_controlid=6000;

+

 }
 
 }
 

+
+

 rc2wxr::~rc2wxr()
 rc2wxr::~rc2wxr()

+

 {
 
 {
 

+
+

 }
 
 }
 

+
+

 void rc2wxr::Convert(wxString wxrfile, wxString rcfile)
 void rc2wxr::Convert(wxString wxrfile, wxString rcfile)

+

 {
 {

+

 m_rc.Open(rcfile);
 m_rc.Open(rcfile);

+

 m_filesize=m_rc.Length();
 m_filesize=m_rc.Length();

+

 if( (m_wxr  = fopen( wxrfile, "wt" )) == NULL )
 if( (m_wxr  = fopen( wxrfile, "wt" )) == NULL )

+

 {
 {

+

   return;
   return;

+

 }
 
 
 }
 
 

+
+
+

 wxString tok,prevtok;
 
 
 wxString tok,prevtok;
 
 

+
+
+

 while (!m_done)
 while (!m_done)

+

 {
 
 {
 

+
+

 tok=GetToken();
 
 tok=GetToken();
 

+
+

 if (tok=="DIALOG")
 if (tok=="DIALOG")

+

 {
 {

+

 ParseDialog(prevtok);
 ParseDialog(prevtok);

+

 }
 }

+

        
 
        
 

+
+

 if (tok=="MENU")
 if (tok=="MENU")

+

 {
 {

+

 ParseMenu(prevtok);
 ParseMenu(prevtok);

+

 }      
 
 }      
 

+
+

 prevtok=tok;
 prevtok=tok;

+

 }
 
 }
 

+
+

 fclose(m_wxr);
 fclose(m_wxr);

+

 //fclose(m_rc);  
 //fclose(m_rc);  

+

 m_rc.Close();
 
 m_rc.Close();
 

+
+

 }
 
 
 }
 
 

+
+
+

 /*
 /*

+

 Example .rc 
 Example .rc 

+

 Microsoft style as of v5.0
 Microsoft style as of v5.0

+

 IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 217, 55
 IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 217, 55

+

 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU

+

 CAPTION "About Funimator"
 CAPTION "About Funimator"

+

 FONT 8, "MS Sans Serif"
 
 FONT 8, "MS Sans Serif"
 

+
+

   Borland 4.5 style rc
   Borland 4.5 style rc

+

 IDD_DIBATTR DIALOG 7, 16, 172, 119
 IDD_DIBATTR DIALOG 7, 16, 172, 119

+

 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

+

 CAPTION "DIB Attributes"
 CAPTION "DIB Attributes"

+

 FONT 8, "MS Sans Serif"
 FONT 8, "MS Sans Serif"

+

 {
 {

+

  DEFPUSHBUTTON "Ok", IDOK, 114, 8, 50, 14
  DEFPUSHBUTTON "Ok", IDOK, 114, 8, 50, 14

+

  PUSHBUTTON "Cancel", IDCANCEL, 114, 28, 50, 14
 
 
 
  PUSHBUTTON "Cancel", IDCANCEL, 114, 28, 50, 14
 
 
 

+
+
+
+

 */
 */

+

 void rc2wxr::ParseDialog(wxString dlgname)
 void rc2wxr::ParseDialog(wxString dlgname)

+

 {
 {

+

 wxString tok;
 wxString tok;

+

 static int dlgid=999;
 static int dlgid=999;

+

 dlgid++;
 dlgid++;

+

 /* Make sure that this really is a dialog 
 /* Make sure that this really is a dialog 

+

 microsoft reuses the keyword DIALOG for other things
 microsoft reuses the keyword DIALOG for other things

+

 */
 */

+

 tok=PeekToken();
 tok=PeekToken();

+

 //Microsoft notation?
 //Microsoft notation?

+

 if (tok=="DISCARDABLE")
 if (tok=="DISCARDABLE")

+

 {
 {

+

 tok=GetToken();
 tok=GetToken();

+

 tok=PeekToken();
 tok=PeekToken();

+

 }
 }

+

 //This isn't a Dialog resource eject eject
 //This isn't a Dialog resource eject eject

+

 if (!tok.IsNumber())
 if (!tok.IsNumber())

+

     return;
     return;

+

 //Generate Dialog text
 //Generate Dialog text

+

 fprintf(m_wxr,"static char *dialog%i = \"dialog(name = '%s',\\\n",dlgid,dlgname);
 fprintf(m_wxr,"static char *dialog%i = \"dialog(name = '%s',\\\n",dlgid,dlgname);

+

 //be lazy about style for now. add it later
 //be lazy about style for now. add it later

+

 fprintf(m_wxr,"style = 'wxRAISED_BORDER | wxCAPTION | wxTHICK_FRAME | wxSYSTEM_MENU',\\\n");
 
 fprintf(m_wxr,"style = 'wxRAISED_BORDER | wxCAPTION | wxTHICK_FRAME | wxSYSTEM_MENU',\\\n");
 

+
+

 fprintf(m_wxr,"id = %i,\\\n",dlgid);
 
 fprintf(m_wxr,"id = %i,\\\n",dlgid);
 

+
+

 //Record x,y,width,height
 //Record x,y,width,height

+

 int x,y,width,height;
 int x,y,width,height;

+

 ReadRect(x,y,width,height);
 ReadRect(x,y,width,height);

+

 fprintf(m_wxr,"x = %i, y = %i, width = %i, height = %i,\\\n",x,y,width,height);
 
 
 fprintf(m_wxr,"x = %i, y = %i, width = %i, height = %i,\\\n",x,y,width,height);
 
 

+
+
+

 //CAPTION "About Funimator"
 //CAPTION "About Funimator"

+

 //Get Title
 //Get Title

+

 tok=GetToken();
 tok=GetToken();

+

 wxString title;
 
 wxString title;
 

+
+

 while ((tok!="BEGIN")&(tok!="{"))
 while ((tok!="BEGIN")&(tok!="{"))

+

 {
 {

+

 if (tok=="CAPTION")
 if (tok=="CAPTION")

+

 {
 {

+

 title=GetQuoteField();
 title=GetQuoteField();

+

 fprintf(m_wxr,"title = '%s',\\\n",title);
 fprintf(m_wxr,"title = '%s',\\\n",title);

+

 }
 }

+

 tok=GetToken();
 tok=GetToken();

+

 }
 }

+

 fprintf(m_wxr,"use_dialog_units = 1,\\\n");
 fprintf(m_wxr,"use_dialog_units = 1,\\\n");

+

 fprintf(m_wxr,"use_system_defaults = 0,\\\n");
 
 fprintf(m_wxr,"use_system_defaults = 0,\\\n");
 

+
+

 fprintf(m_wxr,"font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\\\n");
 fprintf(m_wxr,"font = [8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif'],\\\n");

+

 ParseControls();
 ParseControls();

+

 fprintf(m_wxr,").\";\n\n");
 fprintf(m_wxr,").\";\n\n");

+

 }
 
 }
 

+
+

 /*
 /*

+

 BEGIN
 
 
 
 BEGIN
 
 
 

+
+
+
+

     EDITTEXT        IDC_BANDS,36,83,22,14,ES_AUTOHSCROLL | ES_NUMBER | NOT 
     EDITTEXT        IDC_BANDS,36,83,22,14,ES_AUTOHSCROLL | ES_NUMBER | NOT 

+

                     WS_TABSTOP
                     WS_TABSTOP

+

     LTEXT           "Bands",IDC_STATIC,11,86,21,8
     LTEXT           "Bands",IDC_STATIC,11,86,21,8

+

     EDITTEXT        IDC_NAME,10,3,75,14,ES_AUTOHSCROLL
     EDITTEXT        IDC_NAME,10,3,75,14,ES_AUTOHSCROLL

+

 END
 END

+

 */
 */

+

 void rc2wxr::ParseControls()
 void rc2wxr::ParseControls()

+

 {
 {

+

 wxString tok;
 
 wxString tok;
 

+
+

 tok=GetToken();
 tok=GetToken();

+

 while ((tok!="END")&(tok!="}"))
 while ((tok!="END")&(tok!="}"))

+

 {
 {

+

 if (tok=="LTEXT")
 if (tok=="LTEXT")

+

     ParseStaticText();
     ParseStaticText();

+

 if (tok=="EDITTEXT")
 if (tok=="EDITTEXT")

+

     ParseTextCtrl();
     ParseTextCtrl();

+

 if (tok=="PUSHBUTTON")
 if (tok=="PUSHBUTTON")

+

     ParsePushButton();
     ParsePushButton();

+

 if (tok=="DEFPUSHBUTTON")
 if (tok=="DEFPUSHBUTTON")

+

     ParsePushButton();
     ParsePushButton();

+

 if (tok=="GROUPBOX")
 if (tok=="GROUPBOX")

+

     ParseGroupBox();
     ParseGroupBox();

+

 if (tok=="COMBOBOX")
 if (tok=="COMBOBOX")

+

     ParseComboBox();
     ParseComboBox();

+

 if (tok=="CONTROL")
 if (tok=="CONTROL")

+

     ParseControlMS();
 
     ParseControlMS();
 

+
+

 tok=GetToken();
 tok=GetToken();

+

 }
 
 }
 

+
+

 }
 }

+

 //LTEXT           "Radius",IDC_STATIC,9,67,23,8
 //LTEXT           "Radius",IDC_STATIC,9,67,23,8

+

 void rc2wxr::ParseStaticText()
 void rc2wxr::ParseStaticText()

+

 {
 {

+

 wxString tok;
 wxString tok;

+

 wxString phrase,varname;
 wxString phrase,varname;

+

 phrase=GetQuoteField();
 phrase=GetQuoteField();

+

 varname=GetToken();
 varname=GetToken();

+

 m_controlid++;
 m_controlid++;

+

 int x,y,width,height;
 int x,y,width,height;

+

 ReadRect(x,y,width,height);
 ReadRect(x,y,width,height);

+

 fprintf(m_wxr,"  control = [%i,wxStaticText,'%s','0','%s',",m_controlid,phrase,varname);
 fprintf(m_wxr,"  control = [%i,wxStaticText,'%s','0','%s',",m_controlid,phrase,varname);

+

 fprintf(m_wxr,"%i,%i,%i,%i,'',\\\n",x,y,width,height);
 fprintf(m_wxr,"%i,%i,%i,%i,'',\\\n",x,y,width,height);

+

 fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n");
 fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n");

+

 }
 }

+

 //EDITTEXT        IDC_RADIUS,36,65,40,14,ES_AUTOHSCROLL
 //EDITTEXT        IDC_RADIUS,36,65,40,14,ES_AUTOHSCROLL

+

 void rc2wxr::ParseTextCtrl()
 void rc2wxr::ParseTextCtrl()

+

 {
 {

+

 wxString tok;
 wxString tok;

+

 wxString varname;
 wxString varname;

+

 varname=GetToken();
 varname=GetToken();

+

 m_controlid++;
 m_controlid++;

+

 int x,y,width,height;
 int x,y,width,height;

+

 ReadRect(x,y,width,height);
 ReadRect(x,y,width,height);

+

 fprintf(m_wxr,"  control = [%i,wxTextCtrl,'','0','%s',",m_controlid,varname);
 fprintf(m_wxr,"  control = [%i,wxTextCtrl,'','0','%s',",m_controlid,varname);

+

 fprintf(m_wxr,"%i,%i,%i,%i,'',\\\n",x,y,width,height);
 fprintf(m_wxr,"%i,%i,%i,%i,'',\\\n",x,y,width,height);

+

 fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n");
 
 fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n");
 

+
+

 }
 }

+

 //PUSHBUTTON      "Create/Update",IDC_CREATE,15,25,53,13,NOT WS_TABSTOP
 //PUSHBUTTON      "Create/Update",IDC_CREATE,15,25,53,13,NOT WS_TABSTOP

+

 void rc2wxr::ParsePushButton()
 void rc2wxr::ParsePushButton()

+

 {
 {

+

 wxString tok;
 wxString tok;

+

 wxString phrase,varname;
 wxString phrase,varname;

+

 phrase=GetQuoteField();
 phrase=GetQuoteField();

+

 varname=GetToken();
 varname=GetToken();

+

 int c;
 int c;

+

 m_controlid++;
 m_controlid++;

+

 c=m_controlid;
 c=m_controlid;

+

 if (varname=="IDOK")
 if (varname=="IDOK")

+

 c=wxID_OK;
 
 c=wxID_OK;
 

+
+

 if (varname=="IDCANCEL")
 if (varname=="IDCANCEL")

+

 c=wxID_CANCEL;
 
 c=wxID_CANCEL;
 

+
+

 if (varname=="IDAPPLY")
 if (varname=="IDAPPLY")

+

 c=wxID_APPLY;
 
 c=wxID_APPLY;
 

+
+

 int x,y,width,height;
 int x,y,width,height;

+

 ReadRect(x,y,width,height);
 ReadRect(x,y,width,height);

+

 fprintf(m_wxr,"  control = [%i,wxButton,'%s','0','%s',",c,phrase,varname);
 fprintf(m_wxr,"  control = [%i,wxButton,'%s','0','%s',",c,phrase,varname);

+

 fprintf(m_wxr,"%i,%i,%i,%i,'',\\\n",x,y,width,height);
 fprintf(m_wxr,"%i,%i,%i,%i,'',\\\n",x,y,width,height);

+

 fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n");
 
 fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n");
 

+
+

 }
 
 
 }
 
 

+
+
+

 bool rc2wxr::Seperator(int ch)
 bool rc2wxr::Seperator(int ch)

+

 {
 {

+

 if ((ch==' ')|(ch==',')|(ch==13)|(ch==10)|(ch=='|'))
 if ((ch==' ')|(ch==',')|(ch==13)|(ch==10)|(ch=='|'))

+

    return TRUE;
 
    return TRUE;
 

+
+

 if (ch==EOF)
 if (ch==EOF)

+

 {
 {

+

 m_done=TRUE;
 m_done=TRUE;

+

 return TRUE;
 return TRUE;

+

 }
 }

+

 return FALSE;
 return FALSE;

+

 }
 
 }
 

+
+

 void rc2wxr::ParseGroupBox()
 void rc2wxr::ParseGroupBox()

+

 {
 {

+

 //    GROUPBOX        "Rotate",IDC_STATIC,1,1,71,79
 //    GROUPBOX        "Rotate",IDC_STATIC,1,1,71,79

+

 wxString tok;
 wxString tok;

+

 wxString phrase,varname;
 wxString phrase,varname;

+

 phrase=GetQuoteField();
 phrase=GetQuoteField();

+

 varname=GetToken();
 varname=GetToken();

+

 m_controlid++;
 m_controlid++;

+

 int x,y,width,height;
 int x,y,width,height;

+

 ReadRect(x,y,width,height);
 ReadRect(x,y,width,height);

+

 fprintf(m_wxr,"  control = [%i,wxStaticBox,'%s','0','%s',",m_controlid,phrase,varname);
 fprintf(m_wxr,"  control = [%i,wxStaticBox,'%s','0','%s',",m_controlid,phrase,varname);

+

 fprintf(m_wxr,"%i,%i,%i,%i,'',\\\n",x,y,width,height);
 fprintf(m_wxr,"%i,%i,%i,%i,'',\\\n",x,y,width,height);

+

 fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n");
 
 
 fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n");
 
 

+
+
+

 }
 
 }
 

+
+

 void rc2wxr::ReadRect(int & x, int & y, int & width, int & height)
 void rc2wxr::ReadRect(int & x, int & y, int & width, int & height)

+

 {
 {

+

 x=atoi(GetToken());
 x=atoi(GetToken());

+

 y=atoi(GetToken());
 y=atoi(GetToken());

+

 width=atoi(GetToken());
 width=atoi(GetToken());

+

 height=atoi(GetToken());
 
 height=atoi(GetToken());
 

+
+

 }
 
 }
 

+
+

 wxString rc2wxr::GetToken()
 wxString rc2wxr::GetToken()

+

 {
 {

+

 wxString tok="";
 
 wxString tok="";
 

+
+

 if (m_rc.Eof())
 if (m_rc.Eof())

+

 {
 {

+

 m_done=TRUE;
 m_done=TRUE;

+

 return tok;
 return tok;

+

 }
 
 }
 

+
+

 int ch=0;
 int ch=0;

+

 ReadChar(ch);
 ReadChar(ch);

+

 if (ch==EOF)
 if (ch==EOF)

+

 {
 {

+

 m_done=TRUE;
 m_done=TRUE;

+

 return tok;
 return tok;

+

 }
 
 }
 

+
+

 while (Seperator(ch))
 while (Seperator(ch))

+

 {
 {

+

   ReadChar(ch);
   ReadChar(ch);

+

   if (m_done)
   if (m_done)

+

   return tok;
   return tok;

+

 }
 
 }
 

+
+

 if (ch==EOF)
 if (ch==EOF)

+

 {
 {

+

 m_done=TRUE;
 
 m_done=TRUE;
 

+
+

 }
 }

+

   
 
   
 

+
+

 while (!Seperator(ch))
 while (!Seperator(ch))

+

 {
 {

+

 tok+=(char)ch;
 tok+=(char)ch;

+

 ReadChar(ch);
 
 ReadChar(ch);
 

+
+

 }
 
 }
 

+
+

 if (ch==EOF)
 if (ch==EOF)

+

    m_done=TRUE;
 
 
    m_done=TRUE;
 
 

+
+
+

 return tok;
 return tok;

+

 }
 
 }
 

+
+

 wxString rc2wxr::GetQuoteField()
 wxString rc2wxr::GetQuoteField()

+

 {
 {

+

 wxString phrase;
 wxString phrase;

+

 //ASCII code 34 "
 //ASCII code 34 "

+

 int ch=0;
 int ch=0;

+

 ReadChar(ch);
 
 ReadChar(ch);
 

+
+

 while (ch!=34)
 while (ch!=34)

+

   ReadChar(ch);
   ReadChar(ch);

+

   
   

+

   ReadChar(ch);
 
   ReadChar(ch);
 

+
+

 while (ch!=34)
 while (ch!=34)

+

 {
 {

+

   phrase+=(char)ch;
   phrase+=(char)ch;

+

   ReadChar(ch);
   ReadChar(ch);

+

 }
 }

+

 return phrase;
 return phrase;

+

 }
 
 }
 

+
+

 void rc2wxr::ReadChar(int &ch)
 void rc2wxr::ReadChar(int &ch)

+

 {
 {

+

        int result;
        int result;

+

 result=m_rc.Tell();
 
 result=m_rc.Tell();
 

+
+

 if((result>=m_filesize))
 if((result>=m_filesize))

+

     m_done=TRUE;
 
     m_done=TRUE;
 

+
+

 result=m_rc.Read(&ch,1);
 
 result=m_rc.Read(&ch,1);
 

+
+

 if((result==-1))
 if((result==-1))

+

    m_done=TRUE;
 
    m_done=TRUE;
 

+
+

 if(ch==EOF)
 if(ch==EOF)

+

    m_done=TRUE;
    m_done=TRUE;

+

 }
 
 }
 

+
+

 void rc2wxr::ParseComboBox()
 void rc2wxr::ParseComboBox()

+

 {
 {

+

 /* COMBOBOX        IDC_SCALECOMBO,10,110,48,52,CBS_DROPDOWNLIST | CBS_SORT | 
 /* COMBOBOX        IDC_SCALECOMBO,10,110,48,52,CBS_DROPDOWNLIST | CBS_SORT | 

+

                     WS_VSCROLL | WS_TABSTOP */
                     WS_VSCROLL | WS_TABSTOP */

+

 wxString tok;
 wxString tok;

+

 wxString varname;
 wxString varname;

+

 varname=GetToken();
 varname=GetToken();

+

 m_controlid++;
 m_controlid++;

+

 int x,y,width,height;
 int x,y,width,height;

+

 ReadRect(x,y,width,height);
 
 ReadRect(x,y,width,height);
 

+
+

 fprintf(m_wxr,"  control = [%i,wxChoice,'','0','%s',",m_controlid,varname);
 fprintf(m_wxr,"  control = [%i,wxChoice,'','0','%s',",m_controlid,varname);

+

 fprintf(m_wxr,"%i,%i,%i,%i,[],\\\n",x,y,width,height);
 fprintf(m_wxr,"%i,%i,%i,%i,[],\\\n",x,y,width,height);

+

 fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n");
 
 
 fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n");
 
 

+
+
+

 }
 
 }
 

+
+

 void rc2wxr::ParseMenu(wxString name)
 void rc2wxr::ParseMenu(wxString name)

+

 {
 {

+

 wxString tok="";
 wxString tok="";

+

 static int menuid=0;
 static int menuid=0;

+

 menuid++;
 menuid++;

+

 fprintf(m_wxr,"static char *MenuBar%i = \"menu(name = '%s',\\\n",menuid,name);  
 fprintf(m_wxr,"static char *MenuBar%i = \"menu(name = '%s',\\\n",menuid,name);  

+

 fprintf(m_wxr,"menu = \\\n");
 fprintf(m_wxr,"menu = \\\n");

+

 fprintf(m_wxr,"[\\\n");
 
 fprintf(m_wxr,"[\\\n");
 

+
+

 while ((tok!="BEGIN")&(tok!="{"))
 while ((tok!="BEGIN")&(tok!="{"))

+

    tok=GetToken();
 
    tok=GetToken();
 

+
+

 while ((tok!="END")&(tok!="}"))
 while ((tok!="END")&(tok!="}"))

+

 {
 {

+

    tok=GetToken();
    tok=GetToken();

+

 if (tok=="POPUP")
 if (tok=="POPUP")

+

        {
        {

+

     ParsePopupMenu();
     ParsePopupMenu();

+

        fprintf(m_wxr,"  ],\\\n");
        fprintf(m_wxr,"  ],\\\n");

+

        }
        }

+

 }
 
 }
 

+
+

 fprintf(m_wxr,"]).\";\n\n");
 fprintf(m_wxr,"]).\";\n\n");

+

 }
 
 }
 

+
+

 void rc2wxr::ParsePopupMenu()
 void rc2wxr::ParsePopupMenu()

+

 {
 {

+

 static int menuitem=99;
 static int menuitem=99;

+

 menuitem++;
 
 menuitem++;
 

+
+

 wxString tok;
 wxString tok;

+

 tok=GetQuoteField();
 tok=GetQuoteField();

+

 int spot;
 int spot;

+

 //Remove /t because it causes problems
 //Remove /t because it causes problems

+

 spot=tok.First("\\t");
 spot=tok.First("\\t");

+

 tok=tok.Left(spot);
 tok=tok.Left(spot);

+

 fprintf(m_wxr,"  ['%s',%i,'',\\\n",tok,menuitem);
 fprintf(m_wxr,"  ['%s',%i,'',\\\n",tok,menuitem);

+

 while ((tok!="BEGIN")&(tok!="{"))
 while ((tok!="BEGIN")&(tok!="{"))

+

    tok=GetToken();
 
    tok=GetToken();
 

+
+

 while ((tok!="END")&(tok!="}"))
 while ((tok!="END")&(tok!="}"))

+

 {
 {

+

    tok=GetToken();
    tok=GetToken();

+

 if (tok=="MENUITEM")
 if (tok=="MENUITEM")

+

 {
 {

+

 if (PeekToken()=="SEPARATOR")
 if (PeekToken()=="SEPARATOR")

+

 fprintf(m_wxr,"      [],\\\n");
 fprintf(m_wxr,"      [],\\\n");

+

 else
 else

+

 {
 {

+

 tok=GetQuoteField();
 tok=GetQuoteField();

+

 //Remove /t because it causes problems
 //Remove /t because it causes problems

+

 spot=tok.First("\\t");
 spot=tok.First("\\t");

+

 tok=tok.Left(spot);
 tok=tok.Left(spot);

+

 menuitem++;
 menuitem++;

+

 fprintf(m_wxr,"      ['%s',%i,''],\\\n",tok,menuitem);
 fprintf(m_wxr,"      ['%s',%i,''],\\\n",tok,menuitem);

+

 }
 }

+

 }
 
 }
 

+
+

 }
 
 }
 

+
+

     
     

+

 }
 
 }
 

+
+

 wxString rc2wxr::PeekToken()
 wxString rc2wxr::PeekToken()

+

 {
 {

+

 wxString tok;
 wxString tok;

+

 int p;
 int p;

+

 p=m_rc.Tell();
 p=m_rc.Tell();

+

 tok=GetToken();
 
 tok=GetToken();
 

+
+

 m_rc.Seek(p);
 m_rc.Seek(p);

+

 return tok;
 return tok;

+

 }
 }

+

 //Windows pain in the butt CONTROL
 //Windows pain in the butt CONTROL

+

 void rc2wxr::ParseControlMS()
 void rc2wxr::ParseControlMS()

+

 {
 {

+

 wxString label,varname,kindctrl,tok;
 wxString label,varname,kindctrl,tok;

+

 label=GetQuoteField();
 label=GetQuoteField();

+

 varname=GetToken();
 varname=GetToken();

+

 kindctrl=GetQuoteField();
 kindctrl=GetQuoteField();

+

 kindctrl.MakeUpper();
 
 
 kindctrl.MakeUpper();
 
 

+
+
+

 if (kindctrl=="MSCTLS_TRACKBAR32")
 if (kindctrl=="MSCTLS_TRACKBAR32")

+

    ParseSlider(label,varname);
    ParseSlider(label,varname);

+

 if (kindctrl=="MSCTLS_PROGRESS32")
 if (kindctrl=="MSCTLS_PROGRESS32")

+

    ParseProgressBar(label,varname);
    ParseProgressBar(label,varname);

+

 if (kindctrl=="BUTTON")
 if (kindctrl=="BUTTON")

+

    ParseCtrlButton(label,varname);
    ParseCtrlButton(label,varname);

+

 }
 }

+

 /*    CONTROL         "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH | 
 /*    CONTROL         "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH | 

+

                     TBS_NOTICKS | WS_TABSTOP,52,73,100,15
                     TBS_NOTICKS | WS_TABSTOP,52,73,100,15

+

 */
 
 */
 

+
+

 void rc2wxr::ParseSlider(wxString label, wxString varname)
 void rc2wxr::ParseSlider(wxString label, wxString varname)

+

 {
 {

+

 wxString tok;
 wxString tok;

+

 while (ReadOrs(tok));
 while (ReadOrs(tok));

+

 fprintf(m_wxr,"  control = [%i,wxSlider,'','wxSL_HORIZONTAL','%s',",m_controlid,varname);  
 fprintf(m_wxr,"  control = [%i,wxSlider,'','wxSL_HORIZONTAL','%s',",m_controlid,varname);  

+

 int x,y,width,height;
 int x,y,width,height;

+

 ReadRect(x,y,width,height);
 ReadRect(x,y,width,height);

+

 fprintf(m_wxr,"%i,%i,%i,%i,",x,y,width,height);
 fprintf(m_wxr,"%i,%i,%i,%i,",x,y,width,height);

+

 fprintf(m_wxr," 1, 1, 10,\\\n");
 fprintf(m_wxr," 1, 1, 10,\\\n");

+

 fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n");
 fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n");

+

 }
 }

+

 /*    
 /*    

+

 CONTROL         "Progress1",CG_IDC_PROGDLG_PROGRESS,"msctls_progress32",
 CONTROL         "Progress1",CG_IDC_PROGDLG_PROGRESS,"msctls_progress32",

+

                     WS_BORDER,15,52,154,13
                     WS_BORDER,15,52,154,13

+

 */
 */

+

 void rc2wxr::ParseProgressBar(wxString label, wxString varname)
 void rc2wxr::ParseProgressBar(wxString label, wxString varname)

+

 {
 {

+

 wxString tok;
 wxString tok;

+

 while (ReadOrs(tok));
 while (ReadOrs(tok));

+

 fprintf(m_wxr,"  control = [%i,wxGauge,'','wxGA_HORIZONTAL','%s',",m_controlid,varname);  
 fprintf(m_wxr,"  control = [%i,wxGauge,'','wxGA_HORIZONTAL','%s',",m_controlid,varname);  

+

 int x,y,width,height;
 int x,y,width,height;

+

 ReadRect(x,y,width,height);
 ReadRect(x,y,width,height);

+

 fprintf(m_wxr,"%i,%i,%i,%i,",x,y,width,height);
 fprintf(m_wxr,"%i,%i,%i,%i,",x,y,width,height);

+

 fprintf(m_wxr," 0, 10,\\\n");
 fprintf(m_wxr," 0, 10,\\\n");

+

 fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n");
 fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n");

+

 }
 
 }
 

+
+

 bool rc2wxr::ReadOrs(wxString & w)
 bool rc2wxr::ReadOrs(wxString & w)

+

 {
 {

+

 wxString tok;
 wxString tok;

+

 tok=PeekToken();
 tok=PeekToken();

+

 if (tok.IsNumber())
 if (tok.IsNumber())

+

    return false;
    return false;

+

 w=GetToken();
 w=GetToken();

+

 return TRUE;
 return TRUE;

+

 }
 
 }
 

+
+

 //Is it a check button or a radio button
 //Is it a check button or a radio button

+

 void rc2wxr::ParseCtrlButton(wxString label, wxString varname)
 void rc2wxr::ParseCtrlButton(wxString label, wxString varname)

+

 {
 {

+

 wxString tok;
 wxString tok;

+

 tok=GetToken();
 
 tok=GetToken();
 

+
+

 m_controlid++;
 m_controlid++;

+

 int x,y,width,height;
 
 int x,y,width,height;
 

+
+

 if (tok=="BS_AUTOCHECKBOX")
 if (tok=="BS_AUTOCHECKBOX")

+

 {
 {

+

     fprintf(m_wxr,"  control = [%i,wxCheckBox,'%s','0','%s',",m_controlid,label,varname);    
     fprintf(m_wxr,"  control = [%i,wxCheckBox,'%s','0','%s',",m_controlid,label,varname);    

+

     while (ReadOrs(tok));      
     while (ReadOrs(tok));      

+

     ReadRect(x,y,width,height);
     ReadRect(x,y,width,height);

+

     fprintf(m_wxr,"%i,%i,%i,%i,0,\\\n",x,y,width,height);
     fprintf(m_wxr,"%i,%i,%i,%i,0,\\\n",x,y,width,height);

+

     fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n");
     fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n");

+

 }
 
 }
 

+
+

 if (tok=="BS_AUTORADIOBUTTON")
 if (tok=="BS_AUTORADIOBUTTON")

+

 {
 {

+

     fprintf(m_wxr,"  control = [%i,wxRadioButton,'%s','0','%s',",m_controlid,label,varname);    
     fprintf(m_wxr,"  control = [%i,wxRadioButton,'%s','0','%s',",m_controlid,label,varname);    

+

     while(ReadOrs(tok));       
     while(ReadOrs(tok));       

+

     ReadRect(x,y,width,height);
     ReadRect(x,y,width,height);

+

     fprintf(m_wxr,"%i,%i,%i,%i,0,\\\n",x,y,width,height);
     fprintf(m_wxr,"%i,%i,%i,%i,0,\\\n",x,y,width,height);

+

     fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n");
     fprintf(m_wxr,"[8, 'wxSWISS', 'wxNORMAL', 'wxNORMAL', 0, 'MS Sans Serif']],\\\n");

+

 }
 
 
 
 }
 
 
 

+
+
+
+

 }
 
 }
 

+
+

diff --git a/contrib/utils/convertrc/rc2xml.cpp b/contrib/utils/convertrc/rc2xml.cpp
index 15f7ac44eeecb842bea8011267755317fa8f84e3..ee909b0256b7b1a46a4efd82a9fc572c06b3a94d 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #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_rc.Open(rcfile.c_str());
     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;
     result=m_xmlfile.Open(xmlfile.c_str(),"w+t");
     wxASSERT_MSG(result,"Couldn't create XML file");   
     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("idr_","");
     name.Replace("idb_","");
     name.Replace("idc_","");

+

     name.Replace(".ico","");
     name.Replace(".ico","");

+

     name.Replace(".bmp","");
     return name;
 }
     name.Replace(".bmp","");
     return name;
 }


@@ -1184,6 +1191,7 @@ void rc2xml::WriteBitmap(wxString bitmapname)
     
     wxString *bitmappath;
     bitmappath=(wxString *)node->Data();
     
     wxString *bitmappath;
     bitmappath=(wxString *)node->Data();

+

     bitmapname=wxFileNameFromPath(*bitmappath);
     wxBitmap bitmap;
     if (!bitmap.LoadFile(*bitmappath,wxBITMAP_TYPE_BMP ))
     bitmapname=wxFileNameFromPath(*bitmappath);
     wxBitmap bitmap;
     if (!bitmap.LoadFile(*bitmappath,wxBITMAP_TYPE_BMP ))

diff --git a/samples/caret/caret.cpp b/samples/caret/caret.cpp
index 600c6e5b0df66a7763ccdbecc4e0f9aec8bed109..7415922ae0035fe4ff26f9c2da76f0e7f28c34b8 100644 (file)
--- a/samples/caret/caret.cpp
+++ b/samples/caret/caret.cpp
@@ -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__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index 472ac4a4ab9124a9a39c765546fb755a3a1e0ca7..66fc9350d53533dee4eba90beab1d93da1607221 100644 (file)
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -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__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop

diff --git a/samples/html/about/about.cpp b/samples/html/about/about.cpp
index a97c5e58c3854750d850715dc6c4d5762302a761..4675c6085f0851c83e33ace29c4022ccffa8e4bf 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".

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

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop

diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp
index 457fb96e0fb19e0fa228e88bbb52cbcd29fa5111..2519d60d92977242e40edb922410f649a85fbf71 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".

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

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop

diff --git a/samples/html/helpview/helpview.cpp b/samples/html/helpview/helpview.cpp
index f8cb26d42ade60a9ac07be8d0e348cc31ab25368..3e1e1b1d215e5eb10b1f533945805dc8bf0a320b 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/samples/html/printing/printing.cpp b/samples/html/printing/printing.cpp
index afbe534fd98b6e417b80c8503cddb727d0838743..561b77f33ff985f7970c8b4ba490b981908a9ff4 100644 (file)
--- 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".
 
 
 // For compilers that support precompilation, includes "wx/wx.h".

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

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop

diff --git a/samples/html/test/test.cpp b/samples/html/test/test.cpp
index 0bbf21fd5f8436828f18afded2d9a96e5f82d574..2b7fe2a9ed5b02e8b6d5ce4b9dcd7275ebbdcec2 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".

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

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop

diff --git a/samples/html/virtual/virtual.cpp b/samples/html/virtual/virtual.cpp
index f036f4b2007a5a6b2fb3b7d58f922aa0aff4ff5a..a45604a6fb8bb3ff3760c3d313da84b02be83bb2 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".

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

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop

diff --git a/samples/html/widget/widget.cpp b/samples/html/widget/widget.cpp
index 43f03c55eddc15d224a580f131493f95f1091538..7c48e1971a2a35e9b55718dd538594bf0fcb0c2b 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".

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

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop

diff --git a/samples/html/zip/zip.cpp b/samples/html/zip/zip.cpp
index 2b0fa15f98af8ba7a60d9addf85529b036bedf15..6f1dad46586eb37dc1d278b75b4d35b3b0cc44ac 100644 (file)
--- 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".
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".

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

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop

diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp
index dbe71040e246d3475ab699380a90dd5172d9dbd4..6ecd9534489affe9f72bb68230f3c9c90ea3463d 100644 (file)
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -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__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop

diff --git a/samples/richedit/wxLayout.cpp b/samples/richedit/wxLayout.cpp
index e70db238f91ed432076e769fc34fdf67f09c8921..a37c580265d3a2a9ebedde921bc83d455dc9ff03 100644 (file)
--- a/samples/richedit/wxLayout.cpp
+++ b/samples/richedit/wxLayout.cpp
@@ -11,7 +11,7 @@
 #pragma implementation "wxLayout.h"
 #endif
 
 #pragma implementation "wxLayout.h"
 #endif
 

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

 #ifdef __BORLANDC__
 #  pragma hdrstop
 #endif
 #ifdef __BORLANDC__
 #  pragma hdrstop
 #endif

diff --git a/samples/richedit/wxllist.cpp b/samples/richedit/wxllist.cpp
index a674ae577daa816bfe1955b0647d51a0b4796d55..316ee181298ff49632284b5b4e63a02ae995ccfe 100644 (file)
--- a/samples/richedit/wxllist.cpp
+++ b/samples/richedit/wxllist.cpp
@@ -25,7 +25,7 @@
 #   pragma implementation "wxllist.h"
 #endif
 
 #   pragma implementation "wxllist.h"
 #endif
 

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

 
 #ifdef __BORLANDC__
 #  pragma hdrstop
 
 #ifdef __BORLANDC__
 #  pragma hdrstop

diff --git a/samples/richedit/wxlparser.cpp b/samples/richedit/wxlparser.cpp
index d666c16fa2ffb85b4670a4ce9c736a0ab6d23f6a..dc457fb85d86d47d63efe0d21aa90a8859444f6b 100644 (file)
--- a/samples/richedit/wxlparser.cpp
+++ b/samples/richedit/wxlparser.cpp
@@ -10,7 +10,7 @@
 #   pragma implementation "wxlparser.h"
 #endif
 
 #   pragma implementation "wxlparser.h"
 #endif
 

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

 
 #ifdef __BORLANDC__
 #  pragma hdrstop
 
 #ifdef __BORLANDC__
 #  pragma hdrstop

diff --git a/samples/richedit/wxlwindow.cpp b/samples/richedit/wxlwindow.cpp
index 1d5869b2a3cdb0c4cc97e2de99045181231fc4f2..b8158f2e5b7d8e69fd6d81bba4742ff2fd683194 100644 (file)
--- a/samples/richedit/wxlwindow.cpp
+++ b/samples/richedit/wxlwindow.cpp
@@ -18,7 +18,7 @@
 #   pragma implementation "wxlwindow.h"
 #endif
 
 #   pragma implementation "wxlwindow.h"
 #endif
 

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

 
 #ifdef __BORLANDC__
 #  pragma hdrstop
 
 #ifdef __BORLANDC__
 #  pragma hdrstop

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index c839ceee559e4bbc4e63433ff162321a00d9a0c0..8ec29ca590e3830844b5a1ec8d672ce26e531133 100644 (file)
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -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__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop

diff --git a/utils/Install/builder/wxib.cpp b/utils/Install/builder/wxib.cpp
index 73abbcaab9e13013e5336eebcbde9eced94ce2a0..c3febebc29e1c4e12751fb73a23ba9bda27009c7 100644 (file)
--- 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".
 // ----------------------------------------------------------------------------
 
 // For compilers that support precompilation, includes "wx/wx.h".

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

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop