Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15802/src/gui
Modified Files:
wxDialogLayout.cpp wxMDialogs.cpp wxMFolderDialogs.cpp
wxModulesDlg.cpp wxOptionsDlg.cpp
Log Message:
compilation fixes for latest wxWin (event handlers signatures)
Index: wxDialogLayout.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxDialogLayout.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -b -u -2 -r1.104 -r1.105
--- wxDialogLayout.cpp 11 Oct 2003 23:13:46 -0000 1.104
+++ wxDialogLayout.cpp 10 Feb 2004 22:44:06 -0000 1.105
@@ -427,5 +427,5 @@
}
-void wxOptionsPageSubdialog::OnChange(wxEvent&)
+void wxOptionsPageSubdialog::OnChange(wxCommandEvent&)
{
// we don't do anything, but just eat these messages - otherwise they will
@@ -1032,5 +1032,5 @@
// ----------------------------------------------------------------------------
-void wxNotebookPageBase::OnChange(wxEvent& /* event */)
+void wxNotebookPageBase::OnChange(wxCommandEvent& /* event */)
{
wxOptionsEditDialog *dlg = GET_PARENT_OF_CLASS(this, wxOptionsEditDialog);
Index: wxMDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMDialogs.cpp,v
retrieving revision 1.412
retrieving revision 1.413
diff -b -u -2 -r1.412 -r1.413
--- wxMDialogs.cpp 12 Jan 2004 17:48:29 -0000 1.412
+++ wxMDialogs.cpp 10 Feb 2004 22:44:06 -0000 1.413
@@ -243,5 +243,9 @@
// if using a textctrl and not a combobox, this will process the
// ENTER key
- void OnEnter(wxEvent&) { TransferDataFromWindow(); EndModal(wxID_OK); }
+ void OnEnter(wxCommandEvent&)
+ {
+ TransferDataFromWindow();
+ EndModal(wxID_OK);
+ }
private:
Index: wxMFolderDialogs.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMFolderDialogs.cpp,v
retrieving revision 1.189
retrieving revision 1.190
diff -b -u -2 -r1.189 -r1.190
--- wxMFolderDialogs.cpp 12 Jan 2004 15:20:38 -0000 1.189
+++ wxMFolderDialogs.cpp 10 Feb 2004 22:44:06 -0000 1.190
@@ -306,5 +306,5 @@
// handlers
- void OnChange(wxKeyEvent& event);
+ void OnChange(wxCommandEvent& event);
void OnRadioBox(wxCommandEvent& WXUNUSED(event)) { OnEvent(); }
void OnComboBox(wxCommandEvent& WXUNUSED(event)) { OnEvent(); }
@@ -1183,5 +1183,5 @@
void
-wxFolderPropertiesPage::OnChange(wxKeyEvent& event)
+wxFolderPropertiesPage::OnChange(wxCommandEvent& event)
{
wxFolderBaseDialog *dlg = GET_PARENT_OF_CLASS(this, wxFolderBaseDialog);
Index: wxModulesDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxModulesDlg.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -b -u -2 -r1.30 -r1.31
--- wxModulesDlg.cpp 13 Oct 2003 00:41:13 -0000 1.30
+++ wxModulesDlg.cpp 10 Feb 2004 22:44:06 -0000 1.31
@@ -47,5 +47,5 @@
virtual bool TransferDataFromWindow();
- bool Update(wxCommandEvent & ev);
+ void Update(wxCommandEvent & ev);
bool InternalUpdate(size_t n);
@@ -64,5 +64,4 @@
BEGIN_EVENT_TABLE(wxModulesDialog, wxDialog)
-// EVT_CHECKLISTBOX(-1, wxModulesDialog::Update)
EVT_LISTBOX(-1, wxModulesDialog::Update)
END_EVENT_TABLE()
@@ -129,9 +128,10 @@
}
-bool
+void
wxModulesDialog::Update(wxCommandEvent & ev)
{
int n = ev.GetInt(); // which one was clicked
- return InternalUpdate(n);
+
+ InternalUpdate(n);
}
Index: wxOptionsDlg.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxOptionsDlg.cpp,v
retrieving revision 1.401
retrieving revision 1.402
diff -b -u -2 -r1.401 -r1.402
--- wxOptionsDlg.cpp 14 Jan 2004 00:06:14 -0000 1.401
+++ wxOptionsDlg.cpp 10 Feb 2004 22:44:06 -0000 1.402
@@ -2431,5 +2431,5 @@
}
-void wxOptionsPage::OnTextChange(wxEvent& event)
+void wxOptionsPage::OnTextChange(wxCommandEvent& event)
{
// special case of text controls associated with the colour browsing
@@ -2461,5 +2461,5 @@
}
-void wxOptionsPage::OnControlChange(wxEvent& event)
+void wxOptionsPage::OnControlChange(wxCommandEvent& event)
{
OnChange(event);
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
