Log Message:
-----------
wxID_xxx IDs to enable GTK wxStockButtons fix
Modified Files:
--------------
pgadmin3/src:
pgAdmin3.cpp (r1.101 -> r1.102)
pgAdmin3.dsp (r1.111 -> r1.112)
pgadmin3/src/ui:
dlgClasses.cpp (r1.10 -> r1.11)
dlgConnect.cpp (r1.2 -> r1.3)
dlgDatabase.cpp (r1.31 -> r1.32)
dlgEditGridOptions.cpp (r1.21 -> r1.22)
dlgFunction.cpp (r1.41 -> r1.42)
dlgProperty.cpp (r1.93 -> r1.94)
dlgServer.cpp (r1.8 -> r1.9)
dlgType.cpp (r1.25 -> r1.26)
dlgUser.cpp (r1.32 -> r1.33)
frmExport.cpp (r1.12 -> r1.13)
frmOptions.cpp (r1.45 -> r1.46)
frmPassword.cpp (r1.17 -> r1.18)
frmRestore.cpp (r1.10 -> r1.11)
Index: pgAdmin3.cpp
===================================================================
RCS file: /projects/pgadmin3/src/pgAdmin3.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -Lsrc/pgAdmin3.cpp -Lsrc/pgAdmin3.cpp -u -w -r1.101 -r1.102
--- src/pgAdmin3.cpp
+++ src/pgAdmin3.cpp
@@ -341,6 +341,16 @@
wxXmlResource::Get()->AddHandler(new ctlSQLBoxXmlHandler);
wxXmlResource::Get()->AddHandler(new ctlComboBoxXmlHandler);
+#define chkXRC(id) XRCID(#id) == id
+ wxASSERT_MSG(
+ chkXRC(wxID_OK) &&
+ chkXRC(wxID_CANCEL) &&
+ chkXRC(wxID_HELP) &&
+ chkXRC(wxID_APPLY) &&
+ chkXRC(wxID_ADD) &&
+ chkXRC(wxID_REMOVE), wxT("XRC ID not correctly assigned."));
+ // if this assert fires, some event table uses XRCID(...) instead of wxID_...
directly
+
// examine libpq version
libpqVersion=7.3;
Index: pgAdmin3.dsp
===================================================================
RCS file: /projects/pgadmin3/src/pgAdmin3.dsp,v
retrieving revision 1.111
retrieving revision 1.112
diff -Lsrc/pgAdmin3.dsp -Lsrc/pgAdmin3.dsp -u -w -r1.111 -r1.112
--- src/pgAdmin3.dsp
+++ src/pgAdmin3.dsp
@@ -45,7 +45,8 @@
# 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
# 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 /FR /Yu"pgadmin3.h" /FD /c
+# 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
+# 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"
Index: dlgDatabase.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgDatabase.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -Lsrc/ui/dlgDatabase.cpp -Lsrc/ui/dlgDatabase.cpp -u -w -r1.31 -r1.32
--- src/ui/dlgDatabase.cpp
+++ src/ui/dlgDatabase.cpp
@@ -43,8 +43,8 @@
EVT_TEXT(XRCID("cbTablespace"), dlgProperty::OnChange)
EVT_TEXT(XRCID("cbEncoding"), dlgProperty::OnChange)
EVT_LIST_ITEM_SELECTED(XRCID("lstVariables"), dlgDatabase::OnVarSelChange)
- EVT_BUTTON(XRCID("wxID_ADD"), dlgDatabase::OnVarAdd)
- EVT_BUTTON(XRCID("wxID_REMOVE"), dlgDatabase::OnVarRemove)
+ EVT_BUTTON(wxID_ADD, dlgDatabase::OnVarAdd)
+ EVT_BUTTON(wxID_REMOVE, dlgDatabase::OnVarRemove)
EVT_TEXT(XRCID("cbVarname"), dlgDatabase::OnVarnameSelChange)
END_EVENT_TABLE();
Index: dlgClasses.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgClasses.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lsrc/ui/dlgClasses.cpp -Lsrc/ui/dlgClasses.cpp -u -w -r1.10 -r1.11
--- src/ui/dlgClasses.cpp
+++ src/ui/dlgClasses.cpp
@@ -25,7 +25,7 @@
BEGIN_EVENT_TABLE(pgDialog, wxDialog)
- EVT_BUTTON (XRCID("wxID_CANCEL"), pgDialog::OnCancel)
+ EVT_BUTTON (wxID_CANCEL, pgDialog::OnCancel)
EVT_CLOSE( pgDialog::OnClose)
END_EVENT_TABLE()
@@ -110,7 +110,7 @@
BEGIN_EVENT_TABLE(DialogWithHelp, pgDialog)
EVT_MENU(MNU_HELP, DialogWithHelp::OnHelp)
- EVT_BUTTON(XRCID("wxID_HELP"), DialogWithHelp::OnHelp)
+ EVT_BUTTON(wxID_HELP, DialogWithHelp::OnHelp)
END_EVENT_TABLE();
@@ -143,8 +143,8 @@
BEGIN_EVENT_TABLE(ExecutionDialog, DialogWithHelp)
- EVT_BUTTON (XRCID("wxID_OK"), ExecutionDialog::OnOK)
- EVT_BUTTON (XRCID("wxID_CANCEL"), ExecutionDialog::OnCancel)
+ EVT_BUTTON (wxID_OK, ExecutionDialog::OnOK)
+ EVT_BUTTON (wxID_CANCEL, ExecutionDialog::OnCancel)
EVT_CLOSE( ExecutionDialog::OnClose)
END_EVENT_TABLE()
@@ -280,8 +280,8 @@
#define TIMER_ID 4442
BEGIN_EVENT_TABLE(ExternProcessDialog, DialogWithHelp)
- EVT_BUTTON(XRCID("wxID_OK"), ExternProcessDialog::OnOK)
- EVT_BUTTON(XRCID("wxID_CANCEL"), ExternProcessDialog::OnCancel)
+ EVT_BUTTON(wxID_OK, ExternProcessDialog::OnOK)
+ EVT_BUTTON(wxID_CANCEL, ExternProcessDialog::OnCancel)
EVT_CLOSE( ExternProcessDialog::OnClose)
EVT_END_PROCESS(-1, ExternProcessDialog::OnEndProcess)
EVT_TIMER(TIMER_ID, ExternProcessDialog::OnPollProcess)
Index: frmPassword.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmPassword.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -Lsrc/ui/frmPassword.cpp -Lsrc/ui/frmPassword.cpp -u -w -r1.17 -r1.18
--- src/ui/frmPassword.cpp
+++ src/ui/frmPassword.cpp
@@ -28,9 +28,9 @@
BEGIN_EVENT_TABLE(frmPassword, pgDialog)
- EVT_BUTTON (XRCID("wxID_HELP"), frmPassword::OnHelp)
- EVT_BUTTON (XRCID("wxID_OK"), frmPassword::OnOK)
- EVT_BUTTON (XRCID("wxID_CANCEL"), frmPassword::OnCancel)
+ EVT_BUTTON (wxID_HELP, frmPassword::OnHelp)
+ EVT_BUTTON (wxID_OK, frmPassword::OnOK)
+ EVT_BUTTON (wxID_CANCEL, frmPassword::OnCancel)
END_EVENT_TABLE()
Index: frmExport.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmExport.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lsrc/ui/frmExport.cpp -Lsrc/ui/frmExport.cpp -u -w -r1.12 -r1.13
--- src/ui/frmExport.cpp
+++ src/ui/frmExport.cpp
@@ -43,9 +43,9 @@
EVT_RADIOBUTTON(XRCID("rbQuoteStrings"),frmExport::OnChange)
EVT_RADIOBUTTON(XRCID("rbQuoteAll"), frmExport::OnChange)
EVT_BUTTON(XRCID("btnFilename"), frmExport::OnBrowseFile)
- EVT_BUTTON(XRCID("wxID_HELP"), frmExport::OnHelp)
- EVT_BUTTON(XRCID("wxID_OK"), frmExport::OnOK)
- EVT_BUTTON(XRCID("wxID_CANCEL"), frmExport::OnCancel)
+ EVT_BUTTON(wxID_HELP, frmExport::OnHelp)
+ EVT_BUTTON(wxID_OK, frmExport::OnOK)
+ EVT_BUTTON(wxID_CANCEL, frmExport::OnCancel)
END_EVENT_TABLE()
Index: dlgUser.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgUser.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -Lsrc/ui/dlgUser.cpp -Lsrc/ui/dlgUser.cpp -u -w -r1.32 -r1.33
--- src/ui/dlgUser.cpp
+++ src/ui/dlgUser.cpp
@@ -58,8 +58,8 @@
EVT_BUTTON(XRCID("btnDelGroup"), dlgUser::OnGroupRemove)
EVT_LIST_ITEM_SELECTED(XRCID("lstVariables"), dlgUser::OnVarSelChange)
- EVT_BUTTON(XRCID("wxID_ADD"), dlgUser::OnVarAdd)
- EVT_BUTTON(XRCID("wxID_REMOVE"), dlgUser::OnVarRemove)
+ EVT_BUTTON(wxID_ADD, dlgUser::OnVarAdd)
+ EVT_BUTTON(wxID_REMOVE, dlgUser::OnVarRemove)
EVT_TEXT(XRCID("cbVarname"), dlgUser::OnVarnameSelChange)
END_EVENT_TABLE();
Index: dlgConnect.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgConnect.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/ui/dlgConnect.cpp -Lsrc/ui/dlgConnect.cpp -u -w -r1.2 -r1.3
--- src/ui/dlgConnect.cpp
+++ src/ui/dlgConnect.cpp
@@ -27,8 +27,8 @@
BEGIN_EVENT_TABLE(dlgConnect, DialogWithHelp)
- EVT_BUTTON (XRCID("wxID_OK"), dlgConnect::OnOK)
- EVT_BUTTON (XRCID("wxID_CANCEL"), dlgConnect::OnCancel)
+ EVT_BUTTON (wxID_OK, dlgConnect::OnOK)
+ EVT_BUTTON (wxID_CANCEL, dlgConnect::OnCancel)
EVT_CHECKBOX(XRCID("chkNeedPwd"), dlgConnect::OnTrustChange)
END_EVENT_TABLE()
Index: frmOptions.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmOptions.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -Lsrc/ui/frmOptions.cpp -Lsrc/ui/frmOptions.cpp -u -w -r1.45 -r1.46
--- src/ui/frmOptions.cpp
+++ src/ui/frmOptions.cpp
@@ -56,9 +56,9 @@
EVT_BUTTON (XRCID("btnFont"), frmOptions::OnFontSelect)
EVT_BUTTON (XRCID("btnSqlFont"), frmOptions::OnSqlFontSelect)
EVT_BUTTON (XRCID("btnBrowseLogfile"), frmOptions::OnBrowseLogFile)
- EVT_BUTTON (XRCID("wxID_OK"), frmOptions::OnOK)
- EVT_BUTTON (XRCID("wxID_HELP"), frmOptions::OnHelp)
- EVT_BUTTON (XRCID("wxID_CANCEL"), frmOptions::OnCancel)
+ EVT_BUTTON (wxID_OK, frmOptions::OnOK)
+ EVT_BUTTON (wxID_HELP, frmOptions::OnHelp)
+ EVT_BUTTON (wxID_CANCEL, frmOptions::OnCancel)
END_EVENT_TABLE()
frmOptions::frmOptions(frmMain *parent)
Index: dlgProperty.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgProperty.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -Lsrc/ui/dlgProperty.cpp -Lsrc/ui/dlgProperty.cpp -u -w -r1.93 -r1.94
--- src/ui/dlgProperty.cpp
+++ src/ui/dlgProperty.cpp
@@ -72,9 +72,9 @@
EVT_TEXT(XRCID("cbOwner"), dlgProperty::OnChangeOwner)
EVT_TEXT(XRCID("txtComment"), dlgProperty::OnChange)
- EVT_BUTTON(XRCID("wxID_HELP"), dlgProperty::OnHelp)
- EVT_BUTTON(XRCID("wxID_OK"), dlgProperty::OnOK)
- EVT_BUTTON(XRCID("wxID_APPLY"), dlgProperty::OnApply)
+ EVT_BUTTON(wxID_HELP, dlgProperty::OnHelp)
+ EVT_BUTTON(wxID_OK, dlgProperty::OnOK)
+ EVT_BUTTON(wxID_APPLY, dlgProperty::OnApply)
END_EVENT_TABLE();
@@ -1256,7 +1256,7 @@
BEGIN_EVENT_TABLE(dlgOidProperty, dlgProperty)
- EVT_BUTTON (XRCID("wxID_OK"), dlgOidProperty::OnOK)
+ EVT_BUTTON (wxID_OK, dlgOidProperty::OnOK)
END_EVENT_TABLE();
dlgOidProperty::dlgOidProperty(frmMain *frame, const wxString &resName)
Index: frmRestore.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmRestore.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lsrc/ui/frmRestore.cpp -Lsrc/ui/frmRestore.cpp -u -w -r1.10 -r1.11
--- src/ui/frmRestore.cpp
+++ src/ui/frmRestore.cpp
@@ -49,7 +49,7 @@
EVT_CHECKBOX(XRCID("chkOnlySchema"), frmRestore::OnChangeSchema)
EVT_CHECKBOX(XRCID("chkSingleObject"), frmRestore::OnChange)
EVT_BUTTON(XRCID("btnFilename"), frmRestore::OnSelectFilename)
- EVT_BUTTON(XRCID("wxID_OK"), frmRestore::OnOK)
+ EVT_BUTTON(wxID_OK, frmRestore::OnOK)
EVT_BUTTON(XRCID("btnView"), frmRestore::OnView)
EVT_END_PROCESS(-1, frmRestore::OnEndProcess)
EVT_LIST_ITEM_SELECTED(XRCID("lstContents"), frmRestore::OnChangeList)
Index: dlgEditGridOptions.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgEditGridOptions.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -Lsrc/ui/dlgEditGridOptions.cpp -Lsrc/ui/dlgEditGridOptions.cpp -u -w -r1.21
-r1.22
--- src/ui/dlgEditGridOptions.cpp
+++ src/ui/dlgEditGridOptions.cpp
@@ -46,9 +46,9 @@
#define pnlFilter CTRL_PANEL("pnlFilter")
BEGIN_EVENT_TABLE(dlgEditGridOptions, pgDialog)
- EVT_BUTTON (XRCID("wxID_OK"), dlgEditGridOptions::OnOK)
- EVT_BUTTON (XRCID("wxID_CANCEL"), dlgEditGridOptions::OnCancel)
- EVT_BUTTON (XRCID("wxID_REMOVE"), dlgEditGridOptions::OnRemove)
+ EVT_BUTTON (wxID_OK, dlgEditGridOptions::OnOK)
+ EVT_BUTTON (wxID_CANCEL, dlgEditGridOptions::OnCancel)
+ EVT_BUTTON (wxID_REMOVE, dlgEditGridOptions::OnRemove)
EVT_BUTTON (XRCID("btnAsc"), dlgEditGridOptions::OnAsc)
EVT_BUTTON (XRCID("btnDesc"), dlgEditGridOptions::OnDesc)
EVT_BUTTON (XRCID("btnValidate"), dlgEditGridOptions::OnValidate)
Index: dlgServer.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgServer.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lsrc/ui/dlgServer.cpp -Lsrc/ui/dlgServer.cpp -u -w -r1.8 -r1.9
--- src/ui/dlgServer.cpp
+++ src/ui/dlgServer.cpp
@@ -47,7 +47,7 @@
EVT_TEXT(XRCID("txtUsername"), dlgProperty::OnChange)
EVT_COMBOBOX(XRCID("cbSSL"), dlgProperty::OnChange)
EVT_CHECKBOX(XRCID("chkNeedPwd"), dlgServer::OnChangeNeedPwd)
- EVT_BUTTON(XRCID("wxID_OK"), dlgServer::OnOK)
+ EVT_BUTTON(wxID_OK, dlgServer::OnOK)
END_EVENT_TABLE();
Index: dlgType.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgType.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -Lsrc/ui/dlgType.cpp -Lsrc/ui/dlgType.cpp -u -w -r1.25 -r1.26
--- src/ui/dlgType.cpp
+++ src/ui/dlgType.cpp
@@ -57,8 +57,8 @@
EVT_TEXT(XRCID("txtIntLength"), dlgProperty::OnChange)
EVT_CHECKBOX(XRCID("chkVariable"), dlgProperty::OnChange)
- EVT_BUTTON(XRCID("wxID_ADD"), dlgType::OnVarAdd)
- EVT_BUTTON(XRCID("wxID_REMOVE"), dlgType::OnVarRemove)
+ EVT_BUTTON(wxID_ADD, dlgType::OnVarAdd)
+ EVT_BUTTON(wxID_REMOVE, dlgType::OnVarRemove)
EVT_LIST_ITEM_SELECTED(XRCID("lstVariables"), dlgType::OnVarSelChange)
EVT_TEXT(XRCID("cbDatatype"), dlgType::OnSelChangeTyp)
EVT_TEXT(XRCID("txtMembername"), dlgType::OnChangeMember)
Index: dlgFunction.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgFunction.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -Lsrc/ui/dlgFunction.cpp -Lsrc/ui/dlgFunction.cpp -u -w -r1.41 -r1.42
--- src/ui/dlgFunction.cpp
+++ src/ui/dlgFunction.cpp
@@ -67,9 +67,9 @@
EVT_LIST_ITEM_SELECTED(XRCID("lstArguments"), dlgFunction::OnSelChangeArg)
EVT_TEXT(XRCID("txtArgName"), dlgFunction::OnChangeArgName)
- EVT_BUTTON(XRCID("wxID_ADD"), dlgFunction::OnAddArg)
+ EVT_BUTTON(wxID_ADD, dlgFunction::OnAddArg)
EVT_BUTTON(XRCID("wxID_CHANGE"), dlgFunction::OnChangeArg)
- EVT_BUTTON(XRCID("wxID_REMOVE"), dlgFunction::OnRemoveArg)
+ EVT_BUTTON(wxID_REMOVE, dlgFunction::OnRemoveArg)
END_EVENT_TABLE();
---------------------------(end of broadcast)---------------------------
TIP 3: if posting/reading through Usenet, please send an appropriate
subscribe-nomail command to [EMAIL PROTECTED] so that your
message can get through to the mailing list cleanly
