Fix RCS-IDs

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

diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index dde5cc7e37b68645ae4811f8f3990bebcd3b0eae..fb26c1ef2a85aa0ff6a1e6edc555e9ed300ff508 100644 (file)
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -12,23 +12,18 @@
 #ifndef _WX_MDI_H_
 #define _WX_MDI_H_
 
 #ifndef _WX_MDI_H_
 #define _WX_MDI_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "mdi.h"
-#endif
-

 #include "wx/frame.h"
 
 #include "wx/frame.h"
 

-extern WXDLLEXPORT_DATA(const wxChar*) wxFrameNameStr;
-extern WXDLLEXPORT_DATA(const wxChar*) wxStatusLineNameStr;
+extern WXDLLIMPEXP_DATA_CORE(const char) wxStatusLineNameStr[];

 
 

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

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

-class WXDLLEXPORT wxMDIParentFrame : public wxFrame
+class WXDLLIMPEXP_CORE wxMDIParentFrame : public wxFrame

 {
 public:
     wxMDIParentFrame();
 {
 public:
     wxMDIParentFrame();


@@ -43,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,


@@ -56,7 +51,7 @@ public:
     // accessors
     // ---------
 
     // accessors
     // ---------
 

-    // Get the active MDI child window (Windows only)
+    // Get the active MDI child window

     wxMDIChildFrame *GetActiveChild() const;
 
     // Get the client window
     wxMDIChildFrame *GetActiveChild() const;
 
     // Get the client window


@@ -64,11 +59,20 @@ public:
 
     // Create the client window class (don't Create the window,
     // just return a new class)
 
     // Create the client window class (don't Create the window,
     // just return a new class)

-    virtual wxMDIClientWindow *OnCreateClient(void);
+    virtual wxMDIClientWindow *OnCreateClient();
+
+    // MDI windows menu functions
+    // --------------------------

 
 

-    // MDI windows menu
-    wxMenu* GetWindowMenu() const { return m_windowMenu; };
+    // return the pointer to the current window menu or NULL if we don't have
+    // because of wxFRAME_NO_WINDOW_MENU style
+    wxMenu *GetWindowMenu() const { return m_windowMenu; }
+
+    // use the given menu instead of the default window menu
+    //
+    // menu can be NULL to disable the window menu completely

     void SetWindowMenu(wxMenu* menu) ;
     void SetWindowMenu(wxMenu* menu) ;

+

     virtual void DoMenuUpdates(wxMenu* menu = NULL);
 
     // MDI operations
     virtual void DoMenuUpdates(wxMenu* menu = NULL);
 
     // MDI operations


@@ -79,6 +83,18 @@ public:
     virtual void ActivateNext();
     virtual void ActivatePrevious();
 
     virtual void ActivateNext();
     virtual void ActivatePrevious();
 

+
+    // implementation only from now on
+
+    // MDI helpers
+    // -----------
+
+    // called by wxMDIChildFrame after it was successfully created
+    virtual void AddMDIChild(wxMDIChildFrame *child);
+
+    // called by wxMDIChildFrame just before it is destroyed
+    virtual void RemoveMDIChild(wxMDIChildFrame *child);
+

     // handlers
     // --------
 
     // handlers
     // --------
 


@@ -86,6 +102,7 @@ public:
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
     void OnSize(wxSizeEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
     void OnSize(wxSizeEvent& event);

+    void OnIconized(wxIconizeEvent& event);

 
     bool HandleActivate(int state, bool minimized, WXHWND activate);
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
 
     bool HandleActivate(int state, bool minimized, WXHWND activate);
     bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);


@@ -96,6 +113,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();


@@ -103,15 +123,28 @@ protected:
 
     virtual WXHICON GetDefaultIcon() const;
 
 
     virtual WXHICON GetDefaultIcon() const;
 

+    // set the size of the MDI client window to match the frame size
+    void UpdateClientSize();
+
+

     wxMDIClientWindow *             m_clientWindow;
     wxMDIChildFrame *               m_currentChild;
     wxMDIClientWindow *             m_clientWindow;
     wxMDIChildFrame *               m_currentChild;

-    wxMenu*                         m_windowMenu;
+
+    // the current window menu or NULL if we are not using it
+    wxMenu *m_windowMenu;

 
     // true if MDI Frame is intercepting commands, not child
     bool m_parentFrameActive;
 
 private:
 
     // true if MDI Frame is intercepting commands, not child
     bool m_parentFrameActive;
 
 private:

-    friend class WXDLLEXPORT wxMDIChildFrame;
+    // add/remove window menu if we have it (i.e. m_windowMenu != NULL)
+    void AddWindowMenu();
+    void RemoveWindowMenu();
+
+    // return the number of child frames we currently have (maybe 0)
+    int GetChildFramesCount() const;
+
+    friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;

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


@@ -122,7 +155,7 @@ private:
 // wxMDIChildFrame
 // ---------------------------------------------------------------------------
 
 // wxMDIChildFrame
 // ---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMDIChildFrame : public wxFrame
+class WXDLLIMPEXP_CORE wxMDIChildFrame : public wxFrame

 {
 public:
     wxMDIChildFrame() { Init(); }
 {
 public:
     wxMDIChildFrame() { Init(); }


@@ -139,7 +172,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,


@@ -159,6 +192,11 @@ public:
     // Implementation only from now on
     // -------------------------------
 
     // Implementation only from now on
     // -------------------------------
 

+    wxMDIParentFrame* GetMDIParent() const
+    {
+        return wxStaticCast(wxFrame::GetParent(), wxMDIParentFrame);
+    }
+

     // Handlers
     bool HandleMDIActivate(long bActivate, WXHWND, WXHWND);
     bool HandleWindowPosChanging(void *lpPos);
     // Handlers
     bool HandleMDIActivate(long bActivate, WXHWND, WXHWND);
     bool HandleWindowPosChanging(void *lpPos);


@@ -178,10 +216,12 @@ 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 bool IsMDIChild() const { return true; }
     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 void DetachMenuBar();

 
     virtual WXHICON GetDefaultIcon() const;
 
 
     virtual WXHICON GetDefaultIcon() const;
 


@@ -191,7 +231,6 @@ protected:
 private:
     bool m_needsInitialShow; // Show must be called in idle time after Creation
     bool m_needsResize; // flag which tells us to artificially resize the frame
 private:
     bool m_needsInitialShow; // Show must be called in idle time after Creation
     bool m_needsResize; // flag which tells us to artificially resize the frame

-       virtual void DetachMenuBar() ;

 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIChildFrame)
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxMDIChildFrame)


@@ -201,7 +240,7 @@ private:
 // wxMDIClientWindow
 // ---------------------------------------------------------------------------
 
 // wxMDIClientWindow
 // ---------------------------------------------------------------------------
 

-class WXDLLEXPORT wxMDIClientWindow : public wxWindow
+class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxWindow

 {
 public:
     wxMDIClientWindow() { Init(); }
 {
 public:
     wxMDIClientWindow() { Init(); }


@@ -219,10 +258,11 @@ public:
     // Explicitly call default scroll behaviour
     void OnScroll(wxScrollEvent& event);
 
     // Explicitly call default scroll behaviour
     void OnScroll(wxScrollEvent& event);
 

+protected:

     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);

-protected:
+

     void Init() { m_scrollX = m_scrollY = 0; }
 
     int m_scrollX, m_scrollY;
     void Init() { m_scrollX = m_scrollY = 0; }
 
     int m_scrollX, m_scrollY;