Now wxFrame derives from wxFrameMSW/GTK in non-wxUniv mode. Fixes RTTI problems.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -239,19 +239,55 @@ protected:
|
||||
|
||||
// include the real class declaration
|
||||
#if defined(__WXMSW__)
|
||||
#ifndef __WXUNIVERSAL__
|
||||
#define wxFrameMSW wxFrame
|
||||
#define sm_classwxFrameMSW sm_classwxFrame
|
||||
#endif
|
||||
#include "wx/msw/frame.h"
|
||||
#ifndef __WXUNIVERSAL__
|
||||
|
||||
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__)
|
||||
#ifndef __WXUNIVERSAL__
|
||||
#define wxFrameGTK wxFrame
|
||||
#define sm_classwxFrameGTK sm_classwxFrame
|
||||
#endif
|
||||
#include "wx/gtk/frame.h"
|
||||
#ifndef __WXUNIVERSAL__
|
||||
|
||||
class WXDLLEXPORT wxFrame : public wxFrameGTK
|
||||
{
|
||||
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__)
|
||||
|
Reference in New Issue
Block a user