From 61b391da9039fdcee5f5bba0031674a1dca72ab0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 20 Jan 2019 03:13:04 +0100 Subject: [PATCH] Make wxFrame ctors inline in wxQt No real changes, just make trivial (and going to remain trivial) functions inline. --- include/wx/qt/frame.h | 7 +++++-- src/qt/frame.cpp | 10 ---------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/include/wx/qt/frame.h b/include/wx/qt/frame.h index 35a7f39aaa..a0172b62c7 100644 --- a/include/wx/qt/frame.h +++ b/include/wx/qt/frame.h @@ -19,14 +19,17 @@ class QScrollArea; class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase { public: - wxFrame(); + wxFrame() { } 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); + const wxString& name = wxFrameNameStr) + { + Create( parent, id, title, pos, size, style, name ); + } virtual ~wxFrame(); bool Create(wxWindow *parent, diff --git a/src/qt/frame.cpp b/src/qt/frame.cpp index 986d5c3b09..ea29f93145 100644 --- a/src/qt/frame.cpp +++ b/src/qt/frame.cpp @@ -44,16 +44,6 @@ class wxQtCentralWidget : public wxQtEventSignalHandler< QScrollArea, wxFrame > }; -wxFrame::wxFrame() -{ -} - -wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString& title, - const wxPoint& pos, const wxSize& size, long style, const wxString& name ) -{ - Create( parent, id, title, pos, size, style, name ); -} - wxFrame::~wxFrame() { // central widget should be deleted by qt when the main window is destroyed