Log Message:
-----------
use wxWidgets 2.5.3
Modified Files:
--------------
pgadmin3:
acinclude.m4 (r1.36 -> r1.37)
CHANGELOG.txt (r1.149 -> r1.150)
pgadmin3/src:
pgAdmin3.dsp (r1.115 -> r1.116)
pgadmin3/src/ui:
pgAdmin3.rc (r1.10 -> r1.11)
Index: CHANGELOG.txt
===================================================================
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.149
retrieving revision 1.150
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.149 -r1.150
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -17,6 +17,7 @@
</ul>
<br>
<ul>
+ <li>2004-10-16 AP 1.2B3 use to wxWidgets 2.5.3
<li>2004-10-15 AP 1.2B3 change unsigned conversion for oids (r: Richard van den
Berg, Patrick Hatcher)
<li>2004-10-14 AP 1.2B3 Prevent StatusBar from being overwritten by Toolbar (r:
Virgil Frum)
<li>2004-10-13 AP 1.2B3 Connect to databases with special names (r: Frank Lupo)
Index: acinclude.m4
===================================================================
RCS file: /projects/pgadmin3/acinclude.m4,v
retrieving revision 1.36
retrieving revision 1.37
diff -Lacinclude.m4 -Lacinclude.m4 -u -w -r1.36 -r1.37
--- acinclude.m4
+++ acinclude.m4
@@ -234,95 +234,95 @@
then
case "${WX_NEW_LDFLAGS}" in
*libwx_mswud-*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_mswud_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_mswud_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_mswud_stc-${WX_VERSION}.a"
LIBS="$LIBS $WX_NEW_LDFLAGS"
LDFLAGS="$LDFLAGS -mwindows -Wl,--subsystem,windows"
;;
*libwx_mswu-*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_mswu_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_mswu_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_mswu_stc-${WX_VERSION}.a"
LIBS="$LIBS $WX_NEW_LDFLAGS"
LDFLAGS="$LDFLAGS -mwindows -Wl,--subsystem,windows"
;;
*libwx_mswd-*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_mswd_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_mswd_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_mswd_stc-${WX_VERSION}.a"
LIBS="$LIBS $WX_NEW_LDFLAGS"
LDFLAGS="$LDFLAGS -mwindows -Wl,--subsystem,windows"
;;
*libwx_msw-*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_msw_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_msw_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_msw_stc-${WX_VERSION}.a"
LIBS="$LIBS $WX_NEW_LDFLAGS"
LDFLAGS="$LDFLAGS -mwindows -Wl,--subsystem,windows"
;;
*libwx_macud-*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_macud_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_macud_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_macud_stc-${WX_VERSION}.a"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*libwx_macud_core*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_macud_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_macud_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_macud_stc-${WX_VERSION}.a"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*libwx_macd-*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_macd_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_macd_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_macd_stc-${WX_VERSION}.a"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*libwx_macd_core*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_macd_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_macd_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_macd_stc-${WX_VERSION}.a"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*libwx_mac-*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_mac_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_mac_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_mac_stc-${WX_VERSION}.a"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*libwx_mac_core*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_mac_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_mac_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_mac_stc-${WX_VERSION}.a"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*libwx_gtk2ud-*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_gtk2ud_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_gtk2ud_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_gtk2ud_stc-${WX_VERSION}.a"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*libwx_gtk2ud_core*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_gtk2ud_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_gtk2ud_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_gtk2ud_stc-${WX_VERSION}.a"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*libwx_gtk2d-*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_gtk2d_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_gtk2d_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_gtk2d_stc-${WX_VERSION}.a"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*libwx_gtk2d_core*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_gtk2d_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_gtk2d_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_gtk2d_stc-${WX_VERSION}.a"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*libwx_gtk2u-*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_gtk2u_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_gtk2u_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_gtk2u_stc-${WX_VERSION}.a"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*libwx_gtk2u_core*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_gtk2u_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_gtk2u_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_gtk2u_stc-${WX_VERSION}.a"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*libwx_gtkud-*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_gtkud_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_gtkud_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_gtkud_stc-${WX_VERSION}.a"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*libwx_gtkud_core*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_gtkud_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_gtkud_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_gtkud_stc-${WX_VERSION}.a"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*libwx_gtkd-*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_gtkd_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_gtkd_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_gtkd_stc-${WX_VERSION}.a"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*libwx_gtkd_core*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_gtkd_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_gtkd_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_gtkd_stc-${WX_VERSION}.a"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*libwx_gtk-*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_gtk_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_gtk_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_gtk_stc-${WX_VERSION}.a"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*libwx_gtk_core*)
- LIBS="$LIBS ${WX_HOME}/lib/libwx_gtk_stc-${WX_VERSION}.a
${WX_HOME}/lib/libwx_gtk_xrc-${WX_VERSION}.a"
+ LIBS="$LIBS ${WX_HOME}/lib/libwx_gtk_stc-${WX_VERSION}.a"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*)
@@ -331,95 +331,95 @@
else
case "${WX_NEW_LDFLAGS}" in
*libwx_mswud-*)
- LIBS="$LIBS -lwx_mswud_stc-${WX_VERSION} -lwx_mswud_xrc-${WX_VERSION}"
+ LIBS="$LIBS -lwx_mswud_stc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
LDFLAGS="$LDFLAGS -mwindows -Wl,--subsystem,windows"
;;
*libwx_mswu-*)
- LIBS="$LIBS -lwx_mswu_stc-${WX_VERSION} -lwx_mswu_xrc-${WX_VERSION}"
+ LIBS="$LIBS -lwx_mswu_stc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
LDFLAGS="$LDFLAGS -mwindows -Wl,--subsystem,windows"
;;
*libwx_mswd-*)
- LIBS="$LIBS -lwx_mswd_stc-${WX_VERSION} -lwx_mswd_xrc-${WX_VERSION}"
+ LIBS="$LIBS -lwx_mswd_stc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
LDFLAGS="$LDFLAGS -mwindows -Wl,--subsystem,windows"
;;
*libwx_msw-*)
- LIBS="$LIBS -lwx_msw_stc-${WX_VERSION} -lwx_msw_xrc-${WX_VERSION}"
+ LIBS="$LIBS -lwx_msw_stc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
LDFLAGS="$LDFLAGS -mwindows -Wl,--subsystem,windows"
;;
*wx_macud-*)
- LIBS="$LIBS -lwx_macud_stc-${WX_VERSION} -lwx_macud_xrc-${WX_VERSION}"
+ LIBS="$LIBS -lwx_macud_stc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*wx_macud_core*)
- LIBS="$LIBS -lwx_macud_stc-${WX_VERSION} -lwx_macud_xrc-${WX_VERSION}"
+ LIBS="$LIBS -lwx_macud_stc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*wx_macd-*)
- LIBS="$LIBS -lwx_macd_stc-${WX_VERSION} -lwx_macd_xrc-${WX_VERSION}"
+ LIBS="$LIBS -lwx_macd_stc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*wx_macd_core*)
- LIBS="$LIBS -lwx_macd_stc-${WX_VERSION} -lwx_macd_xrc-${WX_VERSION}"
+ LIBS="$LIBS -lwx_macd_stc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*wx_mac-*)
- LIBS="$LIBS -lwx_mac_stc-${WX_VERSION} -lwx_mac_xrc-${WX_VERSION}"
+ LIBS="$LIBS -lwx_mac_stc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*wx_mac_core*)
- LIBS="$LIBS -lwx_mac_stc-${WX_VERSION} -lwx_mac_xrc-${WX_VERSION}"
+ LIBS="$LIBS -lwx_mac_stc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*wx_gtk2ud-*)
- LIBS="$LIBS -lwx_gtk2ud_stc-${WX_VERSION}
-lwx_gtk2ud_xrc-${WX_VERSION}"
+ LIBS="$LIBS -lwx_gtk2ud_stc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*wx_gtk2ud_core*)
- LIBS="$LIBS -lwx_gtk2ud_stc-${WX_VERSION}
-lwx_gtk2ud_xrc-${WX_VERSION}"
+ LIBS="$LIBS -lwx_gtk2ud_stc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*wx_gtk2d-*)
- LIBS="$LIBS -lwx_gtk2d_stc-${WX_VERSION} -lwx_gtk2d_xrc-${WX_VERSION}"
+ LIBS="$LIBS -lwx_gtk2d_stc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*wx_gtk2d_core*)
- LIBS="$LIBS -lwx_gtk2d_stc-${WX_VERSION} -lwx_gtk2d_xrc-${WX_VERSION}"
+ LIBS="$LIBS -lwx_gtk2d_stc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*wx_gtk2u-*)
- LIBS="$LIBS -lwx_gtk2u_stc-${WX_VERSION} -lwx_gtk2u_xrc-${WX_VERSION}"
+ LIBS="$LIBS -lwx_gtk2u_stc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*wx_gtk2u_core*)
- LIBS="$LIBS -lwx_gtk2u_stc-${WX_VERSION} -lwx_gtk2u_xrc-${WX_VERSION}"
+ LIBS="$LIBS -lwx_gtk2u_stc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*wx_gtkud-*)
- LIBS="$LIBS -lwx_gtkud_stc-${WX_VERSION} -lwx_gtkud_xrc-${WX_VERSION}"
+ LIBS="$LIBS -lwx_gtkud_stc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*wx_gtkud_core*)
- LIBS="$LIBS -lwx_gtkud_stc-${WX_VERSION} -lwx_gtkud_xrc-${WX_VERSION}"
+ LIBS="$LIBS -lwx_gtkud_stc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*wx_gtkd-*)
- LIBS="$LIBS -lwx_gtkd_stc-${WX_VERSION} -lwx_gtkd_xrc-${WX_VERSION}"
+ LIBS="$LIBS -lwx_gtkd_stc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*wx_gtkd_core*)
- LIBS="$LIBS -lwx_gtkd_stc-${WX_VERSION} -lwx_gtkd_xrc-${WX_VERSION}"
+ LIBS="$LIBS -lwx_gtkd_stc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*wx_gtk-*)
- LIBS="$LIBS -lwx_gtk_stc-${WX_VERSION} -lwx_gtk_xrc-${WX_VERSION}"
+ LIBS="$LIBS -lwx_gtk_stc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*wx_gtk_core*)
- LIBS="$LIBS -lwx_gtk_stc-${WX_VERSION} -lwx_gtk_xrc-${WX_VERSION}"
+ LIBS="$LIBS -lwx_gtk_stc-${WX_VERSION}"
LIBS="$LIBS $WX_NEW_LDFLAGS"
;;
*)
@@ -446,11 +446,6 @@
AC_MSG_ERROR([you need to install the stc package from
wxWindows/contrib/src/stc])
wx_wx_h="no"
fi
- if test ! -f "${WX_HOME}/include/wx-2.5/wx/xrc/xmlres.h"
- then
- AC_MSG_ERROR([you need to install the xrc package from
wxWindows/contrib/src/xrc])
- wx_wx_h="no"
- fi
if test "$wx_wx_h" = "yes"
then
AC_MSG_CHECKING([wxWindows in ${WX_HOME}])
Index: pgAdmin3.dsp
===================================================================
RCS file: /projects/pgadmin3/src/pgAdmin3.dsp,v
retrieving revision 1.115
retrieving revision 1.116
diff -Lsrc/pgAdmin3.dsp -Lsrc/pgAdmin3.dsp -u -w -r1.115 -r1.116
--- src/pgAdmin3.dsp
+++ src/pgAdmin3.dsp
@@ -43,20 +43,20 @@
# PROP Intermediate_Dir "Unicode_SSL_Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include/" /I
"c:/wxWindows_2.5/include" /I "c:/wxWindows_2.5/contrib/include" /I
"c:/wxWindows_2.5/lib/mswd" /I "c:/postgresql/include" /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__"
/D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D "_UNICODE" /D
"UNICODE" /FAcs /FR /FD /c
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include/" /I
"c:/wxWidgets-2.5.3/include" /I "c:/wxWidgets-2.5.3/contrib/include" /I
"c:/wxWidgets-2.5.3/lib/mswd" /I "c:/postgresql/include" /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__"
/D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D "_UNICODE" /D
"UNICODE" /FAcs /FR /FD /c
# SUBTRACT BASE CPP /YX /Yc /Yu
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "c:/wxWidgets/include" /I
"c:/wxWidgets/contrib/include" /I "c:/postgresql/include" /I "include/" /I
"agent/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__"
/D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT"
/D wxUSE_UNICODE=1 /D "_UNICODE" /D "UNICODE" /D "SSL" /FAcs /Yu"pgadmin3.h" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "c:/wxWidgets-2.5.3/include" /I
"c:/wxWidgets-2.5.3/contrib/include" /I "c:/postgresql/include" /I "include/" /I
"agent/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__"
/D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT"
/D wxUSE_UNICODE=1 /D "_UNICODE" /D "UNICODE" /D "SSL" /FAcs /Yu"pgadmin3.h" /FD /c
# SUBTRACT CPP /Fr
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x809 /i "c:/wxWindows_2.5/include" /i
"c:/wxWindows_2.5/contrib/include" /d "_DEBUG"
-# ADD RSC /l 0x809 /i "c:/wxWidgets/include" /d "_DEBUG"
+# ADD BASE RSC /l 0x809 /i "c:/wxWidgets-2.5.3/include" /i
"c:/wxWidgets-2.5.3/contrib/include" /d "_DEBUG"
+# ADD RSC /l 0x809 /i "c:/wxWidgets-2.5.3/include" /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswud.lib pngd.lib zlibd.lib jpegd.lib
tiffd.lib stcd.lib libpq.lib wxxrcd.lib regexd.lib /nologo /subsystem:windows /map
/debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib"
/nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"c:/wxWindows_2.5/lib"
/libpath:"c:/wxWindows_2.5/contrib/lib" /libpath:"c:/postgresql/lib"
-# ADD LINK32 libpq.lib wxbase25ud.lib wxbase25ud_xml.lib wxbase25ud_net.lib
wxmsw25ud_adv.lib wxmsw25ud_core.lib wxmsw25ud_html.lib wxregexud.lib wxpngd.lib
wxzlibd.lib wxjpegd.lib wxtiffd.lib wxmsw25ud_stc.lib wxmsw25ud_xrc.lib wxexpatd.lib
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
uuid.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib ole32.lib oleaut32.lib /nologo
/subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libcd.lib"
/nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept
/libpath:"c:/wxWidgets/lib/vc_lib" /libpath:"c:/postgresql/lib"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswud.lib pngd.lib zlibd.lib jpegd.lib
tiffd.lib stcd.lib libpq.lib wxxrcd.lib regexd.lib /nologo /subsystem:windows /map
/debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib"
/nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"c:/wxWidgets-2.5.3/lib"
/libpath:"c:/wxWidgets-2.5.3/contrib/lib" /libpath:"c:/postgresql/lib"
+# ADD LINK32 libpq.lib wxbase25ud.lib wxbase25ud_xml.lib wxbase25ud_net.lib
wxmsw25ud_adv.lib wxmsw25ud_core.lib wxmsw25ud_html.lib wxregexud.lib wxpngd.lib
wxzlibd.lib wxjpegd.lib wxtiffd.lib wxmsw25ud_stc.lib wxmsw25ud_xrc.lib wxexpatd.lib
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib
uuid.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib ole32.lib oleaut32.lib /nologo
/subsystem:windows /map /debug /machine:I386 /nodefaultlib:"libcd.lib"
/nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept
/libpath:"c:/wxWidgets-2.5.3/lib/vc_lib" /libpath:"c:/postgresql/lib"
!ELSEIF "$(CFG)" == "pgAdmin3 - Win32 Unicode SSL Release"
@@ -72,19 +72,19 @@
# PROP Intermediate_Dir "Unicode_SSL_Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /O2 /Ob2 /I "include/" /I
"c:/wxWindows_2.5/include" /I "c:/wxWindows_2.5/contrib/include" /I
"c:/wxWindows_2.5/lib/mswd" /I "c:/postgresql/include" /D "NDEBUG" /D "WIN32" /D
"_WINDOWS" /D "__WINDOWS__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT"
/D wxUSE_UNICODE=1 /D "_UNICODE" /D "UNICODE" /D "EMBED_XRC" /FAcs /FR /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /O2 /Ob2 /I "c:/wxWidgets/include" /I
"c:/wxWidgets/contrib/include" /I "c:/postgresql/include" /I "include/" /I
"agent/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WIN95__"
/D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D "_UNICODE" /D
"UNICODE" /D "EMBED_XRC" /D "SSL" /FAcs /FR /Yu"pgadmin3.h" /FD /c
+# ADD BASE CPP /nologo /MDd /W3 /GX /O2 /Ob2 /I "include/" /I
"c:/wxWidgets-2.5.3/include" /I "c:/wxWidgets-2.5.3/contrib/include" /I
"c:/wxWidgets-2.5.3/lib/mswd" /I "c:/postgresql/include" /D "NDEBUG" /D "WIN32" /D
"_WINDOWS" /D "__WINDOWS__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT"
/D wxUSE_UNICODE=1 /D "_UNICODE" /D "UNICODE" /D "EMBED_XRC" /FAcs /FR /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /O2 /Ob2 /I "c:/wxWidgets-2.5.3/include" /I
"c:/wxWidgets-2.5.3/contrib/include" /I "c:/postgresql/include" /I "include/" /I
"agent/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WIN95__"
/D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D wxUSE_UNICODE=1 /D "_UNICODE" /D
"UNICODE" /D "EMBED_XRC" /D "SSL" /FAcs /FR /Yu"pgadmin3.h" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
-# ADD BASE RSC /l 0x809 /i "c:/wxWindows_2.5/include" /i
"c:/wxWindows_2.5/contrib/include" /d "NDEBUG"
-# ADD RSC /l 0x809 /i "c:/wxWidgets/include" /d "NDEBUG"
+# ADD BASE RSC /l 0x809 /i "c:/wxWidgets-2.5.3/include" /i
"c:/wxWidgets-2.5.3/contrib/include" /d "NDEBUG"
+# ADD RSC /l 0x809 /i "c:/wxWidgets-2.5.3/include" /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswu.lib png.lib zlib.lib jpeg.lib
tiff.lib stc.lib libpq.lib wxxrc.lib regex.lib /nologo /subsystem:windows /map
/machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib"
/nodefaultlib:"msvcrtd.lib" /pdbtype:sept /libpath:"c:/wxWindows_2.5/lib"
/libpath:"c:/wxWindows_2.5/contrib/lib" /libpath:"c:/postgresql/lib"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswu.lib png.lib zlib.lib jpeg.lib
tiff.lib stc.lib libpq.lib wxxrc.lib regex.lib /nologo /subsystem:windows /map
/machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib"
/nodefaultlib:"msvcrtd.lib" /pdbtype:sept /libpath:"c:/wxWidgets-2.5.3/lib"
/libpath:"c:/wxWidgets-2.5.3/contrib/lib" /libpath:"c:/postgresql/lib"
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 libpq.lib wxbase25u.lib wxbase25u_xml.lib wxbase25u_net.lib
wxmsw25u_adv.lib wxmsw25u_core.lib wxmsw25u_html.lib wxregexu.lib wxpng.lib wxzlib.lib
wxjpeg.lib wxtiff.lib wxmsw25u_stc.lib wxmsw25u_xrc.lib wxexpat.lib kernel32.lib
user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib
comctl32.lib rpcrt4.lib wsock32.lib winmm.lib ole32.lib oleaut32.lib /nologo
/subsystem:windows /map /machine:I386 /nodefaultlib:"libcd.lib"
/nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /pdbtype:sept
/libpath:"c:/wxWidgets/lib/vc_lib" /libpath:"c:/postgresql/lib"
+# ADD LINK32 libpq.lib wxbase25u.lib wxbase25u_xml.lib wxbase25u_net.lib
wxmsw25u_adv.lib wxmsw25u_core.lib wxmsw25u_html.lib wxregexu.lib wxpng.lib wxzlib.lib
wxjpeg.lib wxtiff.lib wxmsw25u_stc.lib wxmsw25u_xrc.lib wxexpat.lib kernel32.lib
user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib
comctl32.lib rpcrt4.lib wsock32.lib winmm.lib ole32.lib oleaut32.lib /nologo
/subsystem:windows /map /machine:I386 /nodefaultlib:"libcd.lib"
/nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /pdbtype:sept
/libpath:"c:/wxWidgets-2.5.3/lib/vc_lib" /libpath:"c:/postgresql/lib"
# SUBTRACT LINK32 /pdb:none
!ENDIF
Index: pgAdmin3.rc
===================================================================
RCS file: /projects/pgadmin3/src/ui/pgAdmin3.rc,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lsrc/ui/pgAdmin3.rc -Lsrc/ui/pgAdmin3.rc -u -w -r1.10 -r1.11
--- src/ui/pgAdmin3.rc
+++ src/ui/pgAdmin3.rc
@@ -9,6 +9,10 @@
//
//////////////////////////////////////////////////////////////////////////
+#if defined(_WIN32_WCE)
+#undef _WIN32_WCE
+#endif
+
#include <wx/msw/wx.rc>
#include <ver.h>
#include "../include/version.h"
---------------------------(end of broadcast)---------------------------
TIP 5: Have you checked our extensive FAQ?
http://www.postgresql.org/docs/faqs/FAQ.html
