Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

we no longer need wxFrameNative

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-10-19 20:35:05 +00:00
parent af15babd51
commit 0d53fc3442
14 changed files with 264 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
include/wx/frame.h
View File

@@ -192,50 +192,21 @@ protected:
};
// include the real class declaration
#if defined(__WXMSW__)
#include "wx/msw/frame.h"
#define wxFrameNative wxFrameMSW
#elif defined(__WXGTK__)
#include "wx/gtk/frame.h"
#define wxFrameNative wxFrameGTK
#elif defined(__WXMOTIF__)
#include "wx/motif/frame.h"
#elif defined(__WXMAC__)
#include "wx/mac/frame.h"
#define wxFrameNative wxFrameMac
#elif defined(__WXMGL__)
#include "wx/mgl/frame.h"
#define wxFrameNative wxFrameMGL
#elif defined(__WXPM__)
#include "wx/os2/frame.h"
#define wxFrameNative wxFrameOS2
#endif
#ifdef __WXUNIVERSAL__
#include "wx/univ/frame.h"
#else // !__WXUNIVERSAL__
#ifdef wxFrameNative
class WXDLLEXPORT wxFrame : public wxFrameNative
{
public:
// construction
wxFrame() { Init(); }
wxFrame(wxWindow *parent,
wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr)
{
Init();
Create(parent, id, title, pos, size, style, name);
}
DECLARE_DYNAMIC_CLASS(wxFrame)
};
#endif // wxFrameNative
#endif // __WXUNIVERSAL__/!__WXUNIVERSAL__
#if defined(__WXMSW__)
#include "wx/msw/frame.h"
#elif defined(__WXGTK__)
#include "wx/gtk/frame.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/frame.h"
#elif defined(__WXMAC__)
#include "wx/mac/frame.h"
#elif defined(__WXPM__)
#include "wx/os2/frame.h"
#endif
#endif
#endif
// _WX_FRAME_H_BASE_

12
include/wx/gtk/frame.h
View File

@@ -27,15 +27,15 @@ class wxToolBar;
class wxStatusBar;
//-----------------------------------------------------------------------------
// wxFrameGTK
// wxFrame
//-----------------------------------------------------------------------------
class wxFrameGTK : public wxFrameBase
class wxFrame : public wxFrameBase
{
public:
// construction
wxFrameGTK() { Init(); }
wxFrameGTK(wxWindow *parent,
wxFrame() { Init(); }
wxFrame(wxWindow *parent,
wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
@@ -56,7 +56,7 @@ public:
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr);
virtual ~wxFrameGTK();
virtual ~wxFrame();
#if wxUSE_STATUSBAR
virtual void PositionStatusBar();
@@ -98,6 +98,8 @@ protected:
virtual void DetachMenuBar();
virtual void AttachMenuBar(wxMenuBar *menubar);
#endif // wxUSE_MENUS_NATIVE
DECLARE_DYNAMIC_CLASS(wxFrame)
};
#endif // __GTKFRAMEH__

12
include/wx/gtk1/frame.h
View File

@@ -27,15 +27,15 @@ class wxToolBar;
class wxStatusBar;
//-----------------------------------------------------------------------------
// wxFrameGTK
// wxFrame
//-----------------------------------------------------------------------------
class wxFrameGTK : public wxFrameBase
class wxFrame : public wxFrameBase
{
public:
// construction
wxFrameGTK() { Init(); }
wxFrameGTK(wxWindow *parent,
wxFrame() { Init(); }
wxFrame(wxWindow *parent,
wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
@@ -56,7 +56,7 @@ public:
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr);
virtual ~wxFrameGTK();
virtual ~wxFrame();
#if wxUSE_STATUSBAR
virtual void PositionStatusBar();
@@ -98,6 +98,8 @@ protected:
virtual void DetachMenuBar();
virtual void AttachMenuBar(wxMenuBar *menubar);
#endif // wxUSE_MENUS_NATIVE
DECLARE_DYNAMIC_CLASS(wxFrame)
};
#endif // __GTKFRAMEH__

13
include/wx/mac/frame.h
View File

@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
// Name: frame.h
// Purpose: wxFrameMac class
// Purpose: wxFrame class
// Author: AUTHOR
// Modified by:
// Created: ??/??/98
@@ -28,14 +28,14 @@ class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxStatusBar;
class WXDLLEXPORT wxMacToolTip ;
class WXDLLEXPORT wxFrameMac: public wxFrameBase {
class WXDLLEXPORT wxFrame: public wxFrameBase {
DECLARE_DYNAMIC_CLASS(wxFrameMac)
DECLARE_DYNAMIC_CLASS(wxFrame)
public:
// construction
wxFrameMac() { Init(); }
wxFrameMac(wxWindow *parent,
wxFrame() { Init(); }
wxFrame(wxWindow *parent,
wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
@@ -56,7 +56,7 @@ public:
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr);
virtual ~wxFrameMac();
virtual ~wxFrame();
// implementation only from now on
// -------------------------------
@@ -120,6 +120,7 @@ protected:
private:
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxFrame)
};
#endif

11
include/wx/msw/frame.h
View File

@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/msw/frame.h
// Purpose: wxFrameMSW class
// Purpose: wxFrame class
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
@@ -16,12 +16,12 @@
#pragma interface "frame.h"
#endif
class WXDLLEXPORT wxFrameMSW : public wxFrameBase
class WXDLLEXPORT wxFrame : public wxFrameBase
{
public:
// construction
wxFrameMSW() { Init(); }
wxFrameMSW(wxWindow *parent,
wxFrame() { Init(); }
wxFrame(wxWindow *parent,
wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
@@ -42,7 +42,7 @@ public:
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr);
virtual ~wxFrameMSW();
virtual ~wxFrame();
// implement base class pure virtuals
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
@@ -156,6 +156,7 @@ private:
#endif // tooltips
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxFrame)
};
#endif

9
include/wx/os2/frame.h
View File

@@ -17,12 +17,12 @@
//
#include "wx/os2/wxOs2.h"
class WXDLLEXPORT wxFrameOS2 : public wxFrameBase
class WXDLLEXPORT wxFrame : public wxFrameBase
{
public:
// construction
wxFrameOS2() { Init(); }
wxFrameOS2( wxWindow* pParent
wxFrame() { Init(); }
wxFrame( wxWindow* pParent
,wxWindowID vId
,const wxString& rsTitle
,const wxPoint& rPos = wxDefaultPosition
@@ -45,7 +45,7 @@ public:
,const wxString& rsName = wxFrameNameStr
);
virtual ~wxFrameOS2();
virtual ~wxFrame();
// implement base class pure virtuals
virtual void Maximize(bool bMaximize = TRUE);
@@ -246,6 +246,7 @@ private:
SWP m_vSwpToolBar;
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxFrame)
};
#endif