/////////////////////////////////////////////////////////////////////////////
-// Name: frame.h
+// Name: wx/os2/frame.h
// Purpose: wxFrame class
// Author: David Webster
// Modified by:
// Created: 10/27/99
-// RCS-ID: $Id$
// Copyright: (c) David Webster
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_FRAME_H_
//
// Get the default resource ID's for frames
//
-#include "wx/os2/wxOs2.h"
+#include "wx/os2/wxrsc.h"
-class WXDLLEXPORT wxFrameOS2 : public wxFrameBase
+class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase
{
public:
// construction
- wxFrameOS2() { Init(); }
- wxFrameOS2( wxWindow* pParent
+ wxFrame() { Init(); }
+ wxFrame( wxWindow* pParent
,wxWindowID vId
,const wxString& rsTitle
,const wxPoint& rPos = wxDefaultPosition
,const wxString& rsName = wxFrameNameStr
);
- virtual ~wxFrameOS2();
+ 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
- virtual void SetIcon(const wxIcon& rIcon);
virtual bool ShowFullScreen( bool bShow
,long lStyle = wxFULLSCREEN_ALL
);
- virtual bool IsFullScreen(void) const { return m_bFsIsShowing; };
// implementation only from now on
// -------------------------------
- // override some more virtuals
- virtual bool Show(bool bShow = TRUE);
+ 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
// Status bar
#if wxUSE_STATUSBAR
virtual wxStatusBar* OnCreateStatusBar( int nNumber = 1
- ,long lStyle = wxST_SIZEGRIP
+ ,long lStyle = wxSTB_DEFAULT_STYLE
,wxWindowID vId = 0
,const wxString& rsName = wxStatusLineNameStr
);
// TODO: should this go into a wxFrameworkSettings class perhaps?
static void UseNativeStatusBar(bool bUseNative)
- { m_bUseNativeStatusBar = bUseNative; };
+ { m_bUseNativeStatusBar = bUseNative; }
static bool UsesNativeStatusBar()
- { return m_bUseNativeStatusBar; };
+ { return m_bUseNativeStatusBar; }
#endif // wxUSE_STATUSBAR
WXHMENU GetWinMenu() const { return m_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
- //
- // 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();
- 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);
// 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;
- virtual void DoGetSize( int* pWidth
- ,int* pHeight
- ) const;
- virtual void DoGetPosition( int* pX
- ,int* pY
- ) const;
virtual void DoSetClientSize( int nWidth
,int nWeight
);
+ inline virtual bool IsMDIChild(void) const { return FALSE; }
#if wxUSE_MENUS_NATIVE
// helper
int m_nFsToolBarHeight;
bool m_bFsIsMaximized;
bool m_bFsIsShowing;
+ bool m_bWasMinimized;
bool m_bIsShown;
- wxWindow* m_pWinLastFocused;
private:
#if wxUSE_TOOLTIPS
// 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;
// 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_vSwpToolBar;
DECLARE_EVENT_TABLE()
+ 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_