use wxTextEntry in wxTextValidator (modified patch 1821743)

[wxWidgets.git] / include / wx / msw / mdi.h

diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index 5bbaef70db88a152205751822028fce730ce2572..8366985ec7e09447839b269b7e3d08afc9a3c2a0 100644 (file)
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -14,11 +14,10 @@
 
 #include "wx/frame.h"
 
 
 #include "wx/frame.h"
 

-extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[];

 extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
 
 extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[];
 

-class WXDLLEXPORT wxMDIClientWindow;
-class WXDLLEXPORT wxMDIChildFrame;
+class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow;
+class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;

 
 // ---------------------------------------------------------------------------
 // wxMDIParentFrame
 
 // ---------------------------------------------------------------------------
 // wxMDIParentFrame


@@ -39,7 +38,7 @@ public:
         Create(parent, id, title, pos, size, style, name);
     }
 
         Create(parent, id, title, pos, size, style, name);
     }
 

-    ~wxMDIParentFrame();
+    virtual ~wxMDIParentFrame();

 
     bool Create(wxWindow *parent,
                 wxWindowID id,
 
     bool Create(wxWindow *parent,
                 wxWindowID id,


@@ -63,7 +62,7 @@ public:
     virtual wxMDIClientWindow *OnCreateClient(void);
 
     // MDI windows menu
     virtual wxMDIClientWindow *OnCreateClient(void);
 
     // MDI windows menu

-    wxMenu* GetWindowMenu() const { return m_windowMenu; };
+    wxMenu* GetWindowMenu() const { return m_windowMenu; }

     void SetWindowMenu(wxMenu* menu) ;
     virtual void DoMenuUpdates(wxMenu* menu = NULL);
 
     void SetWindowMenu(wxMenu* menu) ;
     virtual void DoMenuUpdates(wxMenu* menu = NULL);
 


@@ -93,6 +92,9 @@ public:
     virtual WXLRESULT MSWDefWindowProc(WXUINT, WXWPARAM, WXLPARAM);
     virtual bool MSWTranslateMessage(WXMSG* msg);
 
     virtual WXLRESULT MSWDefWindowProc(WXUINT, WXWPARAM, WXLPARAM);
     virtual bool MSWTranslateMessage(WXMSG* msg);
 

+    // override wxFrameBase function to also look in the active child menu bar
+    virtual const wxMenuItem *FindItemInMenuBar(int menuId) const;
+

 protected:
 #if wxUSE_MENUS_NATIVE
     virtual void InternalSetMenuBar();
 protected:
 #if wxUSE_MENUS_NATIVE
     virtual void InternalSetMenuBar();


@@ -112,7 +114,7 @@ protected:
     bool m_parentFrameActive;
 
 private:
     bool m_parentFrameActive;
 
 private:

-    friend class WXDLLEXPORT wxMDIChildFrame;
+    friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;

 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)


@@ -140,7 +142,7 @@ public:
         Create(parent, id, title, pos, size, style, name);
     }
 
         Create(parent, id, title, pos, size, style, name);
     }
 

-    ~wxMDIChildFrame();
+    virtual ~wxMDIChildFrame();

 
     bool Create(wxMDIParentFrame *parent,
                 wxWindowID id,
 
     bool Create(wxMDIParentFrame *parent,
                 wxWindowID id,


@@ -179,6 +181,7 @@ public:
     virtual bool Show(bool show = true);
 
 protected:
     virtual bool Show(bool show = true);
 
 protected:

+    virtual void DoGetScreenPosition(int *x, int *y) const;

     virtual void DoGetPosition(int *x, int *y) const;
     virtual void DoSetClientSize(int width, int height);
     virtual void InternalSetMenuBar();
     virtual void DoGetPosition(int *x, int *y) const;
     virtual void DoSetClientSize(int width, int height);
     virtual void InternalSetMenuBar();