projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed style parameter from MSWCreate(), it is unneeded
[wxWidgets.git]
/
include
/
wx
/
os2
/
frame.h
diff --git
a/include/wx/os2/frame.h
b/include/wx/os2/frame.h
index 13d290e76ca526d544138f0834eb770f564bf7eb..5e1be0b79273421ba0b2558a4d3f039e97d39f76 100644
(file)
--- a/
include/wx/os2/frame.h
+++ b/
include/wx/os2/frame.h
@@
-15,7
+15,7
@@
//
// Get the default resource ID's for frames
//
//
// Get the default resource ID's for frames
//
-#include "wx/os2/wx
Os2
.h"
+#include "wx/os2/wx
rsc
.h"
class WXDLLEXPORT wxFrame : public wxFrameBase
{
class WXDLLEXPORT wxFrame : public wxFrameBase
{
@@
-62,7
+62,6
@@
public:
virtual void Raise(void);
// event handlers
virtual void Raise(void);
// event handlers
- void OnActivate(wxActivateEvent& rEvent);
void OnSysColourChanged(wxSysColourChangedEvent& rEvent);
// Toolbar
void OnSysColourChanged(wxSysColourChangedEvent& rEvent);
// Toolbar
@@
-72,6
+71,10
@@
public:
,const wxString& rsName = wxToolBarNameStr
);
,const wxString& rsName = wxToolBarNameStr
);
+ virtual wxToolBar* OnCreateToolBar( long lStyle
+ ,wxWindowID vId
+ ,const wxString& rsName
+ );
virtual void PositionToolBar(void);
#endif // wxUSE_TOOLBAR
virtual void PositionToolBar(void);
#endif // wxUSE_TOOLBAR
@@
-116,18
+119,13
@@
public:
,WXHMENU hMenu
);
,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
// 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);
void SetClient(WXHWND c_Hwnd);
void SetClient(wxWindow* c_Window);
@@
-189,7
+187,6
@@
protected:
bool m_bFsIsShowing;
bool m_bWasMinimized;
bool m_bIsShown;
bool m_bFsIsShowing;
bool m_bWasMinimized;
bool m_bIsShown;
- wxWindow* m_pWinLastFocused;
private:
#if wxUSE_TOOLTIPS
private:
#if wxUSE_TOOLTIPS