X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..9a05fd8d137bbe26acd4f86adf6d62c55424822c:/include/wx/msw/mdi.h?ds=sidebyside diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h index 6664f219f4..35879cd380 100644 --- a/include/wx/msw/mdi.h +++ b/include/wx/msw/mdi.h @@ -5,12 +5,12 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __MDIH__ -#define __MDIH__ +#ifndef _WX_MDI_H_ +#define _WX_MDI_H_ #ifdef __GNUG__ #pragma interface "mdi.h" @@ -33,11 +33,11 @@ class WXDLLEXPORT wxMDIParentFrame: public wxFrame wxMDIParentFrame(void); inline wxMDIParentFrame(wxWindow *parent, - const wxWindowID id, + wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - const long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, + long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, const wxString& name = wxFrameNameStr) { Create(parent, id, title, pos, size, style, name); @@ -46,31 +46,30 @@ class WXDLLEXPORT wxMDIParentFrame: public wxFrame ~wxMDIParentFrame(void); bool Create(wxWindow *parent, - const wxWindowID id, + wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - const long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, + long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, const wxString& name = wxFrameNameStr); +/* #if WXWIN_COMPATIBILITY virtual void OldOnActivate(bool flag); virtual void OldOnSize(int x, int y); #endif +*/ void OnSize(wxSizeEvent& event); void OnActivate(wxActivateEvent& event); - // Toolbar (currently, for use by Windows MDI parent frames ONLY) - virtual inline void SetToolBar(wxWindow *toolbar) { m_frameToolBar = toolbar; } - virtual inline wxWindow *GetToolBar(void) const { return m_frameToolBar; } - void SetMenuBar(wxMenuBar *menu_bar); // Gets the size available for subwindows after menu size, toolbar size // and status bar size have been subtracted. If you want to manage your own // toolbar(s), don't call SetToolBar. void GetClientSize(int *width, int *height) const; + wxSize GetClientSize() const { return wxWindow::GetClientSize(); } // Get the active MDI child window (Windows only) wxMDIChildFrame *GetActiveChild(void) const ; @@ -92,15 +91,16 @@ class WXDLLEXPORT wxMDIParentFrame: public wxFrame virtual void ActivatePrevious(void); // Handlers - void MSWOnSize(const int x, const int y, const WXUINT flag); - bool MSWOnCommand(const WXWORD id, const WXWORD cmd, const WXHWND control); - void MSWOnMenuHighlight(const WXWORD item, const WXWORD flags, const WXHMENU sysmenu); + void MSWOnSize(int x, int y, WXUINT flag); + bool MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control); + void MSWOnMenuHighlight(WXWORD item, WXWORD flags, WXHMENU sysmenu); bool MSWProcessMessage(WXMSG *msg); + bool MSWTranslateMessage(WXMSG *msg); void MSWOnCreate(WXLPCREATESTRUCT cs); long MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); - bool MSWOnEraseBkgnd(const WXHDC pDC); + bool MSWOnEraseBkgnd(WXHDC pDC); bool MSWOnDestroy(void); - bool MSWOnActivate(const int state, const bool minimized, const WXHWND activate); + bool MSWOnActivate(int state, bool minimized, WXHWND activate); // Responds to colour changes void OnSysColourChanged(wxSysColourChangedEvent& event); @@ -111,7 +111,6 @@ class WXDLLEXPORT wxMDIParentFrame: public wxFrame WXHMENU m_windowMenu; bool m_parentFrameActive; // TRUE if MDI Frame is intercepting // commands, not child - wxWindow * m_frameToolBar ; DECLARE_EVENT_TABLE() }; @@ -126,11 +125,11 @@ class WXDLLEXPORT wxMDIChildFrame: public wxFrame wxMDIChildFrame(void); inline wxMDIChildFrame(wxMDIParentFrame *parent, - const wxWindowID id, + wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - const long style = wxDEFAULT_FRAME_STYLE, + long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr) { Create(parent, id, title, pos, size, style, name); @@ -139,17 +138,21 @@ class WXDLLEXPORT wxMDIChildFrame: public wxFrame ~wxMDIChildFrame(void); bool Create(wxMDIParentFrame *parent, - const wxWindowID id, + wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - const long style = wxDEFAULT_FRAME_STYLE, + long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr); // Set menu bar void SetMenuBar(wxMenuBar *menu_bar); - void SetClientSize(const int width, const int height); + + void SetClientSize(int width, int height); + void SetClientSize(const wxSize& sz) { wxWindow::SetClientSize(sz); } + void GetPosition(int *x, int *y) const ; + wxPoint GetPosition() const { return wxWindow::GetPosition(); } // MDI operations virtual void Maximize(void); @@ -158,12 +161,13 @@ class WXDLLEXPORT wxMDIChildFrame: public wxFrame // Handlers - long MSWOnMDIActivate(const long bActivate, const WXHWND, const WXHWND); - void MSWOnSize(const int x, const int y, const WXUINT); + long MSWOnMDIActivate(long bActivate, WXHWND, WXHWND); + void MSWOnSize(int x, int y, WXUINT); void MSWOnWindowPosChanging(void *lpPos); - bool MSWOnCommand(const WXWORD id, const WXWORD cmd, const WXHWND control); + 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(void); // Implementation @@ -178,7 +182,7 @@ class WXDLLEXPORT wxMDIClientWindow: public wxWindow public: wxMDIClientWindow(void) ; - inline wxMDIClientWindow(wxMDIParentFrame *parent, const long style = 0) + inline wxMDIClientWindow(wxMDIParentFrame *parent, long style = 0) { CreateClient(parent, style); } @@ -186,7 +190,7 @@ class WXDLLEXPORT wxMDIClientWindow: public wxWindow ~wxMDIClientWindow(void); // Note: this is virtual, to allow overridden behaviour. - virtual bool CreateClient(wxMDIParentFrame *parent, const long style = wxVSCROLL | wxHSCROLL); + virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL); // Explicitly call default scroll behaviour void OnScroll(wxScrollEvent& event); @@ -198,7 +202,7 @@ class WXDLLEXPORT wxMDIClientWindow: public wxWindow virtual long MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); // Should hand the message to the default proc - long MSWOnMDIActivate(const long bActivate, const WXHWND, const WXHWND); + long MSWOnMDIActivate(long bActivate, WXHWND, WXHWND); protected: int m_scrollX; @@ -207,4 +211,4 @@ DECLARE_EVENT_TABLE() }; #endif - // __MDIH__ + // _WX_MDI_H_