Update of /cvsroot/mahogany/M/include/gui
In directory usw-pr-cvs1:/tmp/cvs-serv15241/include/gui
Modified Files:
wxFolderView.h wxMFrame.h wxMainFrame.h
Log Message:
1. use the options of the currently selected folder, not the currently opened
one, for the composer
2. wxMFrame::GetFolderProfile() now always returns non-NULL, IncRef()'d
pointer just as wxFolderView method of the same name already did
Index: wxFolderView.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxFolderView.h,v
retrieving revision 1.130
retrieving revision 1.131
diff -b -u -2 -r1.130 -r1.131
--- wxFolderView.h 18 Jan 2002 20:08:38 -0000 1.130
+++ wxFolderView.h 4 Mar 2002 17:00:46 -0000 1.131
@@ -333,13 +333,13 @@
void OnUpdateUI(wxUpdateUIEvent& event);
- /** This virtual method returns either NULL or a (not incref'd)
- pointer to the profile of the mailfolder being displayed, for
- those wxMFrames which have a folder displayed. Used to make the
- compose view inherit the current folder's settings.
+ /**
+ This virtual method returns a pointer to the profile of the mailfolder
+ being displayed, for those wxMFrames which have a folder displayed or the
+ global application profile for the other ones. Used to make the compose
+ view inherit the current folder's settings.
+
+ @return profile pointer, the caller must DecRef() it
*/
- virtual Profile *GetFolderProfile(void)
- {
- return m_FolderView ? m_FolderView->GetProfile() : NULL;
- }
+ virtual Profile *GetFolderProfile(void) const;
/// don't even think of using this!
Index: wxMFrame.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxMFrame.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -b -u -2 -r1.38 -r1.39
--- wxMFrame.h 23 Oct 2001 16:07:56 -0000 1.38
+++ wxMFrame.h 4 Mar 2002 17:00:46 -0000 1.39
@@ -28,4 +28,6 @@
#endif // wxMSW < 2.3.0
+class Profile;
+
/**
* A wxWindows Frame class
@@ -71,11 +73,13 @@
void SetTitle(String const & name);
- /** This virtual method returns either NULL or an incref'd
- pointer to the profile of the mailfolder being displayed, for
- those wxMFrames which have a folder displayed. Used to make the
- compose view inherit the current folder's settings.
+ /**
+ This virtual method returns a pointer to the profile of the mailfolder
+ being displayed, for those wxMFrames which have a folder displayed or the
+ global application profile for the other ones. Used to make the compose
+ view inherit the current folder's settings.
+
+ @return profile pointer, the caller must DecRef() it
*/
- virtual class Profile *GetFolderProfile(void)
- { return NULL; }
+ virtual Profile *GetFolderProfile(void) const;
/// Passes a menu id to modules for reacting to it.
Index: wxMainFrame.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxMainFrame.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -b -u -2 -r1.38 -r1.39
--- wxMainFrame.h 23 Oct 2001 18:12:05 -0000 1.38
+++ wxMainFrame.h 4 Mar 2002 17:00:46 -0000 1.39
@@ -72,11 +72,6 @@
wxString GetFolderName(void) const { return m_folderName; }
- /**
- This virtual method returns either NULL or a (not incref'd)
- pointer to the profile of the mailfolder being displayed, for
- those wxMFrames which have a folder displayed. Used to make the
- compose view inherit the current folder's settings.
- */
- virtual Profile *GetFolderProfile(void);
+ /// Return the profile to use for the composer started from this frame
+ virtual Profile *GetFolderProfile(void) const;
/// "private" method - for wxMainFolderView use only
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
