SF.net SVN: mahogany:[7549] trunk/M
[email protected] Fri, 03 Oct 2008 21:08:05 +0000
| Newsgroups | gmane.mail.mahogany.cvs |
|---|---|
| Message-ID | <[email protected]> |
Revision: 7549
http://mahogany.svn.sourceforge.net/mahogany/?rev=7549&view=rev
Author: vadz
Date: 2008-10-03 21:08:04 +0000 (Fri, 03 Oct 2008)
Log Message:
-----------
don't redefine wxNotebookXXX because it provokes warnings with latest wx and is generally ugly; define MBookCtrl and related symbols instead
Modified Paths:
--------------
trunk/M/M.vcproj
trunk/M/include/SpamFilter.h
trunk/M/include/gui/SpamOptionsPage.h
trunk/M/include/gui/wxDialogLayout.h
trunk/M/include/gui/wxOptionsPage.h
trunk/M/src/gui/wxDialogLayout.cpp
trunk/M/src/gui/wxMFolderDialogs.cpp
trunk/M/src/gui/wxOptionsDlg.cpp
trunk/M/src/mail/SpamFilter.cpp
trunk/M/src/modules/spam/DspamFilter.cpp
trunk/M/src/modules/spam/HeadersFilter.cpp
trunk/M/src/modules/spam/ServerSideFilter.cpp
Added Paths:
-----------
trunk/M/include/gui/MBookCtrl.h
Removed Paths:
-------------
trunk/M/include/gui/listbook.h
Modified: trunk/M/M.vcproj
===================================================================
--- trunk/M/M.vcproj 2008-10-03 21:06:31 UTC (rev 7548)
+++ trunk/M/M.vcproj 2008-10-03 21:08:04 UTC (rev 7549)
@@ -1984,6 +1984,9 @@
RelativePath=".\include\MAtExit.h">
</File>
<File
+ RelativePath=".\include\gui\MBookCtrl.h">
+ </File>
+ <File
RelativePath=".\include\Mcallbacks.h">
</File>
<File
Modified: trunk/M/include/SpamFilter.h
===================================================================
--- trunk/M/include/SpamFilter.h 2008-10-03 21:06:31 UTC (rev 7548)
+++ trunk/M/include/SpamFilter.h 2008-10-03 21:08:04 UTC (rev 7549)
@@ -23,7 +23,7 @@
#include "MModule.h"
-#include "gui/listbook.h"
+#include "gui/MBookCtrl.h"
class Message;
class SpamOptionsPage;
@@ -254,7 +254,7 @@
Inc/DecRef() it)
@return pointer to the page (which will be deleted by the caller) ot NULL
*/
- virtual SpamOptionsPage *CreateOptionPage(wxListOrNoteBook *notebook,
+ virtual SpamOptionsPage *CreateOptionPage(MBookCtrl *notebook,
Profile *profile) const;
/**
Copied: trunk/M/include/gui/MBookCtrl.h (from rev 7547, trunk/M/include/gui/listbook.h)
===================================================================
--- trunk/M/include/gui/MBookCtrl.h (rev 0)
+++ trunk/M/include/gui/MBookCtrl.h 2008-10-03 21:08:04 UTC (rev 7549)
@@ -0,0 +1,50 @@
+///////////////////////////////////////////////////////////////////////////////
+// Project: M - cross platform e-mail GUI client
+// File name: gui/listbook.h
+// Purpose: definition of MBookCtrl
+// Author: Vadim Zeitlin
+// Modified by:
+// Created: 2004-07-11
+// CVS-ID: $Id$
+// Copyright: (c) 2004 Vadim Zeitlin <[email protected]>
+// Licence: M licence
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ @file gui/listbook.h
+ @brief Defines MBookCtrl typedef.
+
+ We use wxListbook instead of wxNotebook if it is available but on some
+ platforms it isn't, so we always use MBookCtrl typedef as these
+ classes have the same interface and so can be used interchangeably.
+*/
+
+#ifndef M_GUI_MBOOKCTRL_H_
+#define M_GUI_MBOOKCTRL_H_
+
+#if wxUSE_LISTBOOK
+ class WXDLLIMPEXP_FWD_CORE wxListbook;
+ typedef wxListbook MBookCtrl;
+
+ class wxPListbook;
+ typedef wxPListbook MPBookCtrl;
+
+ #define M_EVT_BOOK_PAGE_CHANGED wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED
+
+ #define MBookEvent wxListbookEvent
+ #define MBookEventHandler wxListbookEventHandler
+#else
+ class WXDLLIMPEXP_FWD_CORE wxNotebook;
+ typedef wxNotebook MBookCtrl;
+
+ class wxPNotebook;
+ typedef wxPNotebook MPBookCtrl;
+
+ #define M_EVT_BOOK_PAGE_CHANGED wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED
+
+ #define MBookEvent wxNotebookEvent
+ #define MBookEventHandler wxNotebookEventHandler
+#endif
+
+#endif // M_GUI_MBOOKCTRL_H_
+
Property changes on: trunk/M/include/gui/MBookCtrl.h
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:mergeinfo
+
Added: svn:eol-style
+ native
Modified: trunk/M/include/gui/SpamOptionsPage.h
===================================================================
--- trunk/M/include/gui/SpamOptionsPage.h 2008-10-03 21:06:31 UTC (rev 7548)
+++ trunk/M/include/gui/SpamOptionsPage.h 2008-10-03 21:08:04 UTC (rev 7549)
@@ -33,7 +33,7 @@
class SpamOptionsPage : public wxOptionsPageDynamic
{
public:
- SpamOptionsPage(wxNotebook *parent, Profile *profile)
+ SpamOptionsPage(MBookCtrl *parent, Profile *profile)
: wxOptionsPageDynamic(parent)
{
}
Deleted: trunk/M/include/gui/listbook.h
===================================================================
--- trunk/M/include/gui/listbook.h 2008-10-03 21:06:31 UTC (rev 7548)
+++ trunk/M/include/gui/listbook.h 2008-10-03 21:08:04 UTC (rev 7549)
@@ -1,34 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Project: M - cross platform e-mail GUI client
-// File name: gui/listbook.h
-// Purpose: definition of wxListOrNoteBook
-// Author: Vadim Zeitlin
-// Modified by:
-// Created: 2004-07-11
-// CVS-ID: $Id$
-// Copyright: (c) 2004 Vadim Zeitlin <[email protected]>
-// Licence: M licence
-///////////////////////////////////////////////////////////////////////////////
-
-/**
- @file gui/listbook.h
- @brief Defines wxListOrNoteBook typedef.
-
- We use wxListbook instead of wxNotebook if it is available but on some
- platforms it isn't, so we always use wxListOrNoteBook typedef as these
- classes have the same interface and so can be used interchangeably.
-*/
-
-#ifndef _M_GUI_LISTBOOK_H_
-#define _M_GUI_LISTBOOK_H_
-
-#if wxUSE_LISTBOOK
- class WXDLLIMPEXP_FWD_CORE wxListbook;
- typedef wxListbook wxListOrNoteBook;
-#else
- class WXDLLIMPEXP_FWD_CORE wxNotebook;
- typedef wxNotebook wxListOrNoteBook;
-#endif
-
-#endif // _M_GUI_LISTBOOK_H_
-
Modified: trunk/M/include/gui/wxDialogLayout.h
===================================================================
--- trunk/M/include/gui/wxDialogLayout.h 2008-10-03 21:06:31 UTC (rev 7548)
+++ trunk/M/include/gui/wxDialogLayout.h 2008-10-03 21:08:04 UTC (rev 7549)
@@ -25,35 +25,10 @@
#include <wx/persctrl.h> // needed for wxPNotebook
#include "gui/wxMDialogs.h"
+#include "gui/MBookCtrl.h"
+
#include "MEvent.h"
-// use wxListbook instead of wxNotebook if available
-#if wxUSE_LISTBOOK
- #define wxNotebook wxListbook
- #define wxPNotebook wxPListbook
- #define wxNotebookEvent wxListbookEvent
-
- #undef wxNotebookEventHandler
- #define wxNotebookEventHandler wxListbookEventHandler
-
- #define wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED
- #define wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING
-
- #undef EVT_NOTEBOOK_PAGE_CHANGED
- #define EVT_NOTEBOOK_PAGE_CHANGED EVT_LISTBOOK_PAGE_CHANGED
- #undef EVT_NOTEBOOK_PAGE_CHANGING
- #define EVT_NOTEBOOK_PAGE_CHANGING EVT_LISTBOOK_PAGE_CHANGING
-
- #undef wxNB_TOP
- #define wxNB_TOP wxLB_TOP
- #undef wxNB_BOTTOM
- #define wxNB_BOTTOM wxLB_BOTTOM
- #undef wxNB_LEFT
- #define wxNB_LEFT wxLB_LEFT
- #undef wxNB_RIGHT
- #define wxNB_RIGHT wxLB_RIGHT
-#endif // wxUSE_LISTBOOK
-
// -----------------------------------------------------------------------------
// forward declarations
// -----------------------------------------------------------------------------
@@ -344,7 +319,7 @@
// the notebook occupying the main part of the dialog
- wxPNotebook *m_notebook;
+ MPBookCtrl *m_notebook;
private:
// implement base class pure virtual in terms of our existing function for
@@ -668,10 +643,10 @@
// showing the controls in a row (text fields with labels for example).
// ----------------------------------------------------------------------------
-class wxNotebookPageBase : public wxEnhancedPanel
+class MBookCtrlPageBase : public wxEnhancedPanel
{
public:
- wxNotebookPageBase(wxNotebook *parent) : wxEnhancedPanel(parent) { }
+ MBookCtrlPageBase(MBookCtrl *parent) : wxEnhancedPanel(parent) { }
protected:
// callbacks which will set the parent's dirty flag whenever
@@ -681,14 +656,14 @@
private:
DECLARE_EVENT_TABLE()
- DECLARE_NO_COPY_CLASS(wxNotebookPageBase)
+ DECLARE_NO_COPY_CLASS(MBookCtrlPageBase)
};
// ----------------------------------------------------------------------------
// a notebook with images
// ----------------------------------------------------------------------------
-class wxNotebookWithImages : public wxPNotebook
+class wxNotebookWithImages : public MPBookCtrl
{
public:
// configPath is used to store the last active page, aszImages is the NULL
Modified: trunk/M/include/gui/wxOptionsPage.h
===================================================================
--- trunk/M/include/gui/wxOptionsPage.h 2008-10-03 21:06:31 UTC (rev 7548)
+++ trunk/M/include/gui/wxOptionsPage.h 2008-10-03 21:08:04 UTC (rev 7549)
@@ -20,7 +20,7 @@
# include <wx/dynarray.h>
#endif // USE_PCH
-#include "gui/wxDialogLayout.h" // for wxNotebookPageBase
+#include "gui/wxDialogLayout.h" // for MBookCtrlPageBase
WX_DEFINE_ARRAY(wxControl *, ArrayControls);
WX_DEFINE_ARRAY_INT(bool, ArrayBool);
@@ -81,7 +81,7 @@
// listboxes and sub dialogs are currently supported)
// -----------------------------------------------------------------------------
-class wxOptionsPage : public wxNotebookPageBase
+class wxOptionsPage : public MBookCtrlPageBase
{
public:
// FieldType and FieldFlags are stored in one 'int', so the bits should be
@@ -141,7 +141,7 @@
// almost default ctor: this just takes the parent notebook
//
// you'll need to call Create() later
- wxOptionsPage(wxNotebook *parent) : wxNotebookPageBase(parent) { }
+ wxOptionsPage(MBookCtrl *parent) : MBookCtrlPageBase(parent) { }
// initialize this page and add it to the notebook (with the image refering
// to the notebook's imagelist)
@@ -149,7 +149,7 @@
ConfigValuesArray aDefaults,
size_t nFirst,
size_t nLast,
- wxNotebook *notebook,
+ MBookCtrl *notebook,
const wxString& title,
Profile *profile,
int helpId = -1,
@@ -159,7 +159,7 @@
wxOptionsPage(FieldInfoArray aFields,
ConfigValuesArray aDefaults,
size_t nFirst, size_t nLast,
- wxNotebook *parent,
+ MBookCtrl *parent,
const wxString& title,
Profile *profile,
int helpID = -1,
@@ -334,7 +334,7 @@
public:
// ctor will create the controls corresponding to the fields from nFirst to
// nLast in ms_aFields
- wxOptionsPageStandard(wxNotebook *parent,
+ wxOptionsPageStandard(MBookCtrl *parent,
const wxString& title,
Profile *profile,
int nFirst,
@@ -356,7 +356,7 @@
protected:
// ctor for pages created via static New()
- wxOptionsPageStandard(wxNotebook *parent,
+ wxOptionsPageStandard(MBookCtrl *parent,
const wxString& title,
Profile *profile,
FieldInfoArray aFields,
@@ -379,10 +379,10 @@
{
public:
// if you use this ctor, you must use Create() later
- wxOptionsPageDynamic(wxNotebook *parent) : wxOptionsPage(parent) { }
+ wxOptionsPageDynamic(MBookCtrl *parent) : wxOptionsPage(parent) { }
// the aFields array contains the controls descriptions
- bool Create(wxNotebook *parent,
+ bool Create(MBookCtrl *parent,
const wxString& title,
Profile *profile,
FieldInfoArray aFields,
@@ -393,7 +393,7 @@
int image = -1);
// ctor doing all at once
- wxOptionsPageDynamic(wxNotebook *parent,
+ wxOptionsPageDynamic(MBookCtrl *parent,
const wxString& title,
Profile *profile,
FieldInfoArray aFields,
@@ -404,7 +404,7 @@
int image = -1);
// for wxOptionsPageDesc usage
- static wxOptionsPage *New(wxNotebook *parent,
+ static wxOptionsPage *New(MBookCtrl *parent,
const wxString& title,
Profile *profile,
FieldInfoArray aFields,
@@ -436,7 +436,7 @@
// type instead of generic wxOptionsPageDynamic
typedef wxOptionsPage *(*NewFunc_t)
(
- wxNotebook *parent,
+ MBookCtrl *parent,
const wxString& title,
Profile *profile,
wxOptionsPage::FieldInfoArray aFields,
@@ -473,7 +473,7 @@
}
// create a page from this description
- wxOptionsPage *New(wxNotebook *parent, Profile *profile, int image) const
+ wxOptionsPage *New(MBookCtrl *parent, Profile *profile, int image) const
{
return (*m_pfnNew)
(
@@ -514,7 +514,7 @@
class wxOptionsPageIdent : public wxOptionsPageStandard
{
public:
- wxOptionsPageIdent(wxNotebook *parent, Profile *profile);
+ wxOptionsPageIdent(MBookCtrl *parent, Profile *profile);
void OnButton(wxCommandEvent&);
@@ -527,10 +527,10 @@
class wxOptionsPageNetwork : public wxOptionsPageStandard
{
public:
- wxOptionsPageNetwork(wxNotebook *parent, Profile *profile);
+ wxOptionsPageNetwork(MBookCtrl *parent, Profile *profile);
// for wxOptionsPageDesc
- static wxOptionsPage *New(wxNotebook *parent,
+ static wxOptionsPage *New(MBookCtrl *parent,
const wxString& title,
Profile *profile,
FieldInfoArray aFields,
@@ -551,7 +551,7 @@
private:
// ctor for New()
- wxOptionsPageNetwork(wxNotebook *parent,
+ wxOptionsPageNetwork(MBookCtrl *parent,
const wxString& title,
Profile *profile,
FieldInfoArray aFields,
@@ -587,7 +587,7 @@
class wxOptionsPageNewMail : public wxOptionsPageStandard
{
public:
- wxOptionsPageNewMail(wxNotebook *parent, Profile *profile);
+ wxOptionsPageNewMail(MBookCtrl *parent, Profile *profile);
virtual ~wxOptionsPageNewMail();
void OnButton(wxCommandEvent&);
@@ -618,12 +618,12 @@
class wxOptionsPageCompose : public wxOptionsPageStandard
{
public:
- wxOptionsPageCompose(wxNotebook *parent, Profile *profile);
+ wxOptionsPageCompose(MBookCtrl *parent, Profile *profile);
void OnButton(wxCommandEvent& event);
// for wxOptionsPageDesc
- static wxOptionsPage *New(wxNotebook *parent,
+ static wxOptionsPage *New(MBookCtrl *parent,
const wxString& title,
Profile *profile,
FieldInfoArray aFields,
@@ -640,7 +640,7 @@
private:
// ctor for New()
- wxOptionsPageCompose(wxNotebook *parent,
+ wxOptionsPageCompose(MBookCtrl *parent,
const wxString& title,
Profile *profile,
FieldInfoArray aFields,
@@ -664,7 +664,7 @@
class wxOptionsPageReply : public wxOptionsPageStandard
{
public:
- wxOptionsPageReply(wxNotebook *parent, Profile *profile);
+ wxOptionsPageReply(MBookCtrl *parent, Profile *profile);
private:
DECLARE_NO_COPY_CLASS(wxOptionsPageReply)
@@ -674,7 +674,7 @@
class wxOptionsPageMessageView : public wxOptionsPageStandard
{
public:
- wxOptionsPageMessageView(wxNotebook *parent, Profile *profile);
+ wxOptionsPageMessageView(MBookCtrl *parent, Profile *profile);
void OnButton(wxCommandEvent&);
@@ -697,7 +697,7 @@
class wxOptionsPageFolderView : public wxOptionsPageStandard
{
public:
- wxOptionsPageFolderView(wxNotebook *parent, Profile *profile);
+ wxOptionsPageFolderView(MBookCtrl *parent, Profile *profile);
protected:
virtual bool DoTransferOptionsToWindow();
@@ -714,7 +714,7 @@
class wxOptionsPageFolderTree : public wxOptionsPageStandard
{
public:
- wxOptionsPageFolderTree(wxNotebook *parent, Profile *profile);
+ wxOptionsPageFolderTree(MBookCtrl *parent, Profile *profile);
protected:
virtual bool DoTransferOptionsToWindow();
@@ -731,7 +731,7 @@
class wxOptionsPageFolders : public wxOptionsPageStandard
{
public:
- wxOptionsPageFolders(wxNotebook *parent, Profile *profile);
+ wxOptionsPageFolders(MBookCtrl *parent, Profile *profile);
protected:
virtual bool DoTransferOptionsToWindow();
@@ -752,7 +752,7 @@
class wxOptionsPagePython : public wxOptionsPageStandard
{
public:
- wxOptionsPagePython(wxNotebook *parent, Profile *profile);
+ wxOptionsPagePython(MBookCtrl *parent, Profile *profile);
virtual bool DoTransferOptionsFromWindow();
@@ -766,7 +766,7 @@
class wxOptionsPageAdb : public wxOptionsPageStandard
{
public:
- wxOptionsPageAdb(wxNotebook *parent, Profile *profile);
+ wxOptionsPageAdb(MBookCtrl *parent, Profile *profile);
protected:
virtual bool DoTransferOptionsToWindow();
@@ -781,7 +781,7 @@
class wxOptionsPageHelpers : public wxOptionsPageStandard
{
public:
- wxOptionsPageHelpers(wxNotebook *parent, Profile *profile);
+ wxOptionsPageHelpers(MBookCtrl *parent, Profile *profile);
private:
DECLARE_NO_COPY_CLASS(wxOptionsPageHelpers)
@@ -791,7 +791,7 @@
class wxOptionsPageSync : public wxOptionsPageStandard
{
public:
- wxOptionsPageSync(wxNotebook *parent, Profile *profile);
+ wxOptionsPageSync(MBookCtrl *parent, Profile *profile);
protected:
virtual bool DoTransferOptionsToWindow();
@@ -818,7 +818,7 @@
class wxOptionsPageOthers : public wxOptionsPageStandard
{
public:
- wxOptionsPageOthers(wxNotebook *parent, Profile *profile);
+ wxOptionsPageOthers(MBookCtrl *parent, Profile *profile);
protected:
virtual bool DoTransferOptionsToWindow();
@@ -844,7 +844,7 @@
class wxOptionsPageTest : public wxOptionsPageStandard
{
public:
- wxOptionsPageTest(wxNotebook *parent, Profile *profile);
+ wxOptionsPageTest(MBookCtrl *parent, Profile *profile);
};
#endif // USE_TEST_PAGE
Modified: trunk/M/src/gui/wxDialogLayout.cpp
===================================================================
--- trunk/M/src/gui/wxDialogLayout.cpp 2008-10-03 21:06:31 UTC (rev 7548)
+++ trunk/M/src/gui/wxDialogLayout.cpp 2008-10-03 21:08:04 UTC (rev 7549)
@@ -126,11 +126,11 @@
EVT_SIZE(wxEnhancedPanel::OnSize)
END_EVENT_TABLE()
-BEGIN_EVENT_TABLE(wxNotebookPageBase, wxEnhancedPanel)
- EVT_TEXT (-1, wxNotebookPageBase::OnChange)
- EVT_CHECKBOX(-1, wxNotebookPageBase::OnChange)
- EVT_RADIOBOX(-1, wxNotebookPageBase::OnChange)
- EVT_COMBOBOX(-1, wxNotebookPageBase::OnChange)
+BEGIN_EVENT_TABLE(MBookCtrlPageBase, wxEnhancedPanel)
+ EVT_TEXT (-1, MBookCtrlPageBase::OnChange)
+ EVT_CHECKBOX(-1, MBookCtrlPageBase::OnChange)
+ EVT_RADIOBOX(-1, MBookCtrlPageBase::OnChange)
+ EVT_COMBOBOX(-1, MBookCtrlPageBase::OnChange)
END_EVENT_TABLE()
BEGIN_EVENT_TABLE(wxManuallyLaidOutDialog, wxDialog)
@@ -586,7 +586,7 @@
wxNotebookWithImages::wxNotebookWithImages(const wxString& configPath,
wxWindow *parent,
const char *aszImages[])
- : wxPNotebook(configPath, parent, -1)
+ : MPBookCtrl(configPath, parent, -1)
{
if ( ShouldShowIcons() )
{
@@ -1111,10 +1111,10 @@
}
// ----------------------------------------------------------------------------
-// wxNotebookPageBase
+// MBookCtrlPageBase
// ----------------------------------------------------------------------------
-void wxNotebookPageBase::OnChange(wxCommandEvent& /* event */)
+void MBookCtrlPageBase::OnChange(wxCommandEvent& /* event */)
{
wxOptionsEditDialog *dlg = GET_PARENT_OF_CLASS(this, wxOptionsEditDialog);
if ( dlg )
Modified: trunk/M/src/gui/wxMFolderDialogs.cpp
===================================================================
--- trunk/M/src/gui/wxMFolderDialogs.cpp 2008-10-03 21:06:31 UTC (rev 7548)
+++ trunk/M/src/gui/wxMFolderDialogs.cpp 2008-10-03 21:08:04 UTC (rev 7549)
@@ -279,10 +279,10 @@
// HACK: the 3rd argument to the ctor tells us whether we're creating a new
// folder (if it's !NULL) or just showing properties of an existing one.
// Our UI behaves slightly differently in these 2 cases.
-class wxFolderPropertiesPage : public wxNotebookPageBase
+class wxFolderPropertiesPage : public MBookCtrlPageBase
{
public:
- wxFolderPropertiesPage(wxNotebook *notebook,
+ wxFolderPropertiesPage(MBookCtrl *notebook,
Profile *profile,
wxFolderCreateDialog *dlg = NULL);
@@ -431,7 +431,7 @@
void EnableControlsForFileFolder(MFolderType folderType);
/// the parent notebook control
- wxNotebook *m_notebook;
+ MBookCtrl *m_notebook;
/// the profile we use to read our settings from/write them to
Profile *m_profile;
@@ -583,7 +583,7 @@
EVT_UPDATE_UI(wxID_APPLY, wxFolderCreateDialog::OnUpdateButton)
END_EVENT_TABLE()
-BEGIN_EVENT_TABLE(wxFolderPropertiesPage, wxNotebookPageBase)
+BEGIN_EVENT_TABLE(wxFolderPropertiesPage, MBookCtrlPageBase)
EVT_RADIOBOX(-1, wxFolderPropertiesPage::OnRadioBox)
EVT_CHECKBOX(-1, wxFolderPropertiesPage::OnCheckBox)
EVT_COMBOBOX(-1, wxFolderPropertiesPage::OnComboBox)
@@ -966,10 +966,10 @@
// wxFolderPropertiesPage
// ----------------------------------------------------------------------------
-wxFolderPropertiesPage::wxFolderPropertiesPage(wxNotebook *notebook,
+wxFolderPropertiesPage::wxFolderPropertiesPage(MBookCtrl *notebook,
Profile *profile,
wxFolderCreateDialog *dlg)
- : wxNotebookPageBase(notebook)
+ : MBookCtrlPageBase(notebook)
{
// add us to the notebook
int image = FolderCreatePage_Folder;
Modified: trunk/M/src/gui/wxOptionsDlg.cpp
===================================================================
--- trunk/M/src/gui/wxOptionsDlg.cpp 2008-10-03 21:06:31 UTC (rev 7548)
+++ trunk/M/src/gui/wxOptionsDlg.cpp 2008-10-03 21:08:04 UTC (rev 7549)
@@ -940,7 +940,7 @@
IMPLEMENT_ABSTRACT_CLASS(wxGlobalOptionsDialog, wxOptionsEditDialog)
-BEGIN_EVENT_TABLE(wxOptionsPage, wxNotebookPageBase)
+BEGIN_EVENT_TABLE(wxOptionsPage, MBookCtrlPageBase)
// any change should make us dirty
EVT_CHECKBOX(-1, wxOptionsPage::OnControlChange)
EVT_RADIOBOX(-1, wxOptionsPage::OnControlChange)
@@ -2433,12 +2433,12 @@
ConfigValuesArray aDefaults,
size_t nFirst,
size_t nLast,
- wxNotebook *notebook,
+ MBookCtrl *notebook,
const wxString& title,
Profile *profile,
int helpId,
int image)
- : wxNotebookPageBase(notebook)
+ : MBookCtrlPageBase(notebook)
{
Create(aFields, aDefaults, nFirst, nLast, notebook, title,
profile, helpId, image);
@@ -2449,7 +2449,7 @@
ConfigValuesArray aDefaults,
size_t nFirst,
size_t nLast,
- wxNotebook *notebook,
+ MBookCtrl *notebook,
const wxString& title,
Profile *profile,
int helpId,
@@ -2497,7 +2497,7 @@
bool wxOptionsPage::Show(bool show)
{
- if ( !wxNotebookPageBase::Show(show) )
+ if ( !MBookCtrlPageBase::Show(show) )
return false;
if ( show && m_aControls.IsEmpty() )
@@ -3425,7 +3425,7 @@
// wxOptionsPageDynamic
// ----------------------------------------------------------------------------
-wxOptionsPageDynamic::wxOptionsPageDynamic(wxNotebook *parent,
+wxOptionsPageDynamic::wxOptionsPageDynamic(MBookCtrl *parent,
const wxString& title,
Profile *profile,
FieldInfoArray aFields,
@@ -3442,7 +3442,7 @@
}
bool
-wxOptionsPageDynamic::Create(wxNotebook *parent,
+wxOptionsPageDynamic::Create(MBookCtrl *parent,
const wxString& title,
Profile *profile,
FieldInfoArray aFields,
@@ -3470,7 +3470,7 @@
// wxOptionsPageStandard
// ----------------------------------------------------------------------------
-wxOptionsPageStandard::wxOptionsPageStandard(wxNotebook *notebook,
+wxOptionsPageStandard::wxOptionsPageStandard(MBookCtrl *notebook,
const wxString& title,
Profile *profile,
int nFirst,
@@ -3487,7 +3487,7 @@
ASSERT_MSG( nFirst >= -1, _T("bad parameret in wxOptionsPageStandard ctor") );
}
-wxOptionsPageStandard::wxOptionsPageStandard(wxNotebook *parent,
+wxOptionsPageStandard::wxOptionsPageStandard(MBookCtrl *parent,
const wxString& title,
Profile *profile,
FieldInfoArray aFields,
@@ -3507,7 +3507,7 @@
// wxOptionsPageCompose
// ----------------------------------------------------------------------------
-wxOptionsPageCompose::wxOptionsPageCompose(wxNotebook *parent,
+wxOptionsPageCompose::wxOptionsPageCompose(MBookCtrl *parent,
Profile *profile)
: wxOptionsPageStandard(parent,
_("Compose"),
@@ -3564,7 +3564,7 @@
// wxOptionsPageReply
// ----------------------------------------------------------------------------
-wxOptionsPageReply::wxOptionsPageReply(wxNotebook *parent, Profile *profile)
+wxOptionsPageReply::wxOptionsPageReply(MBookCtrl *parent, Profile *profile)
: wxOptionsPageStandard(parent,
_("Reply"),
profile,
@@ -3580,7 +3580,7 @@
// wxOptionsPageMessageView
// ----------------------------------------------------------------------------
-wxOptionsPageMessageView::wxOptionsPageMessageView(wxNotebook *parent,
+wxOptionsPageMessageView::wxOptionsPageMessageView(MBookCtrl *parent,
Profile *profile)
: wxOptionsPageStandard(parent,
_("Message View"),
@@ -3696,7 +3696,7 @@
FolderViewPage_Show_Last
};
-wxOptionsPageFolderView::wxOptionsPageFolderView(wxNotebook *parent,
+wxOptionsPageFolderView::wxOptionsPageFolderView(MBookCtrl *parent,
Profile *profile)
: wxOptionsPageStandard(parent,
_("Folder View"),
@@ -3799,7 +3799,7 @@
// wxOptionsPageFolderTree
// ----------------------------------------------------------------------------
-wxOptionsPageFolderTree::wxOptionsPageFolderTree(wxNotebook *parent,
+wxOptionsPageFolderTree::wxOptionsPageFolderTree(MBookCtrl *parent,
Profile *profile)
: wxOptionsPageStandard(parent,
_("Folder Tree"),
@@ -3871,7 +3871,7 @@
// wxOptionsPageIdent
// ----------------------------------------------------------------------------
-wxOptionsPageIdent::wxOptionsPageIdent(wxNotebook *parent,
+wxOptionsPageIdent::wxOptionsPageIdent(MBookCtrl *parent,
Profile *profile)
: wxOptionsPageStandard(parent,
_("Identity"),
@@ -3900,7 +3900,7 @@
// wxOptionsPageNetwork
// ----------------------------------------------------------------------------
-wxOptionsPageNetwork::wxOptionsPageNetwork(wxNotebook *parent,
+wxOptionsPageNetwork::wxOptionsPageNetwork(MBookCtrl *parent,
Profile *profile)
: wxOptionsPageStandard(parent,
_("Network"),
@@ -4031,7 +4031,7 @@
// wxOptionsPageNewMail
// ----------------------------------------------------------------------------
-wxOptionsPageNewMail::wxOptionsPageNewMail(wxNotebook *parent,
+wxOptionsPageNewMail::wxOptionsPageNewMail(MBookCtrl *parent,
Profile *profile)
: wxOptionsPageStandard(parent,
_("New Mail"),
@@ -4204,7 +4204,7 @@
#ifdef USE_PYTHON
-wxOptionsPagePython::wxOptionsPagePython(wxNotebook *parent,
+wxOptionsPagePython::wxOptionsPagePython(MBookCtrl *parent,
Profile *profile)
: wxOptionsPageStandard(parent,
_("Python"),
@@ -4243,7 +4243,7 @@
// wxOptionsPageAdb
// ----------------------------------------------------------------------------
-wxOptionsPageAdb::wxOptionsPageAdb(wxNotebook *parent,
+wxOptionsPageAdb::wxOptionsPageAdb(MBookCtrl *parent,
Profile *profile)
: wxOptionsPageStandard(parent,
_("Addresses"),
@@ -4319,7 +4319,7 @@
// wxOptionsPageSync
// ----------------------------------------------------------------------------
-wxOptionsPageSync::wxOptionsPageSync(wxNotebook *parent,
+wxOptionsPageSync::wxOptionsPageSync(MBookCtrl *parent,
Profile *profile)
: wxOptionsPageStandard(parent,
_("Synchronize"),
@@ -4506,7 +4506,7 @@
#ifdef USE_TEST_PAGE
-wxOptionsPageTest::wxOptionsPageTest(wxNotebook *parent,
+wxOptionsPageTest::wxOptionsPageTest(MBookCtrl *parent,
Profile *profile)
: wxOptionsPageStandard(parent,
_T("Test page"),
@@ -4522,7 +4522,7 @@
// wxOptionsPageOthers
// ----------------------------------------------------------------------------
-wxOptionsPageOthers::wxOptionsPageOthers(wxNotebook *parent,
+wxOptionsPageOthers::wxOptionsPageOthers(MBookCtrl *parent,
Profile *profile)
: wxOptionsPageStandard(parent,
_("Miscellaneous"),
@@ -4633,7 +4633,7 @@
// wxOptionsPageHelpers
// ----------------------------------------------------------------------------
-wxOptionsPageHelpers::wxOptionsPageHelpers(wxNotebook *parent,
+wxOptionsPageHelpers::wxOptionsPageHelpers(MBookCtrl *parent,
Profile *profile)
: wxOptionsPageStandard(parent,
_("Helpers"),
@@ -4648,7 +4648,7 @@
// wxOptionsPageFolders
// ----------------------------------------------------------------------------
-wxOptionsPageFolders::wxOptionsPageFolders(wxNotebook *parent,
+wxOptionsPageFolders::wxOptionsPageFolders(MBookCtrl *parent,
Profile *profile)
: wxOptionsPageStandard(parent,
_("Folders"),
Modified: trunk/M/src/mail/SpamFilter.cpp
===================================================================
--- trunk/M/src/mail/SpamFilter.cpp 2008-10-03 21:06:31 UTC (rev 7548)
+++ trunk/M/src/mail/SpamFilter.cpp 2008-10-03 21:08:04 UTC (rev 7549)
@@ -133,9 +133,9 @@
virtual void CreateNotebook(wxPanel *panel)
{
- m_notebook = new wxPNotebook(_T("SpamOptions"), panel);
- Connect(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
- wxNotebookEventHandler(SpamOptionsDialog::OnPageChanged));
+ m_notebook = new MPBookCtrl(_T("SpamOptions"), panel);
+ Connect(M_EVT_BOOK_PAGE_CHANGED,
+ MBookEventHandler(SpamOptionsDialog::OnPageChanged));
if ( m_imagelist )
m_notebook->AssignImageList(m_imagelist);
@@ -665,7 +665,7 @@
// ----------------------------------------------------------------------------
SpamOptionsPage *
-SpamFilter::CreateOptionPage(wxListOrNoteBook * /* notebook */,
+SpamFilter::CreateOptionPage(MBookCtrl * /* notebook */,
Profile * /* profile */) const
{
return NULL;
Modified: trunk/M/src/modules/spam/DspamFilter.cpp
===================================================================
--- trunk/M/src/modules/spam/DspamFilter.cpp 2008-10-03 21:06:31 UTC (rev 7548)
+++ trunk/M/src/modules/spam/DspamFilter.cpp 2008-10-03 21:08:04 UTC (rev 7549)
@@ -187,7 +187,7 @@
const String& param,
String *result);
virtual const char *GetOptionPageIconName() const { return "dspam"; }
- virtual SpamOptionsPage *CreateOptionPage(wxListOrNoteBook *notebook,
+ virtual SpamOptionsPage *CreateOptionPage(MBookCtrl *notebook,
Profile *profile) const;
// get the context creating it on demand
@@ -254,7 +254,7 @@
{
public:
DspamOptionsPage(DspamFilter *filter,
- wxNotebook *parent,
+ MBookCtrl *parent,
const wxString& title,
Profile *profile,
FieldInfoArray aFields,
@@ -561,7 +561,7 @@
};
SpamOptionsPage *
-DspamFilter::CreateOptionPage(wxListOrNoteBook *notebook,
+DspamFilter::CreateOptionPage(MBookCtrl *notebook,
Profile *profile) const
{
static const wxOptionsPage::FieldInfo s_fields[] =
Modified: trunk/M/src/modules/spam/HeadersFilter.cpp
===================================================================
--- trunk/M/src/modules/spam/HeadersFilter.cpp 2008-10-03 21:06:31 UTC (rev 7548)
+++ trunk/M/src/modules/spam/HeadersFilter.cpp 2008-10-03 21:08:04 UTC (rev 7549)
@@ -225,7 +225,7 @@
const String& param,
String *result);
virtual const char *GetOptionPageIconName() const { return "spam"; }
- virtual SpamOptionsPage *CreateOptionPage(wxListOrNoteBook *notebook,
+ virtual SpamOptionsPage *CreateOptionPage(MBookCtrl *notebook,
Profile *profile) const;
@@ -410,7 +410,7 @@
class HeadersOptionsPage : public SpamOptionsPage
{
public:
- HeadersOptionsPage(wxListOrNoteBook *notebook, Profile *profile);
+ HeadersOptionsPage(MBookCtrl *notebook, Profile *profile);
private:
ConfigValueDefault *GetConfigValues();
@@ -1239,7 +1239,7 @@
// ----------------------------------------------------------------------------
SpamOptionsPage *
-HeadersFilter::CreateOptionPage(wxListOrNoteBook *notebook,
+HeadersFilter::CreateOptionPage(MBookCtrl *notebook,
Profile *profile) const
{
return new HeadersOptionsPage(notebook, profile);
@@ -1271,7 +1271,7 @@
HeadersOptionsPage::ms_count = WXSIZEOF(HeadersOptionsPage::ms_members);
-HeadersOptionsPage::HeadersOptionsPage(wxListOrNoteBook *notebook,
+HeadersOptionsPage::HeadersOptionsPage(MBookCtrl *notebook,
Profile *profile)
: SpamOptionsPage(notebook, profile)
{
Modified: trunk/M/src/modules/spam/ServerSideFilter.cpp
===================================================================
--- trunk/M/src/modules/spam/ServerSideFilter.cpp 2008-10-03 21:06:31 UTC (rev 7548)
+++ trunk/M/src/modules/spam/ServerSideFilter.cpp 2008-10-03 21:08:04 UTC (rev 7549)
@@ -67,7 +67,7 @@
const String& param,
String *result);
virtual const char *GetOptionPageIconName() const { return "serverspam"; }
- virtual SpamOptionsPage *CreateOptionPage(wxListOrNoteBook *notebook,
+ virtual SpamOptionsPage *CreateOptionPage(MBookCtrl *notebook,
Profile *profile) const;
private:
@@ -86,7 +86,7 @@
{
public:
ServerSideOptionsPage(const ServerSideFilter *filter,
- wxNotebook *parent,
+ MBookCtrl *parent,
Profile *profile);
private:
@@ -198,7 +198,7 @@
// ----------------------------------------------------------------------------
SpamOptionsPage *
-ServerSideFilter::CreateOptionPage(wxListOrNoteBook *notebook,
+ServerSideFilter::CreateOptionPage(MBookCtrl *notebook,
Profile *profile) const
{
return new ServerSideOptionsPage(this, notebook, profile);
@@ -224,7 +224,7 @@
};
ServerSideOptionsPage::ServerSideOptionsPage(const ServerSideFilter *filter,
- wxListOrNoteBook *notebook,
+ MBookCtrl *notebook,
Profile *profile)
: SpamOptionsPage(notebook, profile)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/