1. added wxGTK::wxToolBar::SetToolShortHelp() and test for it in sample

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

diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index f19bf39b8ec1e7530d27ca5bfb0dc1ce02ec7aba..385659df1c46196c195b73ef4c036aad96818d0b 100644 (file)
--- 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:
@@ -58,19 +58,19 @@ public:
     // accessors
     // ---------
 
-    void SetMenuBar(wxMenuBar *menu_bar);
-
     // Get the active MDI child window (Windows only)
-    wxMDIChildFrame *GetActiveChild() const ;
+    wxMDIChildFrame *GetActiveChild() const;
 
     // Get the client window
     wxMDIClientWindow *GetClientWindow() const { return m_clientWindow; }
 
     // Create the client window class (don't Create the window,
     // just return a new class)
-    virtual wxMDIClientWindow *OnCreateClient(void) ;
+    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
     // --------------
@@ -87,25 +87,26 @@ public:
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
     void OnSize(wxSizeEvent& event);
-    void OnActivate(wxActivateEvent& event);
 
-    virtual bool MSWOnActivate(int state, bool minimized, WXHWND activate);
-    virtual bool MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control);
+    bool HandleActivate(int state, bool minimized, WXHWND activate);
+    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 long MSWDefWindowProc(WXUINT, WXWPARAM, WXLPARAM);
-    virtual bool MSWProcessMessage(WXMSG* msg);
     virtual bool MSWTranslateMessage(WXMSG* msg);
 
 protected:
+    virtual void InternalSetMenuBar();
+
     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; 
+    bool m_parentFrameActive;
 
 private:
     friend class WXDLLEXPORT wxMDIChildFrame;
@@ -119,10 +120,8 @@ private:
 
 class WXDLLEXPORT wxMDIChildFrame : public wxFrame
 {
-    DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
-
 public:
-    wxMDIChildFrame();
+    wxMDIChildFrame() { Init(); }
     wxMDIChildFrame(wxMDIParentFrame *parent,
                     wxWindowID id,
                     const wxString& title,
@@ -131,6 +130,8 @@ public:
                     long style = wxDEFAULT_FRAME_STYLE,
                     const wxString& name = wxFrameNameStr)
     {
+        Init();
+
         Create(parent, id, title, pos, size, style, name);
     }
 
@@ -144,31 +145,44 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 
-    // Set menu bar
-    void SetMenuBar(wxMenuBar *menu_bar);
+    virtual bool IsTopLevel() const { return FALSE; }
 
     // MDI operations
-    virtual void Maximize();
+    virtual void Maximize(bool maximize = TRUE);
     virtual void Restore();
     virtual void Activate();
 
+    // Implementation only from now on
+    // -------------------------------
+
     // Handlers
+    bool HandleMDIActivate(long bActivate, WXHWND, WXHWND);
+    bool HandleWindowPosChanging(void *lpPos);
+    bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
 
-    bool MSWOnMDIActivate(long bActivate, WXHWND, WXHWND);
-    bool MSWOnSize(int x, int y, WXUINT);
-    bool MSWOnWindowPosChanging(void *lpPos);
-    bool MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control);
-    long MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-    bool MSWProcessMessage(WXMSG *msg);
-    bool MSWTranslateMessage(WXMSG *msg);
-    void MSWDestroyWindow();
+    virtual long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+    virtual long 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 DoGetPosition(int *x, int *y) const;
     virtual void DoSetClientSize(int width, int height);
+    virtual void InternalSetMenuBar();
+
+    // 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(wxMDIChildFrame)
 };
 
 // ---------------------------------------------------------------------------
@@ -177,17 +191,15 @@ protected:
 
 class WXDLLEXPORT wxMDIClientWindow : public wxWindow
 {
-    DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
-
 public:
-    wxMDIClientWindow();
+    wxMDIClientWindow() { Init(); }
     wxMDIClientWindow(wxMDIParentFrame *parent, long style = 0)
     {
+        Init();
+
         CreateClient(parent, style);
     }
 
-    ~wxMDIClientWindow();
-
     // Note: this is virtual, to allow overridden behaviour.
     virtual bool CreateClient(wxMDIParentFrame *parent,
                               long style = wxVSCROLL | wxHSCROLL);
@@ -195,17 +207,17 @@ public:
     // Explicitly call default scroll behaviour
     void OnScroll(wxScrollEvent& event);
 
-    // Window procedure
-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-
-    // Calls an appropriate default window procedure
-    virtual long MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-
+    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;
 
 private:
     DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
 };
 
 #endif