OS/2 update for wxUniv merge.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -17,19 +17,19 @@
|
||||
//
|
||||
#include "wx/os2/wxOs2.h"
|
||||
|
||||
class WXDLLEXPORT wxFrame : public wxFrameBase
|
||||
class WXDLLEXPORT wxFrameOS2 : public wxFrameBase
|
||||
{
|
||||
public:
|
||||
// construction
|
||||
wxFrame() { Init(); }
|
||||
wxFrame( wxWindow* pParent
|
||||
,wxWindowID vId
|
||||
,const wxString& rsTitle
|
||||
,const wxPoint& rPos = wxDefaultPosition
|
||||
,const wxSize& rSize = wxDefaultSize
|
||||
,long lStyle = wxDEFAULT_FRAME_STYLE
|
||||
,const wxString& rsName = wxFrameNameStr
|
||||
)
|
||||
wxFrameOS2() { Init(); }
|
||||
wxFrameOS2( wxWindow* pParent
|
||||
,wxWindowID vId
|
||||
,const wxString& rsTitle
|
||||
,const wxPoint& rPos = wxDefaultPosition
|
||||
,const wxSize& rSize = wxDefaultSize
|
||||
,long lStyle = wxDEFAULT_FRAME_STYLE
|
||||
,const wxString& rsName = wxFrameNameStr
|
||||
)
|
||||
{
|
||||
Init();
|
||||
|
||||
@@ -45,7 +45,7 @@ public:
|
||||
,const wxString& rsName = wxFrameNameStr
|
||||
);
|
||||
|
||||
virtual ~wxFrame();
|
||||
virtual ~wxFrameOS2();
|
||||
|
||||
// implement base class pure virtuals
|
||||
virtual void Maximize(bool bMaximize = TRUE);
|
||||
@@ -242,7 +242,7 @@ private:
|
||||
SWP m_vSwpToolBar;
|
||||
|
||||
DECLARE_EVENT_TABLE()
|
||||
DECLARE_DYNAMIC_CLASS(wxFrame)
|
||||
DECLARE_DYNAMIC_CLASS(wxFrameOS2)
|
||||
};
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user