X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/598ddd96f45745188c96f16757f7ceeaa0c8d70d..f5a1953b341d16396763bee067ccdd96108f3aad:/include/wx/msw/mdi.h?ds=sidebyside diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h index 714c097592..a5bdff00cb 100644 --- a/include/wx/msw/mdi.h +++ b/include/wx/msw/mdi.h @@ -18,8 +18,8 @@ #include "wx/frame.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxFrameNameStr; +extern WXDLLEXPORT_DATA(const wxChar*) wxStatusLineNameStr; class WXDLLEXPORT wxMDIClientWindow; class WXDLLEXPORT wxMDIChildFrame; @@ -69,11 +69,12 @@ public: // MDI windows menu 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(); @@ -174,6 +175,8 @@ public: void OnIdle(wxIdleEvent& event); + virtual bool Show(bool show = true); + protected: virtual void DoGetPosition(int *x, int *y) const; virtual void DoSetClientSize(int width, int height); @@ -186,6 +189,7 @@ protected: void Init(); private: + bool m_needsInitialShow; // Show must be called in idle time after Creation bool m_needsResize; // flag which tells us to artificially resize the frame DECLARE_EVENT_TABLE()