X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d3d992e5c8f5b0e76d45dd467fb0aff0f16510b..d9b4ddf28fbf20fe28d20c72b37c85a8e2db686e:/include/wx/os2/frame.h diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h index 4191b61e04..65c628dd8f 100644 --- a/include/wx/os2/frame.h +++ b/include/wx/os2/frame.h @@ -6,7 +6,7 @@ // Created: 10/27/99 // RCS-ID: $Id$ // Copyright: (c) David Webster -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_FRAME_H_ @@ -62,7 +62,6 @@ public: virtual void Raise(void); // event handlers - void OnActivate(wxActivateEvent& rEvent); void OnSysColourChanged(wxSysColourChangedEvent& rEvent); // Toolbar @@ -72,6 +71,10 @@ public: ,const wxString& rsName = wxToolBarNameStr ); + virtual wxToolBar* OnCreateToolBar( long lStyle + ,wxWindowID vId + ,const wxString& rsName + ); virtual void PositionToolBar(void); #endif // wxUSE_TOOLBAR @@ -116,18 +119,13 @@ public: ,WXHMENU hMenu ); - void SendSizeEvent(void); // tooltip management #if wxUSE_TOOLTIPS WXHWND GetToolTipCtrl(void) const { return m_hWndToolTip; } void SetToolTipCtrl(WXHWND hHwndTT) { m_hWndToolTip = hHwndTT; } #endif // tooltips - // - // Called by wxWindow whenever it gets focus - // - void SetLastFocus(wxWindow* pWin) { m_pWinLastFocused = pWin; } - wxWindow *GetLastFocus(void) const { return m_pWinLastFocused; } + virtual void SendSizeEvent(void); void SetClient(WXHWND c_Hwnd); void SetClient(wxWindow* c_Window); @@ -189,7 +187,6 @@ protected: bool m_bFsIsShowing; bool m_bWasMinimized; bool m_bIsShown; - wxWindow* m_pWinLastFocused; private: #if wxUSE_TOOLTIPS