X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2596e9fb2c6f7c999cdf1ffaa62b043e1bb4ce1e..d5cbee178f213c1bae361abca0113646bf323584:/include/wx/msw/mdi.h diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h index 04705e7aa9..93cede426a 100644 --- a/include/wx/msw/mdi.h +++ b/include/wx/msw/mdi.h @@ -12,17 +12,12 @@ #ifndef _WX_MDI_H_ #define _WX_MDI_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "mdi.h" -#endif - #include "wx/frame.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr; +extern WXDLLEXPORT_DATA(const char) wxStatusLineNameStr[]; -class WXDLLEXPORT wxMDIClientWindow; -class WXDLLEXPORT wxMDIChildFrame; +class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow; +class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; // --------------------------------------------------------------------------- // wxMDIParentFrame @@ -43,7 +38,7 @@ public: Create(parent, id, title, pos, size, style, name); } - ~wxMDIParentFrame(); + virtual ~wxMDIParentFrame(); bool Create(wxWindow *parent, wxWindowID id, @@ -67,14 +62,14 @@ public: virtual wxMDIClientWindow *OnCreateClient(void); // MDI windows menu - wxMenu* GetWindowMenu() const { return m_windowMenu; }; + wxMenu* GetWindowMenu() const { return m_windowMenu; } void SetWindowMenu(wxMenu* menu) ; virtual void DoMenuUpdates(wxMenu* menu = NULL); - + // MDI operations // -------------- virtual void Cascade(); - virtual void Tile(); + virtual void Tile(wxOrientation orient = wxHORIZONTAL); virtual void ArrangeIcons(); virtual void ActivateNext(); virtual void ActivatePrevious(); @@ -86,6 +81,7 @@ public: void OnSysColourChanged(wxSysColourChangedEvent& event); void OnSize(wxSizeEvent& event); + void OnIconized(wxIconizeEvent& event); bool HandleActivate(int state, bool minimized, WXHWND activate); bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control); @@ -96,6 +92,9 @@ public: virtual WXLRESULT MSWDefWindowProc(WXUINT, WXWPARAM, WXLPARAM); virtual bool MSWTranslateMessage(WXMSG* msg); + // override wxFrameBase function to also look in the active child menu bar + virtual const wxMenuItem *FindItemInMenuBar(int menuId) const; + protected: #if wxUSE_MENUS_NATIVE virtual void InternalSetMenuBar(); @@ -103,6 +102,10 @@ protected: virtual WXHICON GetDefaultIcon() const; + // set the size of the MDI client window to match the frame size + void UpdateClientSize(); + + wxMDIClientWindow * m_clientWindow; wxMDIChildFrame * m_currentChild; wxMenu* m_windowMenu; @@ -111,7 +114,7 @@ protected: bool m_parentFrameActive; private: - friend class WXDLLEXPORT wxMDIChildFrame; + friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxMDIParentFrame) @@ -139,7 +142,7 @@ public: Create(parent, id, title, pos, size, style, name); } - ~wxMDIChildFrame(); + virtual ~wxMDIChildFrame(); bool Create(wxMDIParentFrame *parent, wxWindowID id, @@ -174,14 +177,16 @@ public: bool ResetWindowStyle(void *vrect); void OnIdle(wxIdleEvent& event); - + virtual bool Show(bool show = true); protected: + virtual void DoGetScreenPosition(int *x, int *y) const; virtual void DoGetPosition(int *x, int *y) const; virtual void DoSetClientSize(int width, int height); virtual void InternalSetMenuBar(); virtual bool IsMDIChild() const { return true; } + virtual void DetachMenuBar(); virtual WXHICON GetDefaultIcon() const; @@ -218,10 +223,11 @@ public: // Explicitly call default scroll behaviour void OnScroll(wxScrollEvent& event); +protected: virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); -protected: + void Init() { m_scrollX = m_scrollY = 0; } int m_scrollX, m_scrollY;