projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only compile wxStd{Input,Output}Stream if wxUSE_STREAMS==1.
[wxWidgets.git]
/
include
/
wx
/
os2
/
frame.h
diff --git
a/include/wx/os2/frame.h
b/include/wx/os2/frame.h
index 88cac74d0fa8c712f37764bc2e629ac5b9f9cded..4b5e88ca4cac498ee3847e2be5b716019cffbb0a 100644
(file)
--- 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
// Created: 10/27/99
// RCS-ID: $Id$
// Copyright: (c) David Webster
-// Licence: wxWindows licen
s
e
+// Licence: wxWindows licen
c
e
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_FRAME_H_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_FRAME_H_
@@
-17,7
+17,7
@@
//
#include "wx/os2/wxrsc.h"
//
#include "wx/os2/wxrsc.h"
-class WXDLL
EXPORT
wxFrame : public wxFrameBase
+class WXDLL
IMPEXP_CORE
wxFrame : public wxFrameBase
{
public:
// construction
{
public:
// construction
@@
-62,23
+62,26
@@
public:
virtual void Raise(void);
// event handlers
virtual void Raise(void);
// event handlers
- void OnActivate(wxActivateEvent& rEvent);
void OnSysColourChanged(wxSysColourChangedEvent& rEvent);
// Toolbar
#if wxUSE_TOOLBAR
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
);
,wxWindowID vId = -1
,const wxString& rsName = wxToolBarNameStr
);
+ virtual wxToolBar* OnCreateToolBar( long lStyle
+ ,wxWindowID vId
+ ,const wxString& rsName
+ );
virtual void PositionToolBar(void);
#endif // wxUSE_TOOLBAR
// Status bar
#if wxUSE_STATUSBAR
virtual wxStatusBar* OnCreateStatusBar( int nNumber = 1
virtual void PositionToolBar(void);
#endif // wxUSE_TOOLBAR
// Status bar
#if wxUSE_STATUSBAR
virtual wxStatusBar* OnCreateStatusBar( int nNumber = 1
- ,long lStyle = wxST
_SIZEGRIP
+ ,long lStyle = wxST
B_DEFAULT_STYLE
,wxWindowID vId = 0
,const wxString& rsName = wxStatusLineNameStr
);
,wxWindowID vId = 0
,const wxString& rsName = wxStatusLineNameStr
);
@@
-122,12
+125,6
@@
public:
void SetToolTipCtrl(WXHWND hHwndTT) { m_hWndToolTip = hHwndTT; }
#endif // tooltips
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; }
-
void SetClient(WXHWND c_Hwnd);
void SetClient(wxWindow* c_Window);
wxWindow *GetClient();
void SetClient(WXHWND c_Hwnd);
void SetClient(wxWindow* c_Window);
wxWindow *GetClient();
@@
-188,7
+185,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
@@
-219,6
+215,8
@@
private:
DECLARE_DYNAMIC_CLASS(wxFrame)
};
DECLARE_DYNAMIC_CLASS(wxFrame)
};
+MRESULT EXPENTRY wxFrameWndProc(HWND hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam);
+MRESULT EXPENTRY wxFrameMainWndProc(HWND hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam);
#endif
// _WX_FRAME_H_
#endif
// _WX_FRAME_H_