Update of /cvsroot/mahogany/M/include/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv21540/include/gui
Modified Files:
wxBrowseButton.h wxComposeView.h wxDialogLayout.h
wxFolderView.h wxMApp.h wxMDialogs.h wxMFrame.h wxMainFrame.h
wxMessageView.h wxOptionsPage.h wxSelectionDlg.h wxllist.h
wxlwindow.h
Log Message:
fixes for VC++ 6 warnings not disabled any more in wx/defs.h
Index: wxBrowseButton.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxBrowseButton.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -b -u -2 -r1.20 -r1.21
--- wxBrowseButton.h 28 Dec 2002 02:28:33 -0000 1.20
+++ wxBrowseButton.h 22 Jul 2003 22:01:38 -0000 1.21
@@ -50,4 +50,5 @@
private:
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxBrowseButton)
};
@@ -91,4 +92,6 @@
private:
wxTextCtrl *m_text;
+
+ DECLARE_NO_COPY_CLASS(wxTextBrowseButton)
};
@@ -125,4 +128,6 @@
bool m_open,
m_existingOnly;
+
+ DECLARE_NO_COPY_CLASS(wxFileBrowseButton)
};
@@ -148,4 +153,6 @@
friend class wxFileOrDirBrowseButton;
static void DoBrowseHelper(wxTextBrowseButton *browseBtn);
+
+ DECLARE_NO_COPY_CLASS(wxDirBrowseButton)
};
@@ -182,4 +189,6 @@
bool m_browseForFile;
+
+ DECLARE_NO_COPY_CLASS(wxFileOrDirBrowseButton)
};
@@ -208,4 +217,6 @@
private:
MFolder *m_folder;
+
+ DECLARE_NO_COPY_CLASS(wxFolderBrowseButton)
};
@@ -256,4 +267,5 @@
// abstract because we have no default ctor
DECLARE_ABSTRACT_CLASS(wxColorBrowseButton)
+ DECLARE_NO_COPY_CLASS(wxColorBrowseButton)
};
@@ -276,4 +288,7 @@
static String FontDescToUser(const String& desc);
static String FontDescFromUser(const String& desc);
+
+private:
+ DECLARE_NO_COPY_CLASS(wxFontBrowseButton)
};
@@ -349,4 +364,6 @@
int m_nIcon;
wxStaticBitmap *m_staticBitmap;
+
+ DECLARE_NO_COPY_CLASS(wxIconBrowseButton)
};
@@ -360,4 +377,7 @@
public:
wxFolderIconBrowseButton(wxWindow *parent, const wxString& tooltip);
+
+private:
+ DECLARE_NO_COPY_CLASS(wxFolderIconBrowseButton)
};
Index: wxComposeView.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxComposeView.h,v
retrieving revision 1.90
retrieving revision 1.91
diff -b -u -2 -r1.90 -r1.91
--- wxComposeView.h 9 Apr 2003 07:23:24 -0000 1.90
+++ wxComposeView.h 22 Jul 2003 22:01:38 -0000 1.91
@@ -504,5 +504,5 @@
// wxWindows macros
DECLARE_EVENT_TABLE()
- DECLARE_CLASS(wxComposeView)
+ DECLARE_DYNAMIC_CLASS_NO_COPY(wxComposeView)
};
Index: wxDialogLayout.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxDialogLayout.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -b -u -2 -r1.68 -r1.69
--- wxDialogLayout.h 15 Jul 2003 00:47:33 -0000 1.68
+++ wxDialogLayout.h 22 Jul 2003 22:01:38 -0000 1.69
@@ -109,4 +109,6 @@
wxString m_profileKey;
bool m_didRestoreSize;
+
+ DECLARE_NO_COPY_CLASS(wxPDialog)
};
@@ -169,5 +171,5 @@
int m_helpId;
- DECLARE_DYNAMIC_CLASS(wxManuallyLaidOutDialog)
+ DECLARE_DYNAMIC_CLASS_NO_COPY(wxManuallyLaidOutDialog)
DECLARE_EVENT_TABLE()
};
@@ -284,5 +286,5 @@
MEventOptionsChangeData::ChangeKind m_lastBtn;
- DECLARE_ABSTRACT_CLASS(wxOptionsEditDialog)
+ DECLARE_DYNAMIC_CLASS_NO_COPY(wxOptionsEditDialog)
DECLARE_EVENT_TABLE()
};
@@ -320,4 +322,6 @@
Profile *m_profile;
bool m_hasChanges;
+
+ DECLARE_NO_COPY_CLASS(wxProfileSettingsEditDialog)
};
@@ -341,4 +345,5 @@
private:
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxOptionsPageSubdialog)
};
@@ -593,4 +598,5 @@
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxEnhancedPanel)
};
@@ -614,4 +620,5 @@
private:
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxNotebookPageBase)
};
@@ -630,4 +637,7 @@
virtual ~wxNotebookWithImages();
+
+private:
+ DECLARE_NO_COPY_CLASS(wxNotebookWithImages)
};
Index: wxFolderView.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxFolderView.h,v
retrieving revision 1.142
retrieving revision 1.143
diff -b -u -2 -r1.142 -r1.143
--- wxFolderView.h 19 Jan 2003 01:31:31 -0000 1.142
+++ wxFolderView.h 22 Jul 2003 22:01:38 -0000 1.143
@@ -384,5 +384,5 @@
wxFolderView *m_FolderView;
- DECLARE_DYNAMIC_CLASS(wxFolderViewFrame)
+ DECLARE_DYNAMIC_CLASS_NO_COPY(wxFolderViewFrame)
DECLARE_EVENT_TABLE()
};
Index: wxMApp.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxMApp.h,v
retrieving revision 1.70
retrieving revision 1.71
diff -b -u -2 -r1.70 -r1.71
--- wxMApp.h 15 Jul 2003 00:47:33 -0000 1.70
+++ wxMApp.h 22 Jul 2003 22:01:38 -0000 1.71
@@ -284,4 +284,5 @@
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxMApp)
};
Index: wxMDialogs.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxMDialogs.h,v
retrieving revision 1.107
retrieving revision 1.108
diff -b -u -2 -r1.107 -r1.108
--- wxMDialogs.h 28 Dec 2002 02:28:33 -0000 1.107
+++ wxMDialogs.h 22 Jul 2003 22:01:38 -0000 1.108
@@ -99,4 +99,6 @@
{
}
+
+ DECLARE_NO_COPY_CLASS(MProgressDialog)
};
@@ -535,4 +537,6 @@
virtual int ShowModal();
virtual void EndModal(int rc);
+
+ DECLARE_NO_COPY_CLASS(wxMDialog)
};
@@ -553,4 +557,6 @@
wxString m_XFace;
wxWindow *m_Parent;
+
+ DECLARE_NO_COPY_CLASS(wxXFaceButton)
};
Index: wxMFrame.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxMFrame.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -b -u -2 -r1.40 -r1.41
--- wxMFrame.h 26 Aug 2002 16:06:35 -0000 1.40
+++ wxMFrame.h 22 Jul 2003 22:01:38 -0000 1.41
@@ -133,5 +133,5 @@
DECLARE_EVENT_TABLE()
- DECLARE_DYNAMIC_CLASS(wxMFrame)
+ DECLARE_DYNAMIC_CLASS_NO_COPY(wxMFrame)
};
Index: wxMainFrame.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxMainFrame.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -b -u -2 -r1.41 -r1.42
--- wxMainFrame.h 28 Dec 2002 02:28:33 -0000 1.41
+++ wxMainFrame.h 22 Jul 2003 22:01:38 -0000 1.42
@@ -123,4 +123,5 @@
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxMainFrame)
};
Index: wxMessageView.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxMessageView.h,v
retrieving revision 1.86
retrieving revision 1.87
diff -b -u -2 -r1.86 -r1.87
--- wxMessageView.h 19 Jan 2003 01:31:31 -0000 1.86
+++ wxMessageView.h 22 Jul 2003 22:01:38 -0000 1.87
@@ -89,4 +89,6 @@
MsgCmdProc *m_msgCmdProc;
+
+ DECLARE_NO_COPY_CLASS(wxMessageViewFrame)
};
Index: wxOptionsPage.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxOptionsPage.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -b -u -2 -r1.57 -r1.58
--- wxOptionsPage.h 1 Apr 2003 12:18:42 -0000 1.57
+++ wxOptionsPage.h 22 Jul 2003 22:01:38 -0000 1.58
@@ -275,4 +275,5 @@
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxOptionsPage)
};
@@ -308,4 +309,7 @@
// and of their default values
static const ConfigValueDefault ms_aConfigDefaults[];
+
+private:
+ DECLARE_NO_COPY_CLASS(wxOptionsPageStandard)
};
@@ -328,4 +332,7 @@
int helpID = -1,
int image = -1);
+
+private:
+ DECLARE_NO_COPY_CLASS(wxOptionsPageDynamic)
};
@@ -379,6 +386,8 @@
void OnButton(wxCommandEvent&);
+
private:
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxOptionsPageIdent)
};
@@ -394,4 +403,6 @@
private:
wxString m_oldAuthsDisabled;
+
+ DECLARE_NO_COPY_CLASS(wxOptionsPageNetwork)
};
@@ -423,4 +434,5 @@
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxOptionsPageNewMail)
};
@@ -435,4 +447,5 @@
private:
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxOptionsPageCompose)
};
@@ -456,4 +469,5 @@
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxOptionsPageMessageView)
};
@@ -472,4 +486,5 @@
private:
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxOptionsPageFolderView)
};
@@ -485,4 +500,6 @@
private:
bool m_isHomeOrig;
+
+ DECLARE_NO_COPY_CLASS(wxOptionsPageFolderTree)
};
@@ -503,4 +520,5 @@
private:
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxOptionsPageFolders)
};
@@ -522,4 +540,7 @@
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
+
+private:
+ DECLARE_NO_COPY_CLASS(wxOptionsPageAdb)
};
@@ -530,4 +551,7 @@
public:
wxOptionsPageHelpers(wxNotebook *parent, Profile *profile);
+
+private:
+ DECLARE_NO_COPY_CLASS(wxOptionsPageHelpers)
};
@@ -549,4 +573,5 @@
private:
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxOptionsPageSync)
};
@@ -571,4 +596,5 @@
private:
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxOptionsPageOthers)
};
Index: wxSelectionDlg.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxSelectionDlg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -u -2 -r1.3 -r1.4
--- wxSelectionDlg.h 13 Mar 2002 15:50:32 -0000 1.3
+++ wxSelectionDlg.h 22 Jul 2003 22:01:38 -0000 1.4
@@ -41,5 +41,5 @@
// check list box event handler
- void OnCheckLstBoxToggle(wxCommandEvent& event) { m_hasChanges = TRUE; }
+ void OnCheckLstBoxToggle(wxCommandEvent&) { m_hasChanges = TRUE; }
// update UI here: disable the buttons when they don't do anything
@@ -47,11 +47,11 @@
// up/down buttons notifications
- void OnButtonUp(wxCommandEvent& event) { OnButtonMove(TRUE); }
- void OnButtonDown(wxCommandEvent& event) { OnButtonMove(FALSE); }
+ void OnButtonUp(wxCommandEvent&) { OnButtonMove(TRUE); }
+ void OnButtonDown(wxCommandEvent&) { OnButtonMove(FALSE); }
protected:
// can be overridden if the derived class wants to know when the 2 items in
// the check list box are exchanged (after this has happened)
- virtual void OnItemSwap(size_t item1, size_t item2) { }
+ virtual void OnItemSwap(size_t /* item1 */, size_t /* item2 */) { }
// real button events handler
@@ -75,4 +75,5 @@
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxSelectionsOrderDialog)
};
@@ -104,4 +105,6 @@
wxArrayString *m_choices;
wxArrayInt *m_status;
+
+ DECLARE_NO_COPY_CLASS(wxSelectionsOrderDialogSimple)
};
Index: wxllist.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxllist.h,v
retrieving revision 1.79
retrieving revision 1.80
diff -b -u -2 -r1.79 -r1.80
--- wxllist.h 13 Mar 2002 22:30:03 -0000 1.79
+++ wxllist.h 22 Jul 2003 22:01:38 -0000 1.80
@@ -165,7 +165,7 @@
virtual void Draw(wxDC & /* dc */,
wxPoint const & /* coords */,
- wxLayoutList *wxllist,
- CoordType begin = -1,
- CoordType end = -1) { }
+ wxLayoutList * /* wxllist */,
+ CoordType /* begin */ = -1,
+ CoordType /* end */ = -1) { }
/** Calculates and returns the size of the object.
@@ -187,5 +187,7 @@
@return cursor coordinate offset
*/
- virtual CoordType GetOffsetScreen(wxDC &dc, CoordType xpos) const { return 0; }
+ virtual CoordType GetOffsetScreen(wxDC& /* dc */,
+ CoordType /* xpos */) const
+ { return 0; }
/// constructor
@@ -759,5 +761,5 @@
@param height new height
*/
- void SetHeight(CoordType height, wxLayoutList *llist)
+ void SetHeight(CoordType height, wxLayoutList * /* llist */)
{ m_Height = height; MarkDirty(); }
@@ -885,7 +887,7 @@
/// Returns current cursor position.
- const wxPoint &GetCursorPos(wxDC &dc) const { return m_CursorPos; }
- const wxPoint &GetCursorPos() const { return m_CursorPos; }
- wxLayoutLine * GetCursorLine(void) { return m_CursorLine; }
+ const wxPoint& GetCursorPos(wxDC& /* dc */) const { return m_CursorPos; }
+ const wxPoint& GetCursorPos() const { return m_CursorPos; }
+ wxLayoutLine *GetCursorLine(void) { return m_CursorLine; }
/// move cursor to the end of text
@@ -1327,4 +1329,6 @@
{ SetData(text.length() + 1, text.c_str()); }
const char *GetLayoutData() const { return (const char *)GetData(); }
+
+ DECLARE_NO_COPY_CLASS(wxLayoutDataObject)
};
@@ -1410,4 +1414,6 @@
/// How many pages we need to print.
int m_NumOfPages;
+
+ DECLARE_NO_COPY_CLASS(wxLayoutPrintout)
};
Index: wxlwindow.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxlwindow.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -b -u -2 -r1.50 -r1.51
--- wxlwindow.h 3 Jun 2002 11:09:10 -0000 1.50
+++ wxlwindow.h 22 Jul 2003 22:01:38 -0000 1.51
@@ -313,4 +313,5 @@
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxLayoutWindow)
};
-------------------------------------------------------
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
