X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d3d992e5c8f5b0e76d45dd467fb0aff0f16510b..c3c62822fdda9d340179dec663a806e905882cc9:/include/wx/os2/frame.h

diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h
index 4191b61e04..f8bd78661c 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,16 +62,19 @@ public:
     virtual void Raise(void);
 
     // event handlers
-    void OnActivate(wxActivateEvent& rEvent);
     void OnSysColourChanged(wxSysColourChangedEvent& rEvent);
 
     // Toolbar
 #if wxUSE_TOOLBAR
-    virtual wxToolBar* CreateToolBar( long            lStyle = wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT
+    virtual wxToolBar* CreateToolBar( long            lStyle = -1
                                      ,wxWindowID      vId = -1
                                      ,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