Index: Makefile.am
===================================================================
RCS file: /projects/pgadmin3/src/Makefile.am,v
retrieving revision 1.96
retrieving revision 1.97
diff -Lsrc/Makefile.am -Lsrc/Makefile.am -u -w -r1.96 -r1.97
--- src/Makefile.am
+++ src/Makefile.am
@@ -50,7 +50,7 @@
 ui/dlgSequence.cpp ui/dlgTrigger.cpp ui/dlgType.cpp \
 ui/dlgCheck.cpp ui/frmStatus.cpp utils/misc.cpp \
 ui/dlgHbaConfig.cpp ui/dlgMainConfig.cpp ui/frmUpdate.cpp \
-ui/frmConfig.cpp ui/frmHbaConfig.cpp ui/frmMainConfig.cpp \
+ui/frmConfig.cpp ui/frmHbaConfig.cpp ui/frmMainConfig.cpp ui/frmHint.cpp \
 utils/sysLogger.cpp utils/sysSettings.cpp \
 utils/utffile.cpp utils/pgconfig.cpp utils/update.cpp \
 slony/slObject.cpp slony/slCluster.cpp slony/slNode.cpp \
@@ -58,7 +58,7 @@
 slony/slSequence.cpp slony/slTable.cpp slony/slSubscription.cpp \
 slony/dlgRepCluster.cpp slony/dlgRepNode.cpp slony/dlgRepListen.cpp \
 slony/dlgRepPath.cpp slony/dlgRepSet.cpp slony/dlgRepSequence.cpp \
-slony/dlgRepSubscription.cpp \
+slony/dlgRepTable.cpp slony/dlgRepSubscription.cpp \
 ui/common/xrcDialogs.cpp
 
 noinst_HEADERS = include/copyright.h include/version.h include/ctlSQLBox.h \
@@ -99,17 +99,20 @@
 include/xh_timespin.h include/xh_calb.h include/xh_sqlbox.h include/xh_ctlcombo.h \
 include/sysSettings.h include/wxgridsel.h include/menu.h\
 include/pgconfig.h include/update.h include/frmUpdate.h \
-include/dlgHbaConfig.h include/dlgMainConfig.h \
+include/dlgHbaConfig.h include/dlgMainConfig.h include/frmHint.h \
 include/frmConfig.h include/frmHbaConfig.h include/frmMainConfig.h \
 agent/include/pgaAgent.h agent/include/pgaJob.h \
 agent/include/pgaStep.h agent/include/pgaSchedule.h\
-agent/include/dlgJob.h agent/include/dlgStep.h agent/include/dlgSchedule.h \
-slony/slObject.h slony/slCluster.h slony/slNode.h \
-slony/slPath.h slony/slListen.h slony/slSet.h \
-slony/slSequence.h slony/slTable.h slony/slSubscription.h \
-slony/dlgRepCluster.h slony/dlgRepNode.h slony/dlgRepListen.h \
-slony/dlgRepPath.h slony/dlgRepSet.h slony/dlgRepSequence.h \
-slony/dlgRepSubscription.h \
+agent/include/dlgJob.h agent/include/dlgStep.h \
+agent/include/dlgSchedule.h slony/include/slObject.h \
+slony/include/slCluster.h slony/include/slNode.h \
+slony/include/slPath.h slony/include/slListen.h \
+slony/include/slSet.h slony/include/slSequence.h \
+slony/include/slTable.h slony/include/slSubscription.h \
+slony/include/dlgRepCluster.h slony/include/dlgRepNode.h \
+slony/include/dlgRepListen.h slony/include/dlgRepPath.h \
+slony/include/dlgRepSet.h slony/include/dlgRepSequence.h \
+slony/include/dlgRepSubscription.h 
 
   
 EXTRA_DIST = pgAdmin3.dsp pgAdmin3.dsw \
@@ -193,6 +196,6 @@
 ui/zh_CN/wxstd.mo \
 ui/zh_TW/wxstd.mo
 
-AM_CXXFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -g -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include
-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -g -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include
-AM_CFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -g -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include
+AM_CXXFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -g -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
+AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -g -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
+AM_CFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -Wall -g -I$(top_srcdir)/src/include -I$(top_srcdir)/src/agent/include -I$(top_srcdir)/src/slony/include
Index: misc.h
===================================================================
RCS file: /projects/pgadmin3/src/include/misc.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -Lsrc/include/misc.h -Lsrc/include/misc.h -u -w -r1.49 -r1.50
--- src/include/misc.h
+++ src/include/misc.h
@@ -49,6 +49,9 @@
 class sysSettings;
 extern sysSettings *settings;
 
+#undef wxStaticCast
+#define wxStaticCast(obj, className) ((className *)(obj))
+
 // making life easier
 #define CTRL(id, typ)           (XRCCTRL(*this, id, typ))
 
Index: pgCollection.cpp
===================================================================
RCS file: /projects/pgadmin3/src/schema/pgCollection.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -Lsrc/schema/pgCollection.cpp -Lsrc/schema/pgCollection.cpp -u -w -r1.38 -r1.39
--- src/schema/pgCollection.cpp
+++ src/schema/pgCollection.cpp
@@ -36,7 +36,7 @@
 #include "pgIndex.h"
 #include "pgRule.h"
 #include "pgTrigger.h"
-#include "../slony/slCluster.h"
+#include "slCluster.h"