Disabled memory tracing code for mingw32,

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

diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index 8beb8f19147617054fc78757b7134c3647044647..319d880da3f2476a14617b10e3c5e989bb478a44 100644 (file)
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -68,7 +68,9 @@ public:
     // just return a new class)
     virtual wxMDIClientWindow *OnCreateClient(void);
 
-    WXHMENU GetWindowMenu() const { return m_windowMenu; }
+//    WXHMENU GetWindowHMENU() const { return m_windowMenu; }
+    wxMenu* GetWindowMenu() const { return m_windowMenu; };
+    void SetWindowMenu(wxMenu* menu) ;
 
     // MDI operations
     // --------------
@@ -100,7 +102,8 @@ protected:
 
     wxMDIClientWindow *             m_clientWindow;
     wxMDIChildFrame *               m_currentChild;
-    WXHMENU                         m_windowMenu;
+//    WXHMENU                         m_windowMenu;
+    wxMenu*                         m_windowMenu;
 
     // TRUE if MDI Frame is intercepting commands, not child
     bool m_parentFrameActive;
@@ -117,8 +120,6 @@ private:
 
 class WXDLLEXPORT wxMDIChildFrame : public wxFrame
 {
-    DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
-
 public:
     wxMDIChildFrame();
     wxMDIChildFrame(wxMDIParentFrame *parent,
@@ -143,7 +144,7 @@ public:
                 const wxString& name = wxFrameNameStr);
 
     virtual bool IsTopLevel() const { return FALSE; }
-    
+
     // MDI operations
     virtual void Maximize(bool maximize = TRUE);
     virtual void Restore();
@@ -152,7 +153,6 @@ public:
     // Handlers
 
     bool HandleMDIActivate(long bActivate, WXHWND, WXHWND);
-    bool HandleSize(int x, int y, WXUINT);
     bool HandleWindowPosChanging(void *lpPos);
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
 
@@ -169,6 +169,8 @@ protected:
     virtual void DoGetPosition(int *x, int *y) const;
     virtual void DoSetClientSize(int width, int height);
     virtual void InternalSetMenuBar();
+
+    DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
 };
 
 // ---------------------------------------------------------------------------
@@ -195,6 +197,9 @@ public:
     // Explicitly call default scroll behaviour
     void OnScroll(wxScrollEvent& event);
 
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
 protected:
     void Init() { m_scrollX = m_scrollY = 0; }