// 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
// --------------
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;
class WXDLLEXPORT wxMDIChildFrame : public wxFrame
{
- DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
-
public:
wxMDIChildFrame();
wxMDIChildFrame(wxMDIParentFrame *parent,
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();
// Handlers
- 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();
+ bool HandleMDIActivate(long bActivate, WXHWND, WXHWND);
+ bool HandleWindowPosChanging(void *lpPos);
+ bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
+
+ 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);
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();
+
+ DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
};
// ---------------------------------------------------------------------------
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);
// 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: