Update of /cvsroot/mahogany/M/src/modules
In directory sc8-pr-cvs1:/tmp/cvs-serv21540/src/modules
Modified Files:
Calendar.cpp Filters.cpp HtmlViewer.cpp LayoutEditor.cpp
LayoutViewer.cpp Migrate.cpp TextViewer.cpp
Log Message:
fixes for VC++ 6 warnings not disabled any more in wx/defs.h
Index: Calendar.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/Calendar.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -b -u -2 -r1.40 -r1.41
--- Calendar.cpp 24 Mar 2003 02:57:35 -0000 1.40
+++ Calendar.cpp 22 Jul 2003 22:01:42 -0000 1.41
@@ -187,4 +187,6 @@
class CalendarModule *m_Module;
bool m_started;
+
+ DECLARE_NO_COPY_CLASS(DayCheckTimer)
};
@@ -363,4 +365,5 @@
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxDateDialog)
};
@@ -542,4 +545,6 @@
wxCalendarCtrl *m_CalCtrl;
wxListCtrl *m_ListCtrl;
+
+ DECLARE_NO_COPY_CLASS(CalendarFrame)
};
@@ -557,5 +562,5 @@
// overridden base class pure virtual
- virtual wxDragResult OnMsgDrop(wxCoord x, wxCoord y,
+ virtual wxDragResult OnMsgDrop(wxCoord /* x */, wxCoord /* y */,
MMessagesDataObject *data,
wxDragResult def)
@@ -582,4 +587,6 @@
private:
CalendarFrame *m_Frame;
+
+ DECLARE_NO_COPY_CLASS(MMessagesCalDropTarget)
};
@@ -1253,5 +1260,5 @@
bool
-CalendarModule::OnASFolderResultEvent(MEventASFolderResultData & ev )
+CalendarModule::OnASFolderResultEvent(MEventASFolderResultData &)
{
return TRUE;
Index: Filters.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/Filters.cpp,v
retrieving revision 1.146
retrieving revision 1.147
diff -b -u -2 -r1.146 -r1.147
--- Filters.cpp 21 Jun 2003 10:57:22 -0000 1.146
+++ Filters.cpp 22 Jul 2003 22:01:42 -0000 1.147
@@ -437,4 +437,7 @@
bool m_abort;
+ // not needed nor implemented for now
+ Value& operator=(const Value&);
+
MOBJECT_NAME(Value)
};
@@ -563,4 +566,5 @@
const String m_String;
MOBJECT_NAME(StringConstant)
+ DECLARE_NO_COPY_CLASS(StringConstant)
};
@@ -2436,5 +2440,5 @@
}
-static Value func_contains(ArgList *args, FilterRuleImpl *p)
+static Value func_contains(ArgList *args, FilterRuleImpl *)
{
ASSERT(args);
@@ -2448,5 +2452,5 @@
}
-static Value func_match(ArgList *args, FilterRuleImpl *p)
+static Value func_match(ArgList *args, FilterRuleImpl *)
{
ASSERT(args);
@@ -2528,5 +2532,5 @@
}
#else // !USE_PYTHON
-static Value func_python(ArgList *args, FilterRuleImpl *p)
+static Value func_python(ArgList *, FilterRuleImpl *p)
{
p->Error(_("Python support for filters is not available."));
@@ -2802,5 +2806,5 @@
}
-static Value func_now(ArgList *args, FilterRuleImpl *p)
+static Value func_now(ArgList *args, FilterRuleImpl *)
{
if(args->Count() != 0)
@@ -2820,5 +2824,5 @@
}
-static Value func_score(ArgList *args, FilterRuleImpl *p)
+static Value func_score(ArgList *args, FilterRuleImpl *)
{
if(args->Count() != 0)
@@ -2845,5 +2849,5 @@
}
-static Value func_setscore(ArgList *args, FilterRuleImpl *p)
+static Value func_setscore(ArgList *args, FilterRuleImpl *)
{
if(args->Count() != 1)
@@ -2874,5 +2878,5 @@
}
-static Value func_addscore(ArgList *args, FilterRuleImpl *p)
+static Value func_addscore(ArgList *args, FilterRuleImpl *)
{
if(args->Count() != 1)
@@ -2900,5 +2904,5 @@
}
-static Value func_setcolour(ArgList *args, FilterRuleImpl *p)
+static Value func_setcolour(ArgList *args, FilterRuleImpl *)
{
if(args->Count() != 1)
@@ -3508,5 +3512,5 @@
MModule *
MModule_FiltersImpl::Init(int vmajor, int vminor, int vrelease,
- MInterface *minterface, int *errorCode)
+ MInterface * /* minterface */, int *errorCode)
{
if(! MMODULE_SAME_VERSION(vmajor, vminor, vrelease))
Index: HtmlViewer.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/HtmlViewer.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -b -u -2 -r1.47 -r1.48
--- HtmlViewer.cpp 14 Jan 2003 21:54:37 -0000 1.47
+++ HtmlViewer.cpp 22 Jul 2003 22:01:42 -0000 1.48
@@ -200,4 +200,5 @@
TAG_HANDLER_BEGIN(META, "META" )
+ TAG_HANDLER_CONSTR(META) { }
TAG_HANDLER_PROC(tag)
@@ -268,4 +269,6 @@
// the end tag (or empty if none)
String m_end;
+
+ DECLARE_NO_COPY_CLASS(AttributeChanger)
};
@@ -302,4 +305,6 @@
return s;
}
+
+ DECLARE_NO_COPY_CLASS(EncodingChanger)
};
@@ -322,4 +327,7 @@
}
}
+
+private:
+ DECLARE_NO_COPY_CLASS(FontColourChanger)
};
@@ -351,4 +359,6 @@
AttributeChanger m_changerWeight,
m_changerSlant;
+
+ DECLARE_NO_COPY_CLASS(FontStyleChanger)
};
@@ -388,4 +398,6 @@
HtmlViewer *m_viewer;
+
+ DECLARE_NO_COPY_CLASS(HtmlViewerWindow)
};
@@ -458,14 +470,15 @@
}
-void HtmlViewerWindow::OnSetTitle(const wxString& title)
+void HtmlViewerWindow::OnSetTitle(const wxString& /* title */)
{
// don't do anything, we don't want to show the title at all
}
-void HtmlViewerWindow::OnLinkClicked(const wxHtmlLinkInfo& link)
+void HtmlViewerWindow::OnLinkClicked(const wxHtmlLinkInfo& /* link */)
{
}
-void HtmlViewerWindow::OnCellMouseHover(wxHtmlCell *cell, wxCoord x, wxCoord y)
+void HtmlViewerWindow::OnCellMouseHover(wxHtmlCell *cell,
+ wxCoord /* x */, wxCoord /* y */)
{
wxHtmlLinkInfo *link = cell->GetLink();
@@ -604,5 +617,5 @@
// ----------------------------------------------------------------------------
-bool HtmlViewer::Find(const String& text)
+bool HtmlViewer::Find(const String& /* text */)
{
return FindAgain();
@@ -939,5 +952,5 @@
void HtmlViewer::InsertClickable(const wxBitmap& icon,
ClickableInfo *ci,
- const wxColour& col)
+ const wxColour& /* col */)
{
InsertAttachment(icon, ci);
Index: LayoutEditor.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/LayoutEditor.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -b -u -2 -r1.12 -r1.13
--- LayoutEditor.cpp 27 Jan 2003 21:32:12 -0000 1.12
+++ LayoutEditor.cpp 22 Jul 2003 22:01:42 -0000 1.13
@@ -128,4 +128,5 @@
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxComposerLayoutWindow)
};
Index: LayoutViewer.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/LayoutViewer.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -b -u -2 -r1.29 -r1.30
--- LayoutViewer.cpp 5 Dec 2002 23:14:59 -0000 1.29
+++ LayoutViewer.cpp 22 Jul 2003 22:01:42 -0000 1.30
@@ -151,4 +151,5 @@
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(LayoutViewerWindow)
};
@@ -518,5 +519,5 @@
void LayoutViewer::InsertClickable(const wxBitmap& icon,
ClickableInfo *ci,
- const wxColour& col)
+ const wxColour& /* col */)
{
InsertAttachment(icon, ci);
@@ -528,5 +529,5 @@
}
-void LayoutViewer::InsertRawContents(const String& data)
+void LayoutViewer::InsertRawContents(const String& /* data */)
{
// as we return false from our CanProcess(), MessageView is not supposed to
@@ -722,5 +723,5 @@
}
-bool LayoutViewer::CanProcess(const String& mimetype) const
+bool LayoutViewer::CanProcess(const String& /* mimetype */) const
{
// we don't have any special processing for any MIME types
Index: Migrate.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/Migrate.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -b -u -2 -r1.14 -r1.15
--- Migrate.cpp 15 Jul 2003 00:47:34 -0000 1.14
+++ Migrate.cpp 22 Jul 2003 22:01:42 -0000 1.15
@@ -245,4 +245,5 @@
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(IMAPServerPanel)
};
@@ -267,4 +268,6 @@
MigrateLocal *m_localData;
+
+ DECLARE_NO_COPY_CLASS(LocalPanel)
};
@@ -335,4 +338,6 @@
// false while we're waiting for the events from ListFolders()
bool m_doneWithList;
+
+ DECLARE_NO_COPY_CLASS(MigrateWizard)
};
@@ -370,4 +375,6 @@
MigrateWizard *m_wizard;
MigrateWizard::Page m_id;
+
+ DECLARE_NO_COPY_CLASS(MigrateWizardPage)
};
@@ -386,4 +393,7 @@
new wxStaticText(this, -1, msg);
}
+
+
+ DECLARE_NO_COPY_CLASS(MigrateWizardMsgOnlyPage)
};
@@ -402,4 +412,6 @@
private:
IMAPServerPanel *m_panel;
+
+ DECLARE_NO_COPY_CLASS(MigrateWizardSourcePage)
};
@@ -426,4 +438,7 @@
{
}
+
+private:
+ DECLARE_NO_COPY_CLASS(MigrateWizardCantAccessPage)
};
@@ -452,4 +467,7 @@
{
}
+
+private:
+ DECLARE_NO_COPY_CLASS(MigrateWizardNothingToDoPage)
};
@@ -490,4 +508,5 @@
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(MigrateWizardDstPage)
};
@@ -503,4 +522,6 @@
private:
String BuildMsg(MigrateWizard *parent) const;
+
+ DECLARE_NO_COPY_CLASS(MigrateWizardConfirmPage)
};
@@ -591,4 +612,5 @@
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(MigrateWizardProgressPage)
};
Index: TextViewer.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/modules/TextViewer.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -b -u -2 -r1.45 -r1.46
--- TextViewer.cpp 2 Apr 2003 23:25:11 -0000 1.45
+++ TextViewer.cpp 22 Jul 2003 22:01:42 -0000 1.46
@@ -207,4 +207,5 @@
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(TextViewerWindow)
};
@@ -546,5 +547,5 @@
}
-void TextViewer::ShowXFace(const wxBitmap& bitmap)
+void TextViewer::ShowXFace(const wxBitmap& /* bitmap */)
{
// we don't show XFaces
@@ -570,5 +571,5 @@
}
-void TextViewer::InsertAttachment(const wxBitmap& icon, ClickableInfo *ci)
+void TextViewer::InsertAttachment(const wxBitmap& /* icon */, ClickableInfo *ci)
{
String str;
@@ -578,5 +579,5 @@
}
-void TextViewer::InsertClickable(const wxBitmap& icon,
+void TextViewer::InsertClickable(const wxBitmap& /* icon */,
ClickableInfo *ci,
const wxColour& col)
@@ -588,5 +589,6 @@
}
-void TextViewer::InsertImage(const wxImage& image, ClickableInfo *ci)
+void
+TextViewer::InsertImage(const wxImage& /* image */, ClickableInfo * /* ci */)
{
// as we return false from CanInlineImages() this is not supposed to be
@@ -595,5 +597,5 @@
}
-void TextViewer::InsertRawContents(const String& data)
+void TextViewer::InsertRawContents(const String& /* data */)
{
// as we return false from our CanProcess(), MessageView is not supposed to
@@ -671,5 +673,5 @@
}
-bool TextViewer::CanProcess(const String& mimetype) const
+bool TextViewer::CanProcess(const String& /* mimetype */) const
{
// we don't have any special processing for any MIME types
-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines at the
same time. Free trial click here: http://www.vmware.com/wl/offer/345/0
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
