X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75f11ad7ca4201f7e2626a2bf5ad84a01296eb4a..7ed24cb652413094e211940d7177d89e9fc805f5:/include/wx/os2/mdi.h diff --git a/include/wx/os2/mdi.h b/include/wx/os2/mdi.h index 83de722b34..540fdb5528 100644 --- a/include/wx/os2/mdi.h +++ b/include/wx/os2/mdi.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: mdi.h +// Name: wx/os2/mdi.h // Purpose: MDI (Multiple Document Interface) classes. // This doesn't have to be implemented just like Windows, // it could be a tabbed design as in wxGTK. @@ -16,17 +16,14 @@ #include "wx/frame.h" -WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr; -WXDLLEXPORT_DATA(extern const char*) wxStatusLineNameStr; +class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow; +class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; -class WXDLLEXPORT wxMDIClientWindow; -class WXDLLEXPORT wxMDIChildFrame; - -class WXDLLEXPORT wxMDIParentFrame: public wxFrame +class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxFrame { DECLARE_DYNAMIC_CLASS(wxMDIParentFrame) - friend class WXDLLEXPORT wxMDIChildFrame; + friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; public: wxMDIParentFrame(); @@ -41,7 +38,7 @@ public: Create(parent, id, title, pos, size, style, name); } - ~wxMDIParentFrame(); + virtual ~wxMDIParentFrame(); bool Create(wxWindow *parent, wxWindowID id, @@ -64,7 +61,8 @@ public: // just return a new class) virtual wxMDIClientWindow *OnCreateClient(void); - WXHMENU GetWindowMenu() const { return m_windowMenu; } + wxMenu* GetWindowMenu() const { return m_windowMenu; } +// void SetWindowMenu(wxMwnu* pMenu); // MDI operations // -------------- @@ -86,9 +84,9 @@ public: bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control); // override window proc for MDI-specific message processing - virtual MRESULT OS2WindowProc(HWND hwnd, WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + virtual MRESULT OS2WindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); - virtual MRESULT OS2DefWindowProc(HWND hwnd, WXUINT, WXWPARAM, WXLPARAM); + virtual MRESULT OS2DefWindowProc(WXUINT, WXWPARAM, WXLPARAM); virtual bool OS2TranslateMessage(WXMSG* msg); protected: @@ -96,18 +94,16 @@ protected: wxMDIClientWindow * m_clientWindow; wxMDIChildFrame * m_currentChild; - WXHMENU m_windowMenu; + wxMenu* m_windowMenu; // TRUE if MDI Frame is intercepting commands, not child bool m_parentFrameActive; private: - friend class WXDLLEXPORT wxMDIChildFrame; - DECLARE_EVENT_TABLE() }; -class WXDLLEXPORT wxMDIChildFrame: public wxFrame +class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxFrame { DECLARE_DYNAMIC_CLASS(wxMDIChildFrame) public: @@ -124,7 +120,7 @@ public: Create(parent, id, title, pos, size, style, name); } - ~wxMDIChildFrame(); + virtual ~wxMDIChildFrame(); bool Create(wxMDIParentFrame *parent, wxWindowID id, @@ -146,8 +142,8 @@ public: bool HandleWindowPosChanging(void *lpPos); bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control); - virtual MRESULT OS2WindowProc(HWND hwnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam); - virtual MRESULT OS2DefWindowProc(HWND hwnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam); + virtual MRESULT OS2WindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); + virtual MRESULT OS2DefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); virtual bool OS2TranslateMessage(WXMSG *msg); virtual void OS2DestroyWindow(); @@ -168,7 +164,7 @@ protected: * of the children. Phew! So the children are sort of 'adopted'... */ -class WXDLLEXPORT wxMDIClientWindow: public wxWindow +class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxWindow { DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)