X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82c9f85ce5aceaa3aedac7e690070d5eff904e5b..487f2d58e9d1c28cc54e9800affd91623adadac7:/include/wx/msw/mdi.h diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h index b65c21f750..7e2297986f 100644 --- a/include/wx/msw/mdi.h +++ b/include/wx/msw/mdi.h @@ -12,7 +12,7 @@ #ifndef _WX_MDI_H_ #define _WX_MDI_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "mdi.h" #endif @@ -66,7 +66,7 @@ public: // just return a new class) virtual wxMDIClientWindow *OnCreateClient(void); -// WXHMENU GetWindowHMENU() const { return m_windowMenu; } + // MDI windows menu wxMenu* GetWindowMenu() const { return m_windowMenu; }; void SetWindowMenu(wxMenu* menu) ; @@ -114,6 +114,7 @@ private: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxMDIParentFrame) + DECLARE_NO_COPY_CLASS(wxMDIParentFrame) }; // --------------------------------------------------------------------------- @@ -188,7 +189,7 @@ private: bool m_needsResize; // flag which tells us to artificially resize the frame DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxMDIChildFrame) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIChildFrame) }; // --------------------------------------------------------------------------- @@ -223,7 +224,7 @@ protected: private: DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxMDIClientWindow) + DECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIClientWindow) }; #endif