OSDN Git Service

Fix Issue #4 in the same way as ChildFrm.cpp 2.13.13+-jp-2
authorsdottaka <none@none>
Sun, 4 Jul 2010 14:24:08 +0000 (23:24 +0900)
committersdottaka <none@none>
Sun, 4 Jul 2010 14:24:08 +0000 (23:24 +0900)
Src/DirFrame.cpp
Src/DirFrame.h

index 51c75f1..21e4326 100644 (file)
@@ -94,7 +94,6 @@ BEGIN_MESSAGE_MAP(CDirFrame, CMDIChildWnd)
        ON_WM_CLOSE()
        ON_WM_SIZE()
        ON_WM_MDIACTIVATE()
-       ON_MESSAGE(WM_SETMESSAGESTRING, OnSetMessageString)
        //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -156,27 +155,17 @@ void CDirFrame::SetFilterStatusDisplay(LPCTSTR szFilter)
 }
 
 /**
- * @brief Update statusbar
+ * @brief Handle translation of default messages on the status bar
  */
- LRESULT CDirFrame::OnSetMessageString(WPARAM wParam, LPARAM lParam)
+void CDirFrame::GetMessageString(UINT nID, CString& rMessage) const
 {
-       LRESULT ret;
-       UINT nID = (UINT)wParam;
-       if (nID == AFX_IDS_IDLEMESSAGE)
+       // load appropriate string
+       const String s = theApp.LoadString(nID);
+       if (!AfxExtractSubString(rMessage, &*s.begin(), 0))
        {
-               wParam = 0;
-               String msg = theApp.LoadString(AFX_IDS_IDLEMESSAGE);
-               TCHAR *szMsg = new TCHAR[lstrlen(msg.c_str())+1];
-               lstrcpy(szMsg, msg.c_str());
-               lParam = (LPARAM)szMsg;
-               ret = CMDIChildWnd::OnSetMessageString(wParam, lParam);
-               delete szMsg;
+               // not found
+               TRACE1("Warning: no message line prompt for ID 0x%04X.\n", nID);
        }
-       else
-       {
-               ret = CMDIChildWnd::OnSetMessageString(wParam, lParam);
-       }
-       return ret;
 }
 
 /**
index 2b6b7cd..2378c77 100644 (file)
@@ -57,6 +57,7 @@ public:
        void SetSharedMenu(HMENU hMenu) { m_hMenuShared = hMenu; };
 
 // Overrides
+       virtual void GetMessageString(UINT nID, CString& rMessage) const;
        // ClassWizard generated virtual function overrides
        //{{AFX_VIRTUAL(CDirFrame)
        public:
@@ -73,7 +74,6 @@ protected:
        afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
        afx_msg void OnClose();
        afx_msg void OnSize(UINT nType, int cx, int cy);
-       afx_msg LRESULT OnSetMessageString(WPARAM wParam, LPARAM lParam);\r
        //}}AFX_MSG
        DECLARE_MESSAGE_MAP()