X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/df61c0097160f84ba840e6648b147d3fa29141ea..1550d5f80d130fea1c05302e890095b7ad27e085:/include/wx/msw/mdi.h

diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index ebbda27e84..1d5e440809 100644
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mdi.h
+// Name:        wx/msw/mdi.h
 // Purpose:     MDI (Multiple Document Interface) classes
 // Author:      Julian Smart
 // Modified by:
@@ -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
 
@@ -30,8 +30,6 @@ class WXDLLEXPORT wxMDIChildFrame;
 
 class WXDLLEXPORT wxMDIParentFrame : public wxFrame
 {
-    DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
-
 public:
     wxMDIParentFrame();
     wxMDIParentFrame(wxWindow *parent,
@@ -68,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) ;
 
@@ -92,17 +90,20 @@ public:
     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:
+#if wxUSE_MENUS_NATIVE
     virtual void InternalSetMenuBar();
+#endif // wxUSE_MENUS_NATIVE
+
+    virtual WXHICON GetDefaultIcon() const;
 
     wxMDIClientWindow *             m_clientWindow;
     wxMDIChildFrame *               m_currentChild;
-//    WXHMENU                         m_windowMenu;
     wxMenu*                         m_windowMenu;
 
     // TRUE if MDI Frame is intercepting commands, not child
@@ -112,6 +113,8 @@ private:
     friend class WXDLLEXPORT wxMDIChildFrame;
 
     DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
+    DECLARE_NO_COPY_CLASS(wxMDIParentFrame)
 };
 
 // ---------------------------------------------------------------------------
@@ -120,10 +123,8 @@ private:
 
 class WXDLLEXPORT wxMDIChildFrame : public wxFrame
 {
-    DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
-
 public:
-    wxMDIChildFrame();
+    wxMDIChildFrame() { Init(); }
     wxMDIChildFrame(wxMDIParentFrame *parent,
                     wxWindowID id,
                     const wxString& title,
@@ -132,6 +133,8 @@ public:
                     long style = wxDEFAULT_FRAME_STYLE,
                     const wxString& name = wxFrameNameStr)
     {
+        Init();
+
         Create(parent, id, title, pos, size, style, name);
     }
 
@@ -146,32 +149,47 @@ public:
                 const wxString& name = wxFrameNameStr);
 
     virtual bool IsTopLevel() const { return FALSE; }
-    
+
     // MDI operations
     virtual void Maximize(bool maximize = TRUE);
     virtual void Restore();
     virtual void Activate();
 
-    // Handlers
+    // Implementation only from now on
+    // -------------------------------
 
+    // 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);
+    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();
 
-    // Implementation
     bool ResetWindowStyle(void *vrect);
 
+    void OnIdle(wxIdleEvent& event);
+
 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 WXHICON GetDefaultIcon() const;
+
+    // common part of all ctors
+    void Init();
+
+private:
+    bool m_needsResize; // flag which tells us to artificially resize the frame
+
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIChildFrame)
 };
 
 // ---------------------------------------------------------------------------
@@ -180,8 +198,6 @@ protected:
 
 class WXDLLEXPORT wxMDIClientWindow : public wxWindow
 {
-    DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
-
 public:
     wxMDIClientWindow() { Init(); }
     wxMDIClientWindow(wxMDIParentFrame *parent, long style = 0)
@@ -198,6 +214,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; }
 
@@ -205,6 +224,7 @@ protected:
 
 private:
     DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIClientWindow)
 };
 
 #endif