X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/41e929e5cf10cbc6298c9a7750233123964a05f6..6ba7c06eeeda47b88783025428ca0f290e3bf236:/include/wx/msw/frame.h diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h index 8ea17a382e..109be748ee 100644 --- a/include/wx/msw/frame.h +++ b/include/wx/msw/frame.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/msw/frame.h -// Purpose: wxFrameMSW class +// Purpose: wxFrame class // Author: Julian Smart // Modified by: // Created: 01/02/97 @@ -16,12 +16,12 @@ #pragma interface "frame.h" #endif -class WXDLLEXPORT wxFrameMSW : public wxFrameBase +class WXDLLEXPORT wxFrame : public wxFrameBase { public: // construction - wxFrameMSW() { Init(); } - wxFrameMSW(wxWindow *parent, + wxFrame() { Init(); } + wxFrame(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, @@ -42,7 +42,7 @@ public: long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr); - virtual ~wxFrameMSW(); + virtual ~wxFrame(); // implement base class pure virtuals virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); @@ -52,7 +52,6 @@ public: // ------------------------------- // event handlers - void OnActivate(wxActivateEvent& event); void OnSysColourChanged(wxSysColourChangedEvent& event); // Toolbar @@ -91,6 +90,7 @@ public: 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 HandleMenuLoop(const wxEventType& evtType, WXWORD isPopup); // tooltip management #if wxUSE_TOOLTIPS @@ -100,11 +100,7 @@ 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(); - - // called by wxWindow whenever it gets focus - void SetLastFocus(wxWindow *win) { m_winLastFocused = win; } - wxWindow *GetLastFocus() const { return m_winLastFocused; } + virtual void SendSizeEvent(); protected: // common part of all ctors @@ -141,21 +137,21 @@ protected: 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 int m_fsStatusBarFields; // 0 for no status bar int m_fsStatusBarHeight; int m_fsToolBarHeight; -// WXHMENU m_fsMenu; private: #if wxUSE_TOOLTIPS WXHWND m_hwndToolTip; #endif // tooltips + // used by IconizeChildFrames(), see comments there + bool m_wasMinimized; + DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS(wxFrame) }; #endif