Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv17207/src/gui
Modified Files:
wxMApp.cpp wxllist.cpp
Log Message:
more warning fixes
Index: wxMApp.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMApp.cpp,v
retrieving revision 1.263
retrieving revision 1.264
diff -b -u -2 -r1.263 -r1.264
--- wxMApp.cpp 22 Jul 2003 22:01:41 -0000 1.263
+++ wxMApp.cpp 23 Jul 2003 00:39:33 -0000 1.264
@@ -103,4 +103,8 @@
#include "wx/msw/crashrpt.h"
#endif
+
+ #define UNUSED_IF_WIN(arg)
+#else
+ #define UNUSED_IF_WIN(arg) arg
#endif
@@ -1380,5 +1384,5 @@
void
-wxMApp::Help(int id, wxWindow *parent)
+wxMApp::Help(int UNUSED_IF_WIN(id), wxWindow * UNUSED_IF_WIN(parent))
{
// first thing: close splash if it's still there
@@ -1397,7 +1401,4 @@
// under Windows only help contents can be currently shown
m_HelpController->DisplayContents();
-
- id;
- parent;
#else // !OS_WIN
switch(id)
@@ -1675,5 +1676,5 @@
// return our icons
wxIcon
-wxMApp::GetStdIcon(int which) const
+wxMApp::GetStdIcon(int UNUSED_IF_WIN(which)) const
{
#ifndef OS_WIN
@@ -1714,7 +1715,5 @@
return ICON("msg_info"); break;
}
-#else
- which;
-#endif
+#endif // !OS_WIN
return wxNullIcon;
Index: wxllist.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxllist.cpp,v
retrieving revision 1.154
retrieving revision 1.155
diff -b -u -2 -r1.154 -r1.155
--- wxllist.cpp 22 Jul 2003 22:01:41 -0000 1.154
+++ wxllist.cpp 23 Jul 2003 00:39:33 -0000 1.155
@@ -2726,7 +2726,14 @@
}
+#ifdef WXLAYOUT_USE_CARET
+ #define UNUSED_IF_USE_CARET(arg)
+#else
+ #define UNUSED_IF_USE_CARET(arg) arg
+#endif
void
-wxLayoutList::DrawCursor(wxDC &dc, bool active, wxPoint const &translate)
+wxLayoutList::DrawCursor(wxDC& UNUSED_IF_USE_CARET(dc),
+ bool UNUSED_IF_USE_CARET(active),
+ const wxPoint& translate)
{
if ( m_movedCursor )
@@ -2749,7 +2756,4 @@
#ifdef WXLAYOUT_USE_CARET
m_caret->Move(coords);
-
- dc;
- active;
#else // !WXLAYOUT_USE_CARET
-------------------------------------------------------
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
