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).

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 @@


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.
+be seen when building wxWidgets. The following message will be output.

...
implicit declaration of function `inttowupper (...) '
...

-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.

./configure --disable-shared --enable-static --with-gtk --enable-gtk2
@@ -33,7 +33,7 @@

UNICODE is supported, and pgAdmin3 should work well. There is a UTF-8 locales support package in misc of the ports collection.

-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.

For example, when it is LANG=ja_JP.UTF-8
@@ -58,22 +58,22 @@ locheck ja_JP
ja_JP <--- it is OK.

-wxWindows may be configured with the following command.
+wxWidgets may be configured with the following command.

../configure --disable-shared --enable-static --enable-unicode --with-gtk --enable-gtk2 --enable-debug

-Configured wxWindows 2.5.0 for `i386-unknown-freebsd5.1'
+Configured wxWidgets 2.5.0 for `i386-unknown-freebsd5.1'

-Which GUI toolkit should wxWindows use? GTK
-Should wxWindows be compiled in debug mode? yes
-Should wxWindows be linked as a shared library? no
-Should wxWindows be compiled in Unicode mode? yes
-What level of wxWindows compatibility should be enabled?
-wxWindows 2.0 no
-wxWindows 2.2 no
-wxWindows 2.4 yes
-Which libraries should wxWindows use?
+Which GUI toolkit should wxWidgets use? GTK
+Should wxWidgets be compiled in debug mode? yes
+Should wxWidgets be linked as a shared library? no
+Should wxWidgets be compiled in Unicode mode? yes
+What level of wxWidgets compatibility should be enabled?
+wxWidgets 2.0 no
+wxWidgets 2.2 no
+wxWidgets 2.4 yes
+Which libraries should wxWidgets use?
jpeg sys
png sys
regex sys
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 @@

Compilation on unix platforms

-

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). +

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.

    -
  1. 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 binary - snapshots instructions. These binaries are only available for - RedHat - 9, Mandrake - 9.1 and SuSE - 8.2. 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. -

    -
  2. Download our supported wxWindows CVS version from - snapshots. Alternatively, - you can install our wxGTK2 RPMs which provide all needed libraries - and headers files, as described in the binary - snapshots instructions. -

    -
    # wget http://www.pgadmin.org/snapshots/wxWindows/wxWindows-pgAdmin3-2003xxxx.tar.gz
    -# tar -zxf wxWindows-pgAdmin3-2003xxxx.tar.gz
    -
  3. (don't forget to replace the xxxx with the current version month and day). Install wxWindows from source as follows: +

  4. Download wxWidgets 2.5.3 from the wxWidgets website.

    -
    # cd wxWindows-pgAdmin3
    +	
    # wget http://heanet.dl.sourceforge.net/sourceforge/wxWidgets/wxGTK-2.5.3.tar.gz
    +# tar -zxf wxGTK-2.5.3.tar.gz
    +
  5. Install wxWidgets from source as follows: +

    +
    # cd wxWidgets-2.5.3
     # ./configure --with-gtk --enable-gtk2 --enable-unicode --disable-shared --enable-debug
     # make
     # make install
     # ldconfig
    -
  6. Install the wxWindows Styled Text Control as follows: +

  7. Install the wxWidgets Styled Text Control as follows:

    # cd contrib/src/stc
     # make
     # make install
     # ldconfig
    -
  8. Install the wxWindows XML Recources as follows:# cd ../xrc -

    -
    # make
    -# make install
    -# ldconfig
  9. Download and unpack the pgAdmin source code.

    If you wish to use CVS code:
    +	
     # CVSROOT=:pserver:anonymous@cvs.pgadmin.org:/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 @@
     		


    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:
    (PLEASE REMEMBER, THESE PACKAGES ARE REALLY EXPERIMENTAL, THEY CAN BREAK YOUR SYSTEM!! YOU HAVE BEEN WARNED!)
    Binaries and sources are available for woody, testing and @@ -92,19 +92,19 @@

    • For Debian WOODY:
       deb http://www.pgadmin.org/snapshots/linux/debian experimental/woody - wxwindows-pgadmin3
       deb-src + wxWidgets-pgadmin3
       deb-src http://www.pgadmin.org/snapshots/linux/debian experimental/woody - wxwindows-pgadmin3

      + wxWidgets-pgadmin3

    • For Debian TESTING:
       deb http://www.pgadmin.org/snapshots/linux/debian experimental/testing - wxwindows-pgadmin3
       deb-src + wxWidgets-pgadmin3
       deb-src http://www.pgadmin.org/snapshots/linux/debian experimental/testing - wxwindows-pgadmin3

      + wxWidgets-pgadmin3

    • For Debian UNSTABLE:
       deb http://www.pgadmin.org/snapshots/linux/debian experimental/unstable - wxwindows-pgadmin3
       deb-src + wxWidgets-pgadmin3
       deb-src http://www.pgadmin.org/snapshots/linux/debian experimental/unstable - wxwindows-pgadmin3

      + wxWidgets-pgadmin3


    It contains the three following packages which were used to build pgadmin3:

    @@ -118,13 +118,13 @@


    And if you want sources of the three precedent packages:
    # deb-src http://www.pgadmin.org/snapshots/linux/debian - experimental/woody wxwindows-pgadmin3

    + experimental/woody wxWidgets-pgadmin3

  10. To compile and rebuild the pgadmin3 package:

    • First, as root
      # apt-get update
      # apt-get build-dep pgadmin3
      This should install - pgadmin3-wxwindows* packages.

      + pgadmin3-wxWidgets* packages.

    • Then as a normal user
      Fetch the source # apt-get source pgadmin3
      # cd pgadmin3-0.1.1
      Compile and build the package # dpkg-buildpackage -rfakeroot
      # cd .. ; @@ -144,8 +144,8 @@

    • Binary RPM packages

      pgAdmin3 binary RPM packages are compiled statically against - wxGTK 2.5. - Therefore there is not need to install wxGTK + wxGTK 2.5. + Therefore there is not need to install wxGTK 2.5 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 @@

    • wxGTK 2.5 libraries

      If you want to contribute pgAdmin3 projects or simply compile - from source, you need a recent GNU/Linux distribution with wxGTK + from source, you need a recent GNU/Linux distribution with wxGTK 2.5 libraries, header files and contributed libraries. For your convenience and to avoid long compilation times (sometimes hours), - we provide wxGTK + we provide wxGTK 2.5 CVS snapshots in RPM format.

        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 wxWidgets (former wxWindows) +HREF="www.wxwidgets.org">wxWidgets (formerly wxWindows) cross platform toolkit. Connection to PostgreSQL is made using the native libpq library.