X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63ec432bd7b9c93961e85e871bcb31758364a634..b34497d885c68acefc7f04f7b129a141f5ade7d0:/include/wx/msw/mdi.h diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h index 9f31e4543e..b872359a2b 100644 --- a/include/wx/msw/mdi.h +++ b/include/wx/msw/mdi.h @@ -14,7 +14,6 @@ #include "wx/frame.h" -extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[]; extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[]; class WXDLLEXPORT wxMDIClientWindow; @@ -183,6 +182,7 @@ protected: virtual void DoSetClientSize(int width, int height); virtual void InternalSetMenuBar(); virtual bool IsMDIChild() const { return true; } + virtual void DetachMenuBar(); virtual WXHICON GetDefaultIcon() const; @@ -192,7 +192,6 @@ protected: 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 - virtual void DetachMenuBar() ; DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIChildFrame) @@ -220,10 +219,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;