projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't crash when EnsureVisible() is called for the hidden root item
[wxWidgets.git]
/
include
/
wx
/
os2
/
frame.h
diff --git
a/include/wx/os2/frame.h
b/include/wx/os2/frame.h
index 414ab5ac685a27be50438ac72444894bcf5e82d5..f8bd78661c1b8dd62abb743b3f93fd13f60f2bfe 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_
@@
-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
{
@@
-48,39
+48,33
@@
public:
virtual ~wxFrame();
// implement base class pure virtuals
virtual ~wxFrame();
// implement base class pure virtuals
- virtual void Maximize(bool bMaximize = TRUE);
- virtual bool IsMaximized(void) const;
- virtual void Iconize(bool bIconize = TRUE);
- virtual bool IsIconized(void) const;
- virtual void Restore(void);
#if wxUSE_MENUS_NATIVE
virtual void SetMenuBar(wxMenuBar* pMenubar);
#endif
#if wxUSE_MENUS_NATIVE
virtual void SetMenuBar(wxMenuBar* pMenubar);
#endif
- virtual void SetIcon(const wxIcon& rIcon);
virtual bool ShowFullScreen( bool bShow
,long lStyle = wxFULLSCREEN_ALL
);
virtual bool ShowFullScreen( bool bShow
,long lStyle = wxFULLSCREEN_ALL
);
- virtual bool IsFullScreen(void) const { return m_bFsIsShowing; };
// implementation only from now on
// -------------------------------
// implementation only from now on
// -------------------------------
- void AlterChildPos(void);
- // override some more virtuals
- virtual bool Show(bool bShow = TRUE);
+ virtual void Raise(void);
// event handlers
// 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
virtual void PositionToolBar(void);
#endif // wxUSE_TOOLBAR
@@
-125,34
+119,17
@@
public:
,WXHMENU hMenu
);
,WXHMENU hMenu
);
- bool OS2Create( int nId
- ,wxWindow* pParent
- ,const wxChar* zWclass
- ,wxWindow* pWxWin
- ,const wxChar* zTitle
- ,int nX
- ,int nY
- ,int nWidth
- ,int nHeight
- ,long nStyle
- );
-
// 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);
wxWindow *GetClient();
void SetClient(WXHWND c_Hwnd);
void SetClient(wxWindow* c_Window);
wxWindow *GetClient();
- HWND GetFrame(void) const { return m_hFrame; }
friend MRESULT EXPENTRY wxFrameWndProc(HWND hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam);
friend MRESULT EXPENTRY wxFrameMainWndProc(HWND hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam);
friend MRESULT EXPENTRY wxFrameWndProc(HWND hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam);
friend MRESULT EXPENTRY wxFrameMainWndProc(HWND hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam);
@@
-161,22
+138,15
@@
protected:
// common part of all ctors
void Init(void);
// common part of all ctors
void Init(void);
- // common part of Iconize(), Maximize() and Restore()
- void DoShowWindow(int nShowCmd);
-
+ virtual WXHICON GetDefaultIcon(void) const;
// override base class virtuals
virtual void DoGetClientSize( int* pWidth
,int* pHeight
) const;
// override base class virtuals
virtual void DoGetClientSize( int* pWidth
,int* pHeight
) const;
- virtual void DoGetSize( int* pWidth
- ,int* pHeight
- ) const;
- virtual void DoGetPosition( int* pX
- ,int* pY
- ) const;
virtual void DoSetClientSize( int nWidth
,int nWeight
);
virtual void DoSetClientSize( int nWidth
,int nWeight
);
+ inline virtual bool IsMDIChild(void) const { return FALSE; }
#if wxUSE_MENUS_NATIVE
// helper
#if wxUSE_MENUS_NATIVE
// helper
@@
-215,8
+185,8
@@
protected:
int m_nFsToolBarHeight;
bool m_bFsIsMaximized;
bool m_bFsIsShowing;
int m_nFsToolBarHeight;
bool m_bFsIsMaximized;
bool m_bFsIsShowing;
+ bool m_bWasMinimized;
bool m_bIsShown;
bool m_bIsShown;
- wxWindow* m_pWinLastFocused;
private:
#if wxUSE_TOOLTIPS
private:
#if wxUSE_TOOLTIPS
@@
-228,7
+198,6
@@
private:
// that we don't have child objects for (m_hWnd in wxWindow is the
// handle of the Frame's client window!
//
// that we don't have child objects for (m_hWnd in wxWindow is the
// handle of the Frame's client window!
//
- WXHWND m_hFrame;
WXHWND m_hTitleBar;
WXHWND m_hHScroll;
WXHWND m_hVScroll;
WXHWND m_hTitleBar;
WXHWND m_hHScroll;
WXHWND m_hVScroll;
@@
-237,8
+206,6
@@
private:
// Swp structures for various client data
// DW: Better off in attached RefData?
//
// Swp structures for various client data
// DW: Better off in attached RefData?
//
- SWP m_vSwp;
- SWP m_vSwpClient;
SWP m_vSwpTitleBar;
SWP m_vSwpMenuBar;
SWP m_vSwpHScroll;
SWP m_vSwpTitleBar;
SWP m_vSwpMenuBar;
SWP m_vSwpHScroll;