head 1.8; access; symbols OPENPKG_E1_MP_HEAD:1.7 OPENPKG_E1_MP:1.7 OPENPKG_1_STABLE_MP:1.1; locks; strict; comment @# @; 1.8 date 2007.01.08.12.59.31; author rse; state dead; branches; next 1.7; commitid lFwwBsw2NXdqHH1s; 1.7 date 2006.12.13.07.48.20; author rse; state Exp; branches; next 1.6; commitid 4sl7HcEkKcnuOkYr; 1.6 date 2005.06.02.18.10.46; author rse; state dead; branches; next 1.5; 1.5 date 2005.04.18.11.48.10; author rse; state Exp; branches; next 1.4; 1.4 date 2005.02.25.11.23.43; author rse; state dead; branches; next 1.3; 1.3 date 2003.09.16.17.39.45; author ms; state Exp; branches; next 1.2; 1.2 date 2003.09.16.08.50.52; author thl; state Exp; branches; next 1.1; 1.1 date 2003.07.26.09.46.49; author rse; state Exp; branches; next ; desc @@ 1.8 log @upgrading package: pgadmin 1.6.1 -> 1.6.2 @ text @Index: src/frm/frmEditGrid.cpp --- src/frm/frmEditGrid.cpp.orig 2006-11-30 11:48:30 +0100 +++ src/frm/frmEditGrid.cpp 2006-12-13 08:08:04 +0100 @@@@ -75,7 +75,7 @@@@ EVT_GRID_EDITOR_SHOWN( frmEditGrid::OnEditorShown) EVT_GRID_EDITOR_HIDDEN( frmEditGrid::OnEditorHidden) EVT_GRID_LABEL_RIGHT_CLICK( frmEditGrid::OnLabelRightClick) - EVT_AUI_PANEBUTTON( frmEditGrid::OnAuiUpdate) + EVT_AUI_PANE_BUTTON( frmEditGrid::OnAuiUpdate) END_EVENT_TABLE() Index: src/frm/frmQuery.cpp --- src/frm/frmQuery.cpp.orig 2006-11-30 11:48:30 +0100 +++ src/frm/frmQuery.cpp 2006-12-13 08:08:34 +0100 @@@@ -103,7 +103,7 @@@@ EVT_ACTIVATE( frmQuery::OnActivate) EVT_STC_MODIFIED(CTL_SQLQUERY, frmQuery::OnChangeStc) EVT_STC_UPDATEUI(CTL_SQLQUERY, frmQuery::OnPositionStc) - EVT_AUI_PANECLOSE( frmQuery::OnAuiUpdate) + EVT_AUI_PANE_CLOSE( frmQuery::OnAuiUpdate) END_EVENT_TABLE() frmQuery::frmQuery(frmMain *form, const wxString& _title, pgConn *_conn, const wxString& query) Index: src/main/events.cpp --- src/main/events.cpp.orig 2006-11-30 11:48:30 +0100 +++ src/main/events.cpp 2006-12-13 08:09:52 +0100 @@@@ -71,7 +71,7 @@@@ EVT_STC_UPDATEUI(CTL_SQLPANE, frmMain::OnPositionStc) EVT_CLOSE( frmMain::OnClose) - EVT_AUI_PANECLOSE( frmMain::OnAuiUpdate) + EVT_AUI_PANE_CLOSE( frmMain::OnAuiUpdate) #ifdef __WXGTK__ EVT_TREE_KEY_DOWN(CTL_BROWSER, frmMain::OnTreeKeyDown) @ 1.7 log @fix building under WX 2.8 @ text @@ 1.6 log @upgrading package: pgadmin 1.2.1 -> 1.2.2 @ text @d1 10 a10 28 Index: configure --- configure.orig 2005-03-29 14:20:05 +0200 +++ configure 2005-04-18 13:37:59 +0200 @@@@ -4948,10 +4948,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-2.5/wx/wx.h" + if test ! -f "${WX_HOME}/include/wx-2.6/wx/wx.h" then WX_HOME=/usr/local - if test ! -f "${WX_HOME}/include/wx-2.5/wx/wx.h" + if test ! -f "${WX_HOME}/include/wx-2.6/wx/wx.h" then WX_HOME=/usr fi @@@@ -5006,6 +5006,9 @@@@ # Which version of wxWindows is this? WX_VERSION=`${WX_CONFIG} --version` case "${WX_VERSION}" in + 2.6*) + WX_VERSION="2.6" + ;; 2.5*) WX_VERSION="2.5" ;; @@@@ -5219,7 +5222,7 @@@@ fi d12 25 a36 20 WX_NEW_CPPFLAGS=`${WX_CONFIG} --cxxflags` - CPPFLAGS="$CPPFLAGS $WX_NEW_CPPFLAGS -I${WX_HOME}/include/wx-2.5" + CPPFLAGS="$CPPFLAGS $WX_NEW_CPPFLAGS -I${WX_HOME}/include/wx-2.6" case "${host}" in *-apple-darwin*) CPPFLAGS="$CPPFLAGS -no-cpp-precomp -fno-rtti" @@@@ -5228,11 +5231,11 @@@@ ;; esac wx_wx_h="yes" - if test ! -f "${WX_HOME}/include/wx-2.5/wx/version.h" + if test ! -f "${WX_HOME}/include/wx-2.6/wx/version.h" then wx_wx_h="no" fi - if test ! -f "${WX_HOME}/include/wx-2.5/wx/stc/stc.h" + if test ! -f "${WX_HOME}/include/wx-2.6/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;} @ 1.5 log @port to wxGTK 2.6 @ text @@ 1.4 log @upgrading package: pgadmin 1.0.2 -> 1.2.0 @ text @d1 49 a49 15 diff -Naur pgadmin3-0.9.3.orig/src/utils/misc.cpp pgadmin3-0.9.3/src/utils/misc.cpp --- pgadmin3-0.9.3.orig/src/utils/misc.cpp Mon Sep 15 00:25:44 2003 +++ pgadmin3-0.9.3/src/utils/misc.cpp Tue Sep 16 19:16:26 2003 @@@@ -417,9 +417,9 @@@@ { str=wxString(' ', nLen); if (format) - wxConvUTF8.MB2WC((wxChar*)str.c_str(), buf, nLen); + wxConvUTF8.MB2WC((wchar_t*)(str.c_str()), buf, nLen); else - wxConvLibc.MB2WC((wxChar*)str.c_str(), buf, nLen); + wxConvLibc.MB2WC((wchar_t*)(str.c_str()), buf, nLen); str.Replace(wxT("\r"), wxT("")); } #else @ 1.3 log @Recreate patch file to repair misalignement with new vendor sources @ text @@ 1.2 log @upgrading package: pgadmin 0.9.3.20030912 -> 0.9.3.20030916 @ text @d1 3 a3 2 --- /ltmp/thl/openpkg/pgadmin3-0.9.3/src/utils/misc.cpp.orig 2003-09-16 10:11:47.000000000 +0200 +++ /ltmp/thl/openpkg/pgadmin3-0.9.3/src/utils/misc.cpp 2003-09-16 10:12:28.000000000 +0200 @ 1.1 log @new package: pgadmin 0.8.0.20030726 (PostgreSQL Administration GUI) @ text @d1 3 a3 12 --- src/utils/misc.cpp.orig Wed Jul 23 12:27:49 2003 +++ src/utils/misc.cpp Sat Jul 26 10:09:57 2003 @@@@ -128,7 +128,7 @@@@ wxString NumToStr(OID value) { wxString result; - result.Printf(wxT("%u"), (long)value); + result.Printf(wxT("%lu"), (unsigned long)value); return result; } @@@@ -379,9 +379,9 @@@@ a11 1 d14 1 @