Update of /cvsroot/mahogany/M/include/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30724/include/gui
Modified Files:
wxFolderView.h
Log Message:
unified code handling events from kbd and menu/toolbar; the only user visible change
is that toolbar delete button now moves focus to the next message just as 'D' does
Index: wxFolderView.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/gui/wxFolderView.h,v
retrieving revision 1.147
retrieving revision 1.148
diff -b -u -2 -r1.147 -r1.148
--- wxFolderView.h 18 Dec 2003 20:39:05 -0000 1.147
+++ wxFolderView.h 8 Apr 2004 17:28:49 -0000 1.148
@@ -87,8 +87,4 @@
virtual bool OpenFolder(MFolder *folder, bool readonly = false);
- /// called on Menu selection
- void OnCommandEvent(wxCommandEvent &event);
-
-
/** Open some messages.
@param messages array holding the message numbers
@@ -181,4 +177,12 @@
wxFrame *GetParentFrame() const { return m_Frame; }
+ /**
+ @name Event handlers called from elsewhere.
+ */
+ //@{
+
+ /// General callback, forwards to DoCommandEvent()
+ void OnCommandEvent(wxCommandEvent &event);
+
/// process a keyboard event in the list control, return true if processed
bool HandleFolderViewCharEvent(wxKeyEvent& event);
@@ -187,4 +191,6 @@
bool HandleMsgViewCharEvent(wxKeyEvent& event);
+ //@}
+
protected:
/// update the view after new messages appeared in the folder
@@ -223,4 +229,20 @@
unsigned long GetDeletedCount() const;
+ /**
+ @name Event handling implementation.
+
+ Most of the events are forwarded to m_msgCmdProc, but some are handled
+ here.
+ */
+ //@{
+
+ /// Called from OnCommandEvent() and HandleFolderViewCharEvent()
+ void DoCommandEvent(int cmd);
+
+ /// Move to the next message after processing a command if necessary
+ void UpdateFocusAfterCommand(int cmd);
+
+ //@}
+
private:
/// show the next or previous message matching the search criteria
@@ -403,8 +425,4 @@
~wxFolderViewFrame();
- // callbacks
- void OnCommandEvent(wxCommandEvent& event);
- void OnUpdateUI(wxUpdateUIEvent& event);
-
/**
This virtual method returns a pointer to the profile of the mailfolder
@@ -420,4 +438,9 @@
wxFolderViewFrame(void) { wxFAIL_MSG(_T("unreachable")); }
+protected:
+ // event processing
+ void OnCommandEvent(wxCommandEvent& event);
+ void OnUpdateUI(wxUpdateUIEvent& event);
+
private:
void InternalCreate(wxFolderView *fv, wxMFrame *parent = NULL);
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
