X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6aca462878bbad1c83f9fc1241a23d2bbf8a8ecf..d11e8786ed13b72766eea18cb577cc00f9f08f41:/include/wx/msw/mdi.h diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h index a6fc56445b..ec07025dd6 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; @@ -70,7 +70,7 @@ public: wxMenu* GetWindowMenu() const { return m_windowMenu; }; void SetWindowMenu(wxMenu* menu) ; virtual void DoMenuUpdates(wxMenu* menu = NULL); - + // MDI operations // -------------- virtual void Cascade(); @@ -175,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); @@ -187,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()