Log Message:
-----------
Update compilation notes for wx2.5.3
Use wxWidgets vs. wxWindows
Modified Files:
--------------
pgadmin3/docs/en_US:
freebsd_notes.html (r1.2 -> r1.3)
index.html (r1.8 -> r1.9)
locating_resources.html (r1.3 -> r1.4)
prop_page_design.html (r1.5 -> r1.6)
snapshots.html (r1.28 -> r1.29)
unix_compilation.html (r1.17 -> r1.18)
Index: locating_resources.html
===================================================================
RCS file: /projects/pgadmin3/docs/en_US/locating_resources.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -Ldocs/en_US/locating_resources.html -Ldocs/en_US/locating_resources.html
-u -w -r1.3 -r1.4
--- docs/en_US/locating_resources.html
+++ docs/en_US/locating_resources.html
@@ -17,7 +17,7 @@
pgAdmin3 will load all *.xrc files from the ui/common directory first,
then from the ui/win32 or ui/gtk directory. If a resource is present in
both directories, the platform specific version will win (that's how the
-wxWindows implementation works now, to avoid future trouble a resource
+wxWidgets implementation works now, to avoid future trouble a resource
should be present in one directory only).
</p>
Index: freebsd_notes.html
===================================================================
RCS file: /projects/pgadmin3/docs/en_US/freebsd_notes.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ldocs/en_US/freebsd_notes.html -Ldocs/en_US/freebsd_notes.html -u -w
-r1.2 -r1.3
--- docs/en_US/freebsd_notes.html
+++ docs/en_US/freebsd_notes.html
@@ -17,13 +17,13 @@
<p><br>
The use of UNICODE can't be expected with Version 4.x. libc lacks the wchar
wide
character routines required. It is difficult work to fix this. This problem
will
-be seen when building wxWindows. The following message will be output.<br>
+be seen when building wxWidgets. The following message will be output.<br>
<br>
...<br>
<i>implicit declaration of function `inttowupper (...) '</i><br>
...<br>
<br>
-In this case, build wxWindows without UNICODE support - wxWindows may be
+In this case, build wxWidgets without UNICODE support - wxWidgets may be
configured with the following command.<br>
<br>
<i>./configure --disable-shared --enable-static --with-gtk
--enable-gtk2</i><br>
@@ -33,7 +33,7 @@
<p>UNICODE is supported, and pgAdmin3 should work well. There is a UTF-8
locales
support package in misc of the ports collection.<br>
<br>
-Be careful in the establishment of locale. WxWindows has the locale check of
the
+Be careful in the establishment of locale. wxWidgets has the locale check of
the
language with dot.<br>
<br>
For example, when it is LANG=ja_JP.UTF-8<br>
@@ -58,22 +58,22 @@
locheck ja_JP<br>
ja_JP <--- it is OK.<br>
<br>
-wxWindows may be configured with the following command.<br>
+wxWidgets may be configured with the following command.<br>
<br>
<i>../configure --disable-shared --enable-static --enable-unicode --with-gtk
--enable-gtk2 --enable-debug </i><br>
<br>
-Configured wxWindows 2.5.0 for `i386-unknown-freebsd5.1'<br>
+Configured wxWidgets 2.5.0 for `i386-unknown-freebsd5.1'<br>
<br>
-Which GUI toolkit should wxWindows use? GTK<br>
-Should wxWindows be compiled in debug mode? yes<br>
-Should wxWindows be linked as a shared library? no<br>
-Should wxWindows be compiled in Unicode mode? yes<br>
-What level of wxWindows compatibility should be enabled?<br>
-wxWindows 2.0 no<br>
-wxWindows 2.2 no<br>
-wxWindows 2.4 yes<br>
-Which libraries should wxWindows use?<br>
+Which GUI toolkit should wxWidgets use? GTK<br>
+Should wxWidgets be compiled in debug mode? yes<br>
+Should wxWidgets be linked as a shared library? no<br>
+Should wxWidgets be compiled in Unicode mode? yes<br>
+What level of wxWidgets compatibility should be enabled?<br>
+wxWidgets 2.0 no<br>
+wxWidgets 2.2 no<br>
+wxWidgets 2.4 yes<br>
+Which libraries should wxWidgets use?<br>
jpeg sys<br>
png sys<br>
regex sys<br>
Index: unix_compilation.html
===================================================================
RCS file: /projects/pgadmin3/docs/en_US/unix_compilation.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -Ldocs/en_US/unix_compilation.html -Ldocs/en_US/unix_compilation.html -u
-w -r1.17 -r1.18
--- docs/en_US/unix_compilation.html
+++ docs/en_US/unix_compilation.html
@@ -9,58 +9,36 @@
<body>
<H3>Compilation on unix platforms</H3>
-<P>If you plan to contribute code, pgAdmin3 requires wxWindows from
-CVS version > 20031010. We have our own version which is preferred
-as it is well tested and includes a number of additional patches (we
-use the CVS version of wxWindows because it supports Unicode, and
-sizes controls much more nicely on *nix systems).
+<P>If you plan to contribute code, pgAdmin3 requires wxWidgets 2.5.3. On
+Mac OSX systems, you may need to use a newer CVS snapshot (the OSX port of
pgAdmin
+is currently experimental).
Use a recent GNU/Linux distro because
recent versions of GTK2.2, automake and autoconf are needed. You will
also need a copy of PostgreSQL on your development system to link
libpq. We recommend using libpq 7.4 or newer, compiled with
--enable-thread-safety.
</P>
<OL>
- <LI><P>We provide a set of four wxGTK2
- binaries (wxGTK2ud, wxGTK2ud-devel, wxGTK2ud-xrc and wxGTK2ud-stc)
- suited for pgAdmin3 development, compiled with Unicode and logging
- and linked against GTK 2.2, as described in the <A
HREF="snapshots.html">binary
- snapshots</A> instructions. These binaries are only available for
- <A HREF="http://www.pgadmin.org/snapshots/linux/redhat9/wxGTK2";>RedHat
- 9</A>, <A
HREF="http://www.pgadmin.org/snapshots/linux/mandrake91/wxGTK2";>Mandrake
- 9.1</A> and <A
HREF="http://www.pgadmin.org/snapshots/linux/suse82/wxGTK2";>SuSE
- 8.2</A>. If you install our wxGTK2 RPMs, please skip to step 6.
- Otherwise, if you wish to install wxGTK 2.5 from source, continue
- with step 2.
- </P>
- <LI><P>Download our supported wxWindows CVS version from
- <A HREF="http://www.pgadmin.org/snapshots/";>snapshots</A>.
Alternatively,
- you can install our wxGTK2 RPMs which provide all needed libraries
- and headers files, as described in the <A HREF="snapshots.html">binary
- snapshots</A> instructions.
- </P>
- <PRE># wget
http://www.pgadmin.org/snapshots/wxWindows/wxWindows-pgAdmin3-2003xxxx.tar.gz
-# tar -zxf wxWindows-pgAdmin3-2003xxxx.tar.gz</PRE>
- <LI><P>(don't forget to replace the xxxx with the current version month
and day). Install wxWindows from source as follows:
+ <LI><P>Download wxWidgets 2.5.3 from <a
href="http://www.wxwidgets.org";>the wxWidgets website</a>.
</P>
- <PRE># cd wxWindows-pgAdmin3
+ <PRE># wget
http://heanet.dl.sourceforge.net/sourceforge/wxWidgets/wxGTK-2.5.3.tar.gz
+# tar -zxf wxGTK-2.5.3.tar.gz</PRE>
+ <LI><P>Install wxWidgets from source as follows:
+ </P>
+ <PRE># cd wxWidgets-2.5.3
# ./configure --with-gtk --enable-gtk2 --enable-unicode --disable-shared
--enable-debug
# make
# make install
# ldconfig</PRE>
- <LI><P>Install the wxWindows Styled Text Control as follows:
+ <LI><P>Install the wxWidgets Styled Text Control as follows:
</P>
<PRE STYLE="margin-right: 1cm"># cd contrib/src/stc
# make
# make install
# ldconfig</PRE>
- <LI><P>Install the wxWindows XML Recources as follows:# cd ../xrc
- </P>
- <PRE># make
-# make install
-# ldconfig</PRE>
<LI><P>Download and unpack the pgAdmin source code.
</P>
<PRE>If you wish to use CVS code:
+
# CVSROOT=:pserver:[EMAIL PROTECTED]:/disk1/cvsroot export CVSROOT
# cvs login
# cvs -z9 checkout pgadmin3
@@ -69,8 +47,8 @@
or, if you wish to use the latest source tarball:
-# wget http://www.pgadmin.org/snapshots/pgadmin3-Alpha-src.tar.gz
-# tar -zxvf pgadmin3-Alpha-src.tar.gz
+# wget http://www.pgadmin.org/snapshots/pgadmin3-src.tar.gz
+# tar -zxvf pgadmin3-src.tar.gz
# cd pgadmin3
Now the source is downloaded:
Index: snapshots.html
===================================================================
RCS file: /projects/pgadmin3/docs/en_US/snapshots.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -Ldocs/en_US/snapshots.html -Ldocs/en_US/snapshots.html -u -w -r1.28 -r1.29
--- docs/en_US/snapshots.html
+++ docs/en_US/snapshots.html
@@ -84,7 +84,7 @@
</P>
</UL>
<P><BR>You may also want to check
- wxWindows 2.5 cvs version static packages which were used to build
+ wxWidgets 2.5 cvs version static packages which were used to build
pgadmin3 packages: <BR>(PLEASE REMEMBER, THESE PACKAGES ARE REALLY
EXPERIMENTAL, THEY CAN BREAK YOUR SYSTEM!! YOU HAVE BEEN WARNED!)
<BR>Binaries and sources are available for woody, testing and
@@ -92,19 +92,19 @@
<UL>
<LI><P>For Debian WOODY:<BR> deb
http://www.pgadmin.org/snapshots/linux/debian experimental/woody
- wxwindows-pgadmin3<BR> deb-src
+ wxWidgets-pgadmin3<BR> deb-src
http://www.pgadmin.org/snapshots/linux/debian experimental/woody
- wxwindows-pgadmin3</P>
+ wxWidgets-pgadmin3</P>
<LI><P>For Debian TESTING:<BR> deb
http://www.pgadmin.org/snapshots/linux/debian
experimental/testing
- wxwindows-pgadmin3<BR> deb-src
+ wxWidgets-pgadmin3<BR> deb-src
http://www.pgadmin.org/snapshots/linux/debian
experimental/testing
- wxwindows-pgadmin3</P>
+ wxWidgets-pgadmin3</P>
<LI><P>For Debian UNSTABLE:<BR> deb
http://www.pgadmin.org/snapshots/linux/debian
experimental/unstable
- wxwindows-pgadmin3<BR> deb-src
+ wxWidgets-pgadmin3<BR> deb-src
http://www.pgadmin.org/snapshots/linux/debian
experimental/unstable
- wxwindows-pgadmin3</P>
+ wxWidgets-pgadmin3</P>
</UL>
<P><BR>It contains the three following
packages which were used to build pgadmin3:</P>
@@ -118,13 +118,13 @@
</UL>
<P><BR>And if you want sources of the three precedent packages:<BR>#
deb-src http://www.pgadmin.org/snapshots/linux/debian
- experimental/woody wxwindows-pgadmin3</P>
+ experimental/woody wxWidgets-pgadmin3</P>
<LI><P>To compile and rebuild the
pgadmin3 package:</P>
<UL>
<LI><P>First, as root<BR># apt-get
update<BR># apt-get build-dep pgadmin3 <BR>This should install
- pgadmin3-wxwindows* packages.</P>
+ pgadmin3-wxWidgets* packages.</P>
<LI><P>Then as a normal user<BR>Fetch
the source # apt-get source pgadmin3<BR># cd
pgadmin3-0.1.1<BR>Compile
and build the package # dpkg-buildpackage -rfakeroot<BR># cd ..
;
@@ -144,8 +144,8 @@
<LI><P>Binary RPM packages
</P>
<P>pgAdmin3 binary RPM packages are compiled statically against
- <A HREF="http://wxwindows.sourceforge.net/snapshots/";>wxGTK 2.5</A>.
- Therefore there is not need to install <A
HREF="http://wxwindows.sourceforge.net/snapshots";>wxGTK
+ <A HREF="http://wxWidgets.sourceforge.net/snapshots/";>wxGTK 2.5</A>.
+ Therefore there is not need to install <A
HREF="http://wxWidgets.sourceforge.net/snapshots";>wxGTK
2.5</A> libraries. pgAdmin3 binaries are compiled with Unicode and
debugging mode and linked against GTK2. The binaries are localised
in several languages and include the latest PostgreSQL
@@ -168,10 +168,10 @@
<LI><P>wxGTK 2.5 libraries
</P>
<P>If you want to contribute pgAdmin3 projects or simply compile
- from source, you need a recent GNU/Linux distribution with <A
HREF="http://wxwindows.sourceforge.net/";>wxGTK
+ from source, you need a recent GNU/Linux distribution with <A
HREF="http://wxWidgets.sourceforge.net/";>wxGTK
2.5</A> libraries, header files and contributed libraries. For your
convenience and to avoid long compilation times (sometimes hours),
- we provide <A HREF="http://wxwindows.sourceforge.net/snapshots";>wxGTK
+ we provide <A HREF="http://wxWidgets.sourceforge.net/snapshots";>wxGTK
2.5 CVS snapshots</A> in RPM format.
</P>
<OL>
Index: prop_page_design.html
===================================================================
RCS file: /projects/pgadmin3/docs/en_US/prop_page_design.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -Ldocs/en_US/prop_page_design.html -Ldocs/en_US/prop_page_design.html -u
-w -r1.5 -r1.6
--- docs/en_US/prop_page_design.html
+++ docs/en_US/prop_page_design.html
@@ -36,7 +36,7 @@
- vertical control spacing 25, for radio buttons and checkboxes 20
- static text has a vertical offset of 3 relative to other controls
- standard Button size is (75, 25)
-- controls including statics will need up to 50 % more room for under GTK2 if
wxWindows 2.4 is used; 2.5 is recommended.
+- controls including statics will need up to 50 % more room for under GTK2 if
wxWidgets 2.4 is used; 2.5 is recommended.
- statics should be designed with 50 % space in reserve, to leave enough space
for translated strings.
For dialogs derived from dlgSecurityProperty, the Security page will be
Index: index.html
===================================================================
RCS file: /projects/pgadmin3/docs/en_US/index.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -Ldocs/en_US/index.html -Ldocs/en_US/index.html -u -w -r1.8 -r1.9
--- docs/en_US/index.html
+++ docs/en_US/index.html
@@ -19,7 +19,7 @@
and pgAdmin II products, which though popular, had limitations in the
design that prevented them being taken to the 'next level'. pgAdmin
III is written in C++ and uses the excellent <A
-HREF="www.wxwidgets.org">wxWidgets</A> (former wxWindows)
+HREF="www.wxwidgets.org">wxWidgets</A> (formerly wxWindows)
cross platform toolkit. Connection to PostgreSQL is made using the
native libpq library.</P>
---------------------------(end of broadcast)---------------------------
TIP 4: Don't 'kill -9' the postmaster
