X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c48926e149739055b0ed978d9e893f7898a51a73..2588b9c467b3a313f516ef81c7d5cfd14d1e8bb6:/include/wx/msw/frame.h?ds=sidebyside diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h index abd5752e93..caff90d67d 100644 --- a/include/wx/msw/frame.h +++ b/include/wx/msw/frame.h @@ -1,33 +1,29 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/msw/frame.h -// Purpose: wxFrameMSW class +// Purpose: wxFrame class // Author: Julian Smart // 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 _WX_FRAME_H_ #define _WX_FRAME_H_ -#ifdef __GNUG__ - #pragma interface "frame.h" -#endif - -class WXDLLEXPORT wxFrameMSW : public wxFrameBase +class WXDLLEXPORT wxFrame : public wxFrameBase { public: // construction - wxFrameMSW() { Init(); } - wxFrameMSW(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) + wxFrame() { Init(); } + wxFrame(wxWindow *parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDEFAULT_FRAME_STYLE, + const wxString& name = wxFrameNameStr) { Init(); @@ -42,36 +38,23 @@ public: long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr); - virtual ~wxFrameMSW(); + virtual ~wxFrame(); // implement base class pure virtuals - virtual void Raise(); - virtual void Maximize(bool maximize = TRUE); - virtual bool IsMaximized() const; - virtual void Iconize(bool iconize = TRUE); - virtual bool IsIconized() const; - virtual void Restore(); - virtual void SetIcon(const wxIcon& icon); virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); - virtual bool IsFullScreen() const { return m_fsIsShowing; }; + virtual void Raise(); // implementation only from now on // ------------------------------- - // override some more virtuals - virtual bool Show(bool show = TRUE); - // event handlers - void OnActivate(wxActivateEvent& event); void OnSysColourChanged(wxSysColourChangedEvent& event); // Toolbar #if wxUSE_TOOLBAR - virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT, - wxWindowID id = -1, + virtual wxToolBar* CreateToolBar(long style = -1, + wxWindowID id = wxID_ANY, const wxString& name = wxToolBarNameStr); - - virtual void PositionToolBar(); #endif // wxUSE_TOOLBAR // Status bar @@ -81,8 +64,6 @@ public: wxWindowID id = 0, const wxString& name = wxStatusLineNameStr); - virtual void PositionStatusBar(); - // Hint to tell framework which status bar to use: the default is to use // native one for the platforms which support it (Win32), the generic one // otherwise @@ -94,17 +75,16 @@ public: { return m_useNativeStatusBar; }; #endif // wxUSE_STATUSBAR +#if wxUSE_MENUS WXHMENU GetWinMenu() const { return m_hMenu; } +#endif // wxUSE_MENUS // event handlers bool HandlePaint(); bool HandleSize(int x, int y, WXUINT flag); bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control); bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu); - - bool MSWCreate(int id, wxWindow *parent, const wxChar *wclass, - wxWindow *wx_win, const wxChar *title, - int x, int y, int width, int height, long style); + bool HandleMenuLoop(const wxEventType& evtType, WXWORD isPopup); // tooltip management #if wxUSE_TOOLTIPS @@ -114,24 +94,27 @@ public: // a MSW only function which sends a size event to the window using its // current size - this has an effect of refreshing the window layout - void SendSizeEvent(); + virtual void SendSizeEvent(); + + virtual wxPoint GetClientAreaOrigin() const; + + // override base class version to add menu bar accel processing + virtual bool MSWTranslateMessage(WXMSG *msg) + { + return MSWDoTranslateMessage(this, msg); + } - // called by wxWindow whenever it gets focus - void SetLastFocus(wxWindow *win) { m_winLastFocused = win; } - wxWindow *GetLastFocus() const { return m_winLastFocused; } + // window proc for the frames + virtual WXLRESULT MSWWindowProc(WXUINT message, + WXWPARAM wParam, + WXLPARAM lParam); protected: // common part of all ctors void Init(); - // common part of Iconize(), Maximize() and Restore() - void DoShowWindow(int nShowCmd); - // override base class virtuals virtual void DoGetClientSize(int *width, int *height) const; - virtual void DoGetSize(int *width, int *height) const; - virtual void DoGetPosition(int *x, int *y) const; - virtual void DoSetClientSize(int width, int height); #if wxUSE_MENUS_NATIVE @@ -146,47 +129,43 @@ protected: // propagate our state change to all child frames void IconizeChildFrames(bool bIconize); - // we add menu bar accel processing - bool MSWTranslateMessage(WXMSG* pMsg); + // the real implementation of MSWTranslateMessage(), also used by + // wxMDIChildFrame + bool MSWDoTranslateMessage(wxFrame *frame, WXMSG *msg); - // window proc for the frames - long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); - - virtual bool IsMDIChild() const { return FALSE; } + // handle WM_INITMENUPOPUP message to generate wxEVT_MENU_OPEN + bool HandleInitMenuPopup(WXHMENU hMenu); - // is the frame currently iconized? - bool m_iconized; + virtual bool IsMDIChild() const { return false; } - // should the frame be maximized when it will be shown? set by Maximize() - // when it is called while the frame is hidden - bool m_maximizeOnShow; + // get default (wxWidgets) icon for the frame + virtual WXHICON GetDefaultIcon() const; - WXHICON m_defaultIcon; +#if wxUSE_TOOLBAR + virtual void PositionToolBar(); +#endif // wxUSE_TOOLBAR #if wxUSE_STATUSBAR + virtual void PositionStatusBar(); + static bool m_useNativeStatusBar; #endif // wxUSE_STATUSBAR - // the last focused child: we restore focus to it on activation - wxWindow *m_winLastFocused; - - // Data to save/restore when calling ShowFullScreen - long m_fsStyle; // Passed to ShowFullScreen - wxRect m_fsOldSize; - long m_fsOldWindowStyle; - int m_fsStatusBarFields; // 0 for no status bar - int m_fsStatusBarHeight; - int m_fsToolBarHeight; -// WXHMENU m_fsMenu; - bool m_fsIsMaximized; - bool m_fsIsShowing; +#if wxUSE_MENUS + // frame menu, NULL if none + WXHMENU m_hMenu; +#endif // wxUSE_MENUS private: #if wxUSE_TOOLTIPS WXHWND m_hwndToolTip; #endif // tooltips + // used by IconizeChildFrames(), see comments there + bool m_wasMinimized; + DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS_NO_COPY(wxFrame) }; #endif