X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/debe6624c1e9d4bf3243381153d1e173c849bcd8..275bf4c13ab7f4b041b0d5c78cfdece709800d14:/include/wx/msw/mdi.h diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h index d5039e704e..a07466a196 100644 --- a/include/wx/msw/mdi.h +++ b/include/wx/msw/mdi.h @@ -63,10 +63,6 @@ class WXDLLEXPORT wxMDIParentFrame: public wxFrame void OnSize(wxSizeEvent& event); void OnActivate(wxActivateEvent& event); - // Toolbar (currently, for use by Windows MDI parent frames ONLY) - virtual inline void SetToolBar(wxWindow *toolbar) { m_frameToolBar = toolbar; } - virtual inline wxWindow *GetToolBar(void) const { return m_frameToolBar; } - void SetMenuBar(wxMenuBar *menu_bar); // Gets the size available for subwindows after menu size, toolbar size @@ -98,6 +94,7 @@ class WXDLLEXPORT wxMDIParentFrame: public wxFrame bool MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control); void MSWOnMenuHighlight(WXWORD item, WXWORD flags, WXHMENU sysmenu); bool MSWProcessMessage(WXMSG *msg); + bool MSWTranslateMessage(WXMSG *msg); void MSWOnCreate(WXLPCREATESTRUCT cs); long MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); bool MSWOnEraseBkgnd(WXHDC pDC); @@ -113,7 +110,6 @@ class WXDLLEXPORT wxMDIParentFrame: public wxFrame WXHMENU m_windowMenu; bool m_parentFrameActive; // TRUE if MDI Frame is intercepting // commands, not child - wxWindow * m_frameToolBar ; DECLARE_EVENT_TABLE() }; @@ -166,6 +162,7 @@ class WXDLLEXPORT wxMDIChildFrame: public wxFrame bool MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control); long MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); bool MSWProcessMessage(WXMSG *msg); + bool MSWTranslateMessage(WXMSG *msg); void MSWDestroyWindow(void); // Implementation