X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..62675f1e331549a873edd094c686fae771e862c5:/include/wx/msw/mdi.h?ds=inline diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h index 7e2297986f..b872359a2b 100644 --- a/include/wx/msw/mdi.h +++ b/include/wx/msw/mdi.h @@ -12,14 +12,9 @@ #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 wxChar) wxStatusLineNameStr[]; class WXDLLEXPORT wxMDIClientWindow; class WXDLLEXPORT wxMDIChildFrame; @@ -69,11 +64,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(); @@ -85,14 +81,15 @@ 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); // override window proc for MDI-specific message processing - virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); - virtual long MSWDefWindowProc(WXUINT, WXWPARAM, WXLPARAM); + virtual WXLRESULT MSWDefWindowProc(WXUINT, WXWPARAM, WXLPARAM); virtual bool MSWTranslateMessage(WXMSG* msg); protected: @@ -102,11 +99,15 @@ 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; - // TRUE if MDI Frame is intercepting commands, not child + // true if MDI Frame is intercepting commands, not child bool m_parentFrameActive; private: @@ -148,10 +149,10 @@ public: long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr); - virtual bool IsTopLevel() const { return FALSE; } + virtual bool IsTopLevel() const { return false; } // MDI operations - virtual void Maximize(bool maximize = TRUE); + virtual void Maximize(bool maximize = true); virtual void Restore(); virtual void Activate(); @@ -164,8 +165,8 @@ public: bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control); bool HandleGetMinMaxInfo(void *mmInfo); - virtual long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); - virtual long MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); + virtual WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); + virtual WXLRESULT MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); virtual bool MSWTranslateMessage(WXMSG *msg); virtual void MSWDestroyWindow(); @@ -174,11 +175,14 @@ 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); virtual void InternalSetMenuBar(); - virtual bool IsMDIChild() const { return TRUE; } + virtual bool IsMDIChild() const { return true; } + virtual void DetachMenuBar(); virtual WXHICON GetDefaultIcon() const; @@ -186,6 +190,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() @@ -214,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;