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

simplified RTTI chain: wxFrame base class is now directly wxWindow, not wxFrameMSW

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-07-09 21:41:19 +00:00
parent 8d813b20f7
commit af8964c4c3
7 changed files with 37 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
include/wx/frame.h
View File

@@ -240,113 +240,48 @@ protected:
// include the real class declaration // include the real class declaration
#if defined(__WXMSW__) #if defined(__WXMSW__)
#include "wx/msw/frame.h" #include "wx/msw/frame.h"
#ifndef __WXUNIVERSAL__ #define wxFrameNative wxFrameMSW
class WXDLLEXPORT wxFrame : public wxFrameMSW
{
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
#elif defined(__WXMOTIF__)
#include "wx/motif/frame.h"
#elif defined(__WXGTK__) #elif defined(__WXGTK__)
#include "wx/gtk/frame.h" #include "wx/gtk/frame.h"
#ifndef __WXUNIVERSAL__ #define wxFrameNative wxFrameGTK
#elif defined(__WXMOTIF__)
class WXDLLEXPORT wxFrame : public wxFrameGTK #include "wx/motif/frame.h"
{
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
#elif defined(__WXMGL__)
#include "wx/mgl/frame.h"
#elif defined(__WXQT__)
#include "wx/qt/frame.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/frame.h" #include "wx/mac/frame.h"
#ifndef __WXUNIVERSAL__ #define wxFrameNative wxFrameMac
#elif defined(__WXMGL__)
class WXDLLEXPORT wxFrame : public wxFrameMac #include "wx/mgl/frame.h"
{ #define wxFrameNative wxFrameMGL
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
#elif defined(__WXPM__) #elif defined(__WXPM__)
#include "wx/os2/frame.h" #include "wx/os2/frame.h"
#ifndef __WXUNIVERSAL__ #define wxFrameNative wxFrameOS2
class WXDLLEXPORT wxFrame : public wxFrameOS2
{
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
#elif defined(__WXSTUBS__)
#include "wx/stubs/frame.h"
#endif #endif
#ifdef __WXUNIVERSAL__ #ifdef __WXUNIVERSAL__
#include "wx/univ/frame.h" #include "wx/univ/frame.h"
#endif #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__
#endif #endif
// _WX_FRAME_H_BASE_ // _WX_FRAME_H_BASE_

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

@@ -136,9 +136,6 @@ protected:
// is the frame currently iconized? // is the frame currently iconized?
bool m_isIconized; bool m_isIconized;
private:
DECLARE_DYNAMIC_CLASS(wxFrameGTK)
}; };
#endif // __GTKFRAMEH__ #endif // __GTKFRAMEH__

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

@@ -136,9 +136,6 @@ protected:
// is the frame currently iconized? // is the frame currently iconized?
bool m_isIconized; bool m_isIconized;
private:
DECLARE_DYNAMIC_CLASS(wxFrameGTK)
}; };
#endif // __GTKFRAMEH__ #endif // __GTKFRAMEH__

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

@@ -186,7 +186,6 @@ private:
WXHWND m_hwndToolTip; WXHWND m_hwndToolTip;
#endif // tooltips #endif // tooltips
DECLARE_DYNAMIC_CLASS(wxFrameMSW)
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };

7
src/gtk/frame.cpp
View File

@@ -65,11 +65,8 @@ extern int g_openDialogs;
// event tables // event tables
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#ifdef __WXUNIVERSAL__ #ifndef __WXUNIVERSAL__
IMPLEMENT_DYNAMIC_CLASS(wxFrameGTK, wxWindow) IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
#else
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameGTK)
IMPLEMENT_DYNAMIC_CLASS(wxFrameGTK, wxWindow)
#endif #endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

7
src/gtk1/frame.cpp
View File

@@ -65,11 +65,8 @@ extern int g_openDialogs;
// event tables // event tables
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#ifdef __WXUNIVERSAL__ #ifndef __WXUNIVERSAL__
IMPLEMENT_DYNAMIC_CLASS(wxFrameGTK, wxWindow) IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
#else
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameGTK)
IMPLEMENT_DYNAMIC_CLASS(wxFrameGTK, wxWindow)
#endif #endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

4
src/msw/frame.cpp
View File

@@ -80,10 +80,8 @@ BEGIN_EVENT_TABLE(wxFrameMSW, wxFrameBase)
EVT_SYS_COLOUR_CHANGED(wxFrameMSW::OnSysColourChanged) EVT_SYS_COLOUR_CHANGED(wxFrameMSW::OnSysColourChanged)
END_EVENT_TABLE() END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxFrameMSW, wxWindow)
#ifndef __WXUNIVERSAL__ #ifndef __WXUNIVERSAL__
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameMSW) IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
#endif #endif
// ============================================================================ // ============================================================================