Update of /cvsroot/mahogany/M/src/modules
In directory usw-pr-cvs1:/tmp/cvs-serv7332/src/modules
Modified Files:
Migrate.cpp
Log Message:
attempt to fix compilation of ?: operator
Index: Migrate.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/Migrate.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -u -2 -r1.3 -r1.4
--- Migrate.cpp 8 Oct 2002 21:28:18 -0000 1.3
+++ Migrate.cpp 11 Oct 2002 11:20:00 -0000 1.4
@@ -241,4 +241,5 @@
// access the migration data
MigrateData& Data() { return m_migrateData; }
+ const MigrateData& Data() const { return m_migrateData; }
// return the next/previous page for the given one
@@ -286,4 +287,5 @@
MigrateWizard *GetWizard() const { return m_wizard; }
MigrateData& Data() { return GetWizard()->Data(); }
+ const MigrateData& Data() const { return GetWizard()->Data(); }
MigrateWizard::Page GetId() const { return m_id; }
@@ -397,6 +399,13 @@
void OnCheckBox(wxCommandEvent& event);
+ // return the panel we're currently using (IMAP or local)
+ wxEnhancedPanel *GetPanelToUse() const
+ {
+ return Data().toIMAP ? (wxEnhancedPanel *)m_panelIMAP
+ : (wxEnhancedPanel *)m_panelLocal;
+ }
+
// enable/disable the panels according to whether we use IMAP or local file
- void UseIMAP(bool useIMAP);
+ void EnablePanelToBeUsed();
private:
@@ -909,6 +918,8 @@
}
-void MigrateWizardDstPage::UseIMAP(bool useIMAP)
+void MigrateWizardDstPage::EnablePanelToBeUsed()
{
+ const bool useIMAP = Data().toIMAP;
+
m_panelIMAP->Enable(useIMAP);
m_panelLocal->Enable(!useIMAP);
@@ -922,5 +933,5 @@
Data().toIMAP = useIMAP;
- UseIMAP(useIMAP);
+ EnablePanelToBeUsed();
if ( useIMAP )
@@ -944,16 +955,14 @@
bool MigrateWizardDstPage::TransferDataToWindow()
{
- bool useIMAP = Data().toIMAP;
-
- m_chkUseIMAP->SetValue(useIMAP);
+ m_chkUseIMAP->SetValue(Data().toIMAP);
- UseIMAP(useIMAP);
+ EnablePanelToBeUsed();
- return (useIMAP ? m_panelIMAP : m_panelLocal)->TransferDataToWindow();
+ return GetPanelToUse()->TransferDataToWindow();
}
bool MigrateWizardDstPage::TransferDataFromWindow()
{
- return (Data().toIMAP ? m_panelIMAP : m_panelLocal)->TransferDataFromWindow();
+ return GetPanelToUse()->TransferDataFromWindow();
}
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
