Update to 1.2.0

16 files changed, 10 insertions, 414 deletions

diff --git a/databases/pgadmin3/files/patch-configure b/databases/pgadmin3/files/patch-configure
index b7e190df8f3c..ecf91d0e2b9d 100644
--- a/databases/pgadmin3/files/patch-configure
+++ b/databases/pgadmin3/files/patch-configure
@@ -1,66 +1,13 @@
---- configure.orig	Fri Nov 28 17:36:36 2003
-+++ configure	Fri Nov 26 00:24:05 2004
-@@ -4844,10 +4844,10 @@
-     echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-     WX_HOME=/usr/local/wx2
--    if test ! -f "${WX_HOME}/include/wx/wx.h"
-+    if test ! -f "${WX_HOME}/include/wx-2.5/wx/wx.h"
-     then
-         WX_HOME=/usr/local
--        if test ! -f "${WX_HOME}/include/wx/wx.h"
-+        if test ! -f "${WX_HOME}/include/wx-2.5/wx/wx.h"
-         then
-             WX_HOME=/usr
-         fi
-@@ -5017,7 +5017,7 @@
-                 LIBS="$LIBS -lwx_gtk2d_stc-${WX_VERSION} -lwx_gtk2d_xrc-${WX_VERSION}"
+--- configure.orig	Tue Nov 30 02:09:55 2004
++++ configure	Wed Jan  5 19:00:36 2005
+@@ -5175,6 +5175,10 @@
+                 LIBS="$LIBS -lwx_gtk2u_stc-${WX_VERSION}"
                  LIBS="$LIBS $WX_NEW_LDFLAGS"
                  ;;
--            *wx_gtk2u-*)
-+            *wx_gtk2u*)
-                 LIBS="$LIBS -lwx_gtk2u_stc-${WX_VERSION} -lwx_gtk2u_xrc-${WX_VERSION}"
-                 LIBS="$LIBS $WX_NEW_LDFLAGS"
-                 ;;
-@@ -5033,13 +5033,18 @@
-                 LIBS="$LIBS -lwx_gtk_stc-${WX_VERSION} -lwx_gtk_xrc-${WX_VERSION}"
-                 LIBS="$LIBS $WX_NEW_LDFLAGS"
-                 ;;
-+            *wx_gtk2*)
-+                LIBS="$LIBS -lwx_gtk2_stc-${WX_VERSION} -lwx_gtk2_xrc-${WX_VERSION}"
++            *wx_gtk2_core*)
++                LIBS="$LIBS -lwx_gtk2_stc-${WX_VERSION}"
 +                LIBS="$LIBS $WX_NEW_LDFLAGS"
-+		;;
-             *)
-                 ;;
-         esac
-     fi
-+    LIBS="$LIBS $PTHREAD_LIBS"
- 
-     WX_NEW_CPPFLAGS=`${WX_CONFIG} --cxxflags`
--    CPPFLAGS="$CPPFLAGS $WX_NEW_CPPFLAGS -I${WX_HOME}/include"
-+    CPPFLAGS="$CPPFLAGS $WX_NEW_CPPFLAGS -I${WX_HOME}/include ${PTHREAD_CFLAGS}"
-     case "${host}" in
-         *-apple-darwin*)
-             CPPFLAGS="$CPPFLAGS -no-cpp-precomp -fno-rtti"
-@@ -5048,18 +5053,18 @@
-             ;;
-     esac
-     wx_wx_h="yes"
--    if test ! -f "${WX_HOME}/include/wx/version.h"
-+    if test ! -f "${WX_HOME}/include/wx-2.5/wx/version.h"
-     then
-         wx_wx_h="no"
-     fi
--    if test ! -f "${WX_HOME}/include/wx/stc/stc.h"
-+    if test ! -f "${WX_HOME}/include/wx-2.5/wx/stc/stc.h"
-     then
-         { { echo "$as_me:$LINENO: error: you need to install the stc package from wxWindows/contrib/src/stc" >&5
- echo "$as_me: error: you need to install the stc package from wxWindows/contrib/src/stc" >&2;}
-    { (exit 1); exit 1; }; }
-         wx_wx_h="no"
-     fi
--    if test ! -f "${WX_HOME}/include/wx/xrc/xmlres.h"
-+    if test ! -f "${WX_HOME}/include/wx-2.5/wx/xrc/xmlres.h"
-     then
-         { { echo "$as_me:$LINENO: error: you need to install the xrc package from wxWindows/contrib/src/xrc" >&5
- echo "$as_me: error: you need to install the xrc package from wxWindows/contrib/src/xrc" >&2;}
++                ;;
+             *wx_gtkud-*)
+                 LIBS="$LIBS -lwx_gtkud_stc-${WX_VERSION}"
+                 LIBS="$LIBS $WX_NEW_LDFLAGS"
diff --git a/databases/pgadmin3/files/patch-src-include-dlgForeignKey.h b/databases/pgadmin3/files/patch-src-include-dlgForeignKey.h
deleted file mode 100644
index 5b0f93795398..000000000000
--- a/databases/pgadmin3/files/patch-src-include-dlgForeignKey.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/include/dlgForeignKey.h.orig	Mon Jun 28 01:12:17 2004
-+++ src/include/dlgForeignKey.h	Mon Jun 28 01:12:29 2004
-@@ -35,7 +35,7 @@
- 
-     void OnChange(wxNotifyEvent &ev);
-     void OnCheckDeferrable(wxNotifyEvent &ev);
--    void OnSelChangeCol(wxNotifyEvent &ev);
-+    void OnSelChangeCol(wxListEvent &ev);
-     void OnSelChangeRef(wxNotifyEvent &ev);
-     void OnSelChangeRefCol(wxNotifyEvent &ev);
-     void OnAddRef(wxNotifyEvent &ev);
diff --git a/databases/pgadmin3/files/patch-src-include-dlgFunction.h b/databases/pgadmin3/files/patch-src-include-dlgFunction.h
deleted file mode 100644
index 519ae51d784d..000000000000
--- a/databases/pgadmin3/files/patch-src-include-dlgFunction.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/include/dlgFunction.h.orig	Mon Jun 28 00:49:55 2004
-+++ src/include/dlgFunction.h	Mon Jun 28 00:50:16 2004
-@@ -33,6 +33,7 @@
-     pgFunction *function;
- 
-     void OnChange(wxNotifyEvent &ev);
-+    void OnChangeStyled(wxStyledTextEvent &ev);
-     void OnSelChangeLanguage(wxNotifyEvent &ev);
-     void OnSelChangeArg(wxNotifyEvent &ev);
-     void OnSelChangeType(wxNotifyEvent &ev);
diff --git a/databases/pgadmin3/files/patch-src-include-dlgRule.h b/databases/pgadmin3/files/patch-src-include-dlgRule.h
deleted file mode 100644
index 95c28f0451ec..000000000000
--- a/databases/pgadmin3/files/patch-src-include-dlgRule.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/include/dlgRule.h.orig	Mon Jun 28 00:58:04 2004
-+++ src/include/dlgRule.h	Mon Jun 28 00:58:20 2004
-@@ -34,6 +34,7 @@
-     wxString oldDefinition;
- 
-     void OnChange(wxNotifyEvent &ev);
-+    void OnChangeStyled(wxStyledTextEvent &ev);
- 
-     bool didChange();
- 
diff --git a/databases/pgadmin3/files/patch-src-include-dlgTable.h b/databases/pgadmin3/files/patch-src-include-dlgTable.h
deleted file mode 100644
index 357ba5424224..000000000000
--- a/databases/pgadmin3/files/patch-src-include-dlgTable.h
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/include/dlgTable.h.orig	Mon Aug 11 17:36:55 2003
-+++ src/include/dlgTable.h	Mon Jun 28 00:41:25 2004
-@@ -32,19 +32,19 @@
-     pgSchema *schema;
-     pgTable *table;
- 
--    void OnChange(wxNotifyEvent &ev);
-+    void OnChange(wxCommandEvent &ev);
- 
--    void OnAddTable(wxNotifyEvent &ev);
--    void OnRemoveTable(wxNotifyEvent &ev);
--    void OnSelChangeTable(wxListEvent &ev);
-+    void OnAddTable(wxCommandEvent &ev);
-+    void OnRemoveTable(wxCommandEvent &ev);
-+    void OnSelChangeTable(wxCommandEvent &ev);
- 
--    void OnAddCol(wxNotifyEvent &ev);
--    void OnChangeCol(wxNotifyEvent &ev);
--    void OnRemoveCol(wxNotifyEvent &ev);
-+    void OnAddCol(wxCommandEvent &ev);
-+    void OnChangeCol(wxCommandEvent &ev);
-+    void OnRemoveCol(wxCommandEvent &ev);
-     void OnSelChangeCol(wxListEvent &ev);
- 
--    void OnAddConstr(wxNotifyEvent &ev);
--    void OnRemoveConstr(wxNotifyEvent &ev);
-+    void OnAddConstr(wxCommandEvent &ev);
-+    void OnRemoveConstr(wxCommandEvent &ev);
-     void OnSelChangeConstr(wxListEvent &ev);
- 
-     void FillConstraint();
diff --git a/databases/pgadmin3/files/patch-src-include-dlgView.h b/databases/pgadmin3/files/patch-src-include-dlgView.h
deleted file mode 100644
index 8d77181ae8f1..000000000000
--- a/databases/pgadmin3/files/patch-src-include-dlgView.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/include/dlgView.h.orig	Mon Jun 28 00:53:54 2004
-+++ src/include/dlgView.h	Mon Jun 28 00:54:12 2004
-@@ -34,6 +34,7 @@
-     wxString oldDefinition;
- 
-     void OnChange(wxNotifyEvent &ev);
-+    void OnChangeStyled(wxStyledTextEvent &ev);
- 
-     ctlSQLBox *sqlBox;
- 
diff --git a/databases/pgadmin3/files/patch-src-include-frmQuery.h b/databases/pgadmin3/files/patch-src-include-frmQuery.h
deleted file mode 100644
index 1c9862ea2e0f..000000000000
--- a/databases/pgadmin3/files/patch-src-include-frmQuery.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/include/frmQuery.h.orig	Mon Aug  4 04:39:32 2003
-+++ src/include/frmQuery.h	Mon Jun 28 00:41:25 2004
-@@ -48,7 +48,7 @@
-     void OnSave(wxCommandEvent& event);
-     void OnSaveAs(wxCommandEvent& event);
-     void OnExport(wxCommandEvent& event);
--    void OnChange(wxNotifyEvent& event);
-+    void OnChange(wxStyledTextEvent& event);
-     void OnExit(wxCommandEvent& event);
-     void OnRecent(wxCommandEvent& event);
-     void OnCut(wxCommandEvent& event);
diff --git a/databases/pgadmin3/files/patch-src-include-frmStatus.h b/databases/pgadmin3/files/patch-src-include-frmStatus.h
deleted file mode 100644
index dc7df8db2fd2..000000000000
--- a/databases/pgadmin3/files/patch-src-include-frmStatus.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/include/frmStatus.h.orig	Mon Jun 28 01:16:59 2004
-+++ src/include/frmStatus.h	Mon Jun 28 01:21:48 2004
-@@ -35,7 +35,9 @@
-     void OnHelp(wxCommandEvent& ev);
-     void OnClose(wxCommandEvent &event);
-     void OnRefresh(wxCommandEvent &event);
-+    void OnRefreshTimer(wxTimerEvent &event);
-     void OnRateChange(wxCommandEvent &event);
-+    void OnRateChangeSpin(wxSpinEvent &event);
-     frmMain *mainForm;
-     pgConn *connection;
-     long backend_pid;
diff --git a/databases/pgadmin3/files/patch-src-ui-dlgForeignKey.cpp b/databases/pgadmin3/files/patch-src-ui-dlgForeignKey.cpp
deleted file mode 100644
index 65acd54c72a4..000000000000
--- a/databases/pgadmin3/files/patch-src-ui-dlgForeignKey.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ui/dlgForeignKey.cpp.orig	Mon Jun 28 01:12:47 2004
-+++ src/ui/dlgForeignKey.cpp	Mon Jun 28 01:13:06 2004
-@@ -87,7 +87,7 @@
- }
- 
- 
--void dlgForeignKey::OnSelChangeCol(wxNotifyEvent &ev)
-+void dlgForeignKey::OnSelChangeCol(wxListEvent &ev)
- {
-     btnRemoveRef->Enable();
- }
diff --git a/databases/pgadmin3/files/patch-src-ui-dlgFunction.cpp b/databases/pgadmin3/files/patch-src-ui-dlgFunction.cpp
deleted file mode 100644
index 68cf8f7178b3..000000000000
--- a/databases/pgadmin3/files/patch-src-ui-dlgFunction.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/ui/dlgFunction.cpp.orig	Mon Jun 28 00:48:47 2004
-+++ src/ui/dlgFunction.cpp	Mon Jun 28 00:49:42 2004
-@@ -61,7 +61,7 @@
-     EVT_CHECKBOX(XRCID("chkSecureDefiner"),         dlgFunction::OnChange)
-     EVT_TEXT(XRCID("txtObjectFile"),                dlgFunction::OnChange)
-     EVT_TEXT(XRCID("txtLinkSymbol"),                dlgFunction::OnChange)
--    EVT_STC_MODIFIED(CTL_SQLBOX,                    dlgFunction::OnChange)
-+    EVT_STC_MODIFIED(CTL_SQLBOX,                    dlgFunction::OnChangeStyled)
- 
-     EVT_TEXT(XRCID("cbReturntype"),                 dlgFunction::OnChange)
-     EVT_TEXT(XRCID("cbDatatype"),                   dlgFunction::OnSelChangeType)
-@@ -251,6 +251,11 @@
-     }
- }
- 
-+
-+void dlgFunction::OnChangeStyled(wxStyledTextEvent &ev)
-+{
-+    OnChange(ev);
-+}
- 
- void dlgFunction::ReplaceSizer(wxWindow *w, bool isC, int border)
- {
diff --git a/databases/pgadmin3/files/patch-src-ui-dlgRule.cpp b/databases/pgadmin3/files/patch-src-ui-dlgRule.cpp
deleted file mode 100644
index 15f7d79c8e4b..000000000000
--- a/databases/pgadmin3/files/patch-src-ui-dlgRule.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/ui/dlgRule.cpp.orig	Mon Jun 28 00:57:12 2004
-+++ src/ui/dlgRule.cpp	Mon Jun 28 00:57:52 2004
-@@ -47,7 +47,7 @@
-     EVT_CHECKBOX(XRCID("chkDelete"),                dlgRule::OnChange)
-     EVT_CHECKBOX(XRCID("chkDoInstead"),             dlgRule::OnChange)
-     EVT_RADIOBOX(XRCID("rbxEvent"),                 dlgRule::OnChange)
--    EVT_STC_MODIFIED(CTL_SQLBOX,                    dlgRule::OnChange)
-+    EVT_STC_MODIFIED(CTL_SQLBOX,                    dlgRule::OnChangeStyled)
- END_EVENT_TABLE();
- 
- 
-@@ -166,6 +166,12 @@
- 
-         EnableOK(enable);
-     }
-+}
-+
-+
-+void dlgRule::OnChangeStyled(wxStyledTextEvent &ev)
-+{
-+    OnChange(ev);
- }
- 
- 
diff --git a/databases/pgadmin3/files/patch-src-ui-dlgTable.cpp b/databases/pgadmin3/files/patch-src-ui-dlgTable.cpp
deleted file mode 100644
index 218edf5e2e24..000000000000
--- a/databases/pgadmin3/files/patch-src-ui-dlgTable.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
---- src/ui/dlgTable.cpp.orig	Tue Oct  7 17:20:42 2003
-+++ src/ui/dlgTable.cpp	Mon Jun 28 00:41:25 2004
-@@ -491,7 +491,7 @@
- }
- 
- 
--void dlgTable::OnChange(wxNotifyEvent &ev)
-+void dlgTable::OnChange(wxCommandEvent &ev)
- {
-     if (table)
-     {
-@@ -520,7 +520,7 @@
- }
- 
- 
--void dlgTable::OnAddTable(wxNotifyEvent &ev)
-+void dlgTable::OnAddTable(wxCommandEvent &ev)
- {
-     int sel=cbTables->GetSelection();
-     if (sel >= 0)
-@@ -552,7 +552,7 @@
- }
- 
- 
--void dlgTable::OnRemoveTable(wxNotifyEvent &ev)
-+void dlgTable::OnRemoveTable(wxCommandEvent &ev)
- {
-     int sel=lbTables->GetSelection();
-     if (sel >= 0)
-@@ -576,13 +576,13 @@
- }
- 
- 
--void dlgTable::OnSelChangeTable(wxListEvent &ev)
-+void dlgTable::OnSelChangeTable(wxCommandEvent &ev)
- {
-     btnRemoveTable->Enable();
- }
- 
- 
--void dlgTable::OnChangeCol(wxNotifyEvent &ev)
-+void dlgTable::OnChangeCol(wxCommandEvent &ev)
- {
-     long pos=GetListSelected(lstColumns);
-     pgColumn *column=(pgColumn*) StrToLong(GetListText(lstColumns, pos, 4));
-@@ -596,30 +596,30 @@
-         lstColumns->SetItem(pos, 1, col.GetDefinition());
-         lstColumns->SetItem(pos, 3, col.GetSql());
-     }
--    wxNotifyEvent event;
-+    wxCommandEvent event;
-     OnChange(event);
- }
- 
- 
--void dlgTable::OnAddCol(wxNotifyEvent &ev)
-+void dlgTable::OnAddCol(wxCommandEvent &ev)
- {
-     dlgColumn col(mainForm, NULL, table);
-     col.CenterOnParent();
-     col.SetConnection(connection);
-     if (col.Go(true) >= 0)
-         AppendListItem(lstColumns, col.GetName(), col.GetDefinition(), PGICON_COLUMN);
--    wxNotifyEvent event;
-+    wxCommandEvent event;
-     OnChange(event);
- }
- 
- 
--void dlgTable::OnRemoveCol(wxNotifyEvent &ev)
-+void dlgTable::OnRemoveCol(wxCommandEvent &ev)
- {
-     lstColumns->DeleteItem(GetListSelected(lstColumns));
- 
-     btnRemoveCol->Disable();
- 
--    wxNotifyEvent event;
-+    wxCommandEvent event;
-     OnChange(event);
- }
- 
-@@ -634,7 +634,7 @@
- }
- 
- 
--void dlgTable::OnAddConstr(wxNotifyEvent &ev)
-+void dlgTable::OnAddConstr(wxCommandEvent &ev)
- {
-     int sel=cbConstrType->GetSelection();
-     if (hasPK)
-@@ -687,12 +687,12 @@
-             break;
-         }
-     }
--    wxNotifyEvent event;
-+    wxCommandEvent event;
-     OnChange(event);
- }
- 
- 
--void dlgTable::OnRemoveConstr(wxNotifyEvent &ev)
-+void dlgTable::OnRemoveConstr(wxCommandEvent &ev)
- {
-     int pos=GetListSelected(lstConstraints);
-     if (pos < 0)
-@@ -711,7 +711,7 @@
-     
-     lstConstraints->DeleteItem(pos);
-     btnRemoveConstr->Disable();
--    wxNotifyEvent event;
-+    wxCommandEvent event;
-     OnChange(event);
- }
- 
diff --git a/databases/pgadmin3/files/patch-src-ui-dlgView.cpp b/databases/pgadmin3/files/patch-src-ui-dlgView.cpp
deleted file mode 100644
index 5d7ac2be643e..000000000000
--- a/databases/pgadmin3/files/patch-src-ui-dlgView.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/ui/dlgView.cpp.orig	Mon Jun 28 00:52:41 2004
-+++ src/ui/dlgView.cpp	Mon Jun 28 00:53:38 2004
-@@ -36,7 +36,7 @@
- BEGIN_EVENT_TABLE(dlgView, dlgSecurityProperty)
-     EVT_TEXT(XRCID("txtName"),                      dlgView::OnChange)
-     EVT_TEXT(XRCID("txtComment"),                   dlgView::OnChange)
--    EVT_STC_MODIFIED(CTL_SQLBOX,                    dlgView::OnChange)
-+    EVT_STC_MODIFIED(CTL_SQLBOX,                    dlgView::OnChangeStyled)
- END_EVENT_TABLE();
- 
- 
-@@ -117,6 +117,12 @@
- 
-         EnableOK(enable);
-     }
-+}
-+
-+
-+void dlgView::OnChangeStyled(wxStyledTextEvent &ev)
-+{
-+    OnChange(ev);
- }
- 
- 
diff --git a/databases/pgadmin3/files/patch-src-ui-events.cpp b/databases/pgadmin3/files/patch-src-ui-events.cpp
deleted file mode 100644
index 1797bf938f3e..000000000000
--- a/databases/pgadmin3/files/patch-src-ui-events.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/ui/events.cpp.orig	Mon Jun 28 01:22:51 2004
-+++ src/ui/events.cpp	Mon Jun 28 01:22:38 2004
-@@ -18,6 +18,7 @@
- #include <wx/imaglist.h>
- #include <wx/tipdlg.h>
- #include <wx/stc/stc.h>
-+#include <wx/spinctrl.h>
- 
- // App headers
- #include "pgAdmin3.h"
diff --git a/databases/pgadmin3/files/patch-src-ui-frmQuery.cpp b/databases/pgadmin3/files/patch-src-ui-frmQuery.cpp
deleted file mode 100644
index e4f290a8db03..000000000000
--- a/databases/pgadmin3/files/patch-src-ui-frmQuery.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ui/frmQuery.cpp.orig	Mon Sep  8 17:36:08 2003
-+++ src/ui/frmQuery.cpp	Mon Jun 28 00:41:25 2004
-@@ -587,7 +587,7 @@
- }
- 
- 
--void frmQuery::OnChange(wxNotifyEvent& event)
-+void frmQuery::OnChange(wxStyledTextEvent& event)
- {
-     if (!changed)
-     {
diff --git a/databases/pgadmin3/files/patch-src-ui-frmStatus.cpp b/databases/pgadmin3/files/patch-src-ui-frmStatus.cpp
deleted file mode 100644
index 2704d96408ac..000000000000
--- a/databases/pgadmin3/files/patch-src-ui-frmStatus.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/ui/frmStatus.cpp.orig	Mon Jun 28 01:15:25 2004
-+++ src/ui/frmStatus.cpp	Mon Jun 28 01:25:17 2004
-@@ -26,9 +26,9 @@
- BEGIN_EVENT_TABLE(frmStatus, wxDialog)
-     EVT_BUTTON(XRCID("btnRefresh"),         frmStatus::OnRefresh)
-     EVT_BUTTON (XRCID("btnClose"),          frmStatus::OnClose)
--    EVT_SPINCTRL(XRCID("spnRefreshRate"),   frmStatus::OnRateChange)
-+    EVT_SPINCTRL(XRCID("spnRefreshRate"),   frmStatus::OnRateChangeSpin)
-     EVT_TEXT(XRCID("spnRefreshRate"),       frmStatus::OnRateChange)
--    EVT_TIMER(TIMER_ID,                     frmStatus::OnRefresh)
-+    EVT_TIMER(TIMER_ID,                     frmStatus::OnRefreshTimer)
- END_EVENT_TABLE();
- 
- 
-@@ -112,6 +112,11 @@
- }
- 
- 
-+void frmStatus::OnRateChangeSpin(wxSpinEvent &event)
-+{
-+    OnRateChangeSpin(event);
-+}
-+
- 
- void frmStatus::OnRefresh(wxCommandEvent &event)
- {
-@@ -158,4 +163,12 @@
-             dataSet->MoveNext();
-         }
-     }
-+}
-+
-+
-+void frmStatus::OnRefreshTimer(wxTimerEvent &event)
-+{
-+    wxCommandEvent nullEvent;
-+
-+    OnRefresh(nullEvent);
- }