From 6463b9f5399b8670a0c74f2f8666bc2c9f37a406 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 15 Jan 2004 13:49:22 +0000 Subject: [PATCH] Reverted patch [ 832096 ] Final separation for GUI and console for Open Watcom git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/changes.txt | 1 + docs/toback24.txt | 5 ++++ include/wx/bmpbuttn.h | 5 +++- include/wx/bookctrl.h | 12 ++++++++-- include/wx/button.h | 2 +- include/wx/checkbox.h | 2 +- include/wx/checklst.h | 2 +- include/wx/choice.h | 2 +- include/wx/control.h | 2 +- include/wx/ctrlsub.h | 4 ++-- include/wx/dialog.h | 2 +- include/wx/filedlg.h | 2 +- include/wx/generic/choicdgg.h | 20 ++++++++++++---- include/wx/generic/filedlgg.h | 9 ++++--- include/wx/generic/listctrl.h | 12 +++++++--- include/wx/generic/mdig.h | 13 ++++++---- include/wx/generic/scrolwin.h | 8 +++++-- include/wx/listbox.h | 2 +- include/wx/listctrl.h | 7 ++++-- include/wx/msw/bitmap.h | 18 +++++++------- include/wx/msw/choice.h | 7 ++++-- include/wx/msw/combobox.h | 7 ++++-- include/wx/msw/gdiobj.h | 2 +- include/wx/msw/listbox.h | 5 +++- include/wx/msw/radiobox.h | 6 ++++- include/wx/msw/radiobut.h | 9 +++++-- include/wx/msw/toplevel.h | 9 +++++-- include/wx/msw/window.h | 8 +++++-- include/wx/notebook.h | 2 +- include/wx/scrolwin.h | 7 ++++-- include/wx/univ/bmpbuttn.h | 7 ++++-- include/wx/univ/button.h | 16 ++++++++++--- include/wx/univ/checkbox.h | 9 +++++-- include/wx/univ/checklst.h | 9 +++++-- include/wx/univ/choice.h | 7 ++++-- include/wx/univ/combobox.h | 22 +++++++++++++---- include/wx/univ/control.h | 9 +++++-- include/wx/univ/dialog.h | 8 +++++-- include/wx/univ/frame.h | 7 ++++-- include/wx/univ/inpcons.h | 2 +- include/wx/univ/listbox.h | 9 +++++-- include/wx/univ/notebook.h | 9 +++++-- include/wx/univ/radiobox.h | 10 ++++++-- include/wx/univ/radiobut.h | 9 +++++-- include/wx/univ/textctrl.h | 9 +++++-- include/wx/univ/toolbar.h | 9 +++++-- include/wx/univ/toplevel.h | 9 +++++-- include/wx/univ/window.h | 6 +++-- include/wx/window.h | 2 +- src/cocoa/bmpbuttn.mm | 10 -------- src/cocoa/button.mm | 4 ---- src/common/bookctrl.cpp | 17 ------------- src/common/choiccmn.cpp | 4 ---- src/common/ctrlcmn.cpp | 4 ---- src/common/ctrlsub.cpp | 9 ------- src/common/dlgcmn.cpp | 5 ---- src/common/fldlgcmn.cpp | 4 ---- src/common/lboxcmn.cpp | 4 ---- src/common/nbkbase.cpp | 14 ----------- src/generic/choicdgg.cpp | 36 ---------------------------- src/generic/dirctrlg.cpp | 4 ---- src/generic/filedlgg.cpp | 19 --------------- src/generic/listctrl.cpp | 45 ----------------------------------- src/generic/mdig.cpp | 40 ------------------------------- src/generic/prntdlgg.cpp | 2 -- src/generic/scrlwing.cpp | 33 ------------------------- src/gtk/bmpbuttn.cpp | 10 -------- src/gtk/checkbox.cpp | 4 ---- src/gtk/checklst.cpp | 8 ------- src/gtk1/bmpbuttn.cpp | 10 -------- src/gtk1/checkbox.cpp | 4 ---- src/gtk1/checklst.cpp | 8 ------- src/mac/bmpbuttn.cpp | 10 -------- src/mac/button.cpp | 4 ---- src/mac/carbon/bmpbuttn.cpp | 10 -------- src/mac/carbon/button.cpp | 4 ---- src/mac/carbon/checkbox.cpp | 4 ---- src/mac/carbon/checklst.cpp | 8 ------- src/mac/checkbox.cpp | 4 ---- src/mac/checklst.cpp | 8 ------- src/motif/bmpbuttn.cpp | 10 -------- src/motif/checkbox.cpp | 4 ---- src/motif/checklst.cpp | 10 +------- src/msw/bitmap.cpp | 41 ------------------------------- src/msw/bmpbuttn.cpp | 10 -------- src/msw/button.cpp | 4 ---- src/msw/checkbox.cpp | 4 ---- src/msw/checklst.cpp | 10 +------- src/msw/choice.cpp | 17 ------------- src/msw/combobox.cpp | 18 -------------- src/msw/gdiobj.cpp | 5 ---- src/msw/listbox.cpp | 13 ---------- src/msw/listctrl.cpp | 15 ------------ src/msw/radiobox.cpp | 16 ------------- src/msw/radiobut.cpp | 19 --------------- src/msw/toplevel.cpp | 18 -------------- src/msw/window.cpp | 16 ------------- src/os2/bmpbuttn.cpp | 10 -------- src/os2/checkbox.cpp | 4 ---- src/os2/checklst.cpp | 10 +------- src/os2/listctrl.cpp | 15 ------------ src/univ/bmpbuttn.cpp | 26 -------------------- src/univ/button.cpp | 38 ----------------------------- src/univ/checkbox.cpp | 23 ------------------ src/univ/checklst.cpp | 28 ---------------------- src/univ/choice.cpp | 17 ------------- src/univ/combobox.cpp | 41 ------------------------------- src/univ/control.cpp | 18 -------------- src/univ/dialog.cpp | 17 ------------- src/univ/framuniv.cpp | 15 ------------ src/univ/inpcons.cpp | 5 ---- src/univ/listbox.cpp | 20 ---------------- src/univ/notebook.cpp | 17 ------------- src/univ/radiobox.cpp | 22 ----------------- src/univ/radiobut.cpp | 19 --------------- src/univ/textctrl.cpp | 19 --------------- src/univ/toolbar.cpp | 17 ------------- src/univ/topluniv.cpp | 18 -------------- src/univ/winuniv.cpp | 16 ------------- 119 files changed, 267 insertions(+), 1088 deletions(-) diff --git a/docs/changes.txt b/docs/changes.txt index 8ec34e211e..d24e4427da 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -112,6 +112,7 @@ All (GUI): - added focus event forwarding to wxGrid (Peter Laufenberg) - fixed scrollbar problem in wxGrid (not showing scrollbars when sizing smaller) (Shane Harper) +- dbbrowse demo fixed for Unicode (Wlodzimierz Skiba) wxMSW: diff --git a/docs/toback24.txt b/docs/toback24.txt index 3a3c9d442d..e39b48f8f9 100644 --- a/docs/toback24.txt +++ b/docs/toback24.txt @@ -249,6 +249,11 @@ Checking in src/msw/combobox.cpp; new revision: 1.72; previous revision: 1.71 done +34. Apply patch [ 851052 ] [msw] Clipboard: Allow automatic format conversionsChecking in clipbrd.cpp; +/pack/cvsroots/wxwindows/wxWindows/src/msw/clipbrd.cpp,v <-- clipbrd.cpp +new revision: 1.54; previous revision: 1.53 +done + TODO for 2.4 (items that are not backports) =========================================== diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h index 033f59bf0f..ebaafefda3 100644 --- a/include/wx/bmpbuttn.h +++ b/include/wx/bmpbuttn.h @@ -29,7 +29,10 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr; class WXDLLEXPORT wxBitmapButtonBase : public wxButton { public: - wxBitmapButtonBase(); + wxBitmapButtonBase() + : m_bmpNormal(), m_bmpSelected(), m_bmpFocus(), m_bmpDisabled() + , m_marginX(0), m_marginY(0) + { } // set the bitmaps void SetBitmapLabel(const wxBitmap& bitmap) diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h index 51761208cb..26f1f2d31c 100644 --- a/include/wx/bookctrl.h +++ b/include/wx/bookctrl.h @@ -41,14 +41,22 @@ public: // construction // ------------ - wxBookCtrl(); + wxBookCtrl() + { + Init(); + } wxBookCtrl(wxWindow *parent, wxWindowID winid, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxEmptyString); + const wxString& name = wxEmptyString) + { + Init(); + + (void)Create(parent, winid, pos, size, style, name); + } // quasi ctor bool Create(wxWindow *parent, diff --git a/include/wx/button.h b/include/wx/button.h index 243487e697..1e7f14a0f7 100644 --- a/include/wx/button.h +++ b/include/wx/button.h @@ -48,7 +48,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr; class WXDLLEXPORT wxButtonBase : public wxControl { public: - wxButtonBase(); + wxButtonBase() { } // show the image in the button in addition to the label virtual void SetImageLabel(const wxBitmap& WXUNUSED(bitmap)) { } diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h index 0d7301d705..6b30a0a25f 100644 --- a/include/wx/checkbox.h +++ b/include/wx/checkbox.h @@ -58,7 +58,7 @@ WXDLLEXPORT_DATA(extern const wxChar *) wxCheckBoxNameStr; class WXDLLEXPORT wxCheckBoxBase : public wxControl { public: - wxCheckBoxBase(); + wxCheckBoxBase() { } // set/get the checked status of the listbox virtual void SetValue(bool value) = 0; diff --git a/include/wx/checklst.h b/include/wx/checklst.h index 4760cd44f8..ce34f6cbcd 100644 --- a/include/wx/checklst.h +++ b/include/wx/checklst.h @@ -23,7 +23,7 @@ class WXDLLEXPORT wxCheckListBoxBase : public wxListBox { public: - wxCheckListBoxBase(); + wxCheckListBoxBase() { } // check list box specific methods virtual bool IsChecked(size_t item) const = 0; diff --git a/include/wx/choice.h b/include/wx/choice.h index 226382ed87..b6600e3592 100644 --- a/include/wx/choice.h +++ b/include/wx/choice.h @@ -37,7 +37,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxChoiceNameStr; class WXDLLEXPORT wxChoiceBase : public wxControlWithItems { public: - wxChoiceBase(); + wxChoiceBase() { } virtual ~wxChoiceBase(); // all generic methods are in wxControlWithItems diff --git a/include/wx/control.h b/include/wx/control.h index 3b0f5cb269..012e5c5a32 100644 --- a/include/wx/control.h +++ b/include/wx/control.h @@ -35,7 +35,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr; class WXDLLEXPORT wxControlBase : public wxWindow { public: - wxControlBase(); + wxControlBase() { } virtual ~wxControlBase(); diff --git a/include/wx/ctrlsub.h b/include/wx/ctrlsub.h index 13cb2abf08..4108164ea1 100644 --- a/include/wx/ctrlsub.h +++ b/include/wx/ctrlsub.h @@ -31,7 +31,7 @@ class WXDLLEXPORT wxItemContainer { public: - wxItemContainer(); + wxItemContainer() { m_clientDataItemsType = wxClientData_None; } virtual ~wxItemContainer(); // adding items @@ -140,7 +140,7 @@ protected: class WXDLLEXPORT wxControlWithItems : public wxControl, public wxItemContainer { public: - wxControlWithItems(); + wxControlWithItems() { } virtual ~wxControlWithItems(); // we have to redefine these functions here to avoid ambiguities in classes diff --git a/include/wx/dialog.h b/include/wx/dialog.h index afa9e1b027..f9cfb80b71 100644 --- a/include/wx/dialog.h +++ b/include/wx/dialog.h @@ -25,7 +25,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow { public: - wxDialogBase(); + wxDialogBase() { Init(); } virtual ~wxDialogBase() { } void Init(); diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h index 42c6dec208..afcffa03b8 100644 --- a/include/wx/filedlg.h +++ b/include/wx/filedlg.h @@ -46,7 +46,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxFileSelectorDefaultWildcardStr; class WXDLLEXPORT wxFileDialogBase: public wxDialog { public: - wxFileDialogBase (); + wxFileDialogBase () {} wxFileDialogBase(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr, diff --git a/include/wx/generic/choicdgg.h b/include/wx/generic/choicdgg.h index d583b4f489..2ccd871e43 100644 --- a/include/wx/generic/choicdgg.h +++ b/include/wx/generic/choicdgg.h @@ -38,7 +38,7 @@ class WXDLLEXPORT wxListBox; class WXDLLEXPORT wxAnyChoiceDialog : public wxDialog { public: - wxAnyChoiceDialog(); + wxAnyChoiceDialog() { } wxAnyChoiceDialog(wxWindow *parent, const wxString& message, @@ -46,7 +46,11 @@ public: int n, const wxString *choices, long styleDlg = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition, - long styleLbox = wxLB_ALWAYS_SB); + long styleLbox = wxLB_ALWAYS_SB) + { + (void)Create(parent, message, caption, n, choices, + styleDlg, pos, styleLbox); + } bool Create(wxWindow *parent, const wxString& message, @@ -69,7 +73,10 @@ protected: class WXDLLEXPORT wxSingleChoiceDialog : public wxAnyChoiceDialog { public: - wxSingleChoiceDialog(); + wxSingleChoiceDialog() + { + m_selection = -1; + } wxSingleChoiceDialog(wxWindow *parent, const wxString& message, @@ -116,7 +123,7 @@ private: class WXDLLEXPORT wxMultiChoiceDialog : public wxAnyChoiceDialog { public: - wxMultiChoiceDialog(); + wxMultiChoiceDialog() { } wxMultiChoiceDialog(wxWindow *parent, const wxString& message, @@ -124,7 +131,10 @@ public: int n, const wxString *choices, long style = wxCHOICEDLG_STYLE, - const wxPoint& pos = wxDefaultPosition); + const wxPoint& pos = wxDefaultPosition) + { + (void)Create(parent, message, caption, n, choices, style, pos); + } bool Create(wxWindow *parent, const wxString& message, diff --git a/include/wx/generic/filedlgg.h b/include/wx/generic/filedlgg.h index f8edaa82af..22b50f9800 100644 --- a/include/wx/generic/filedlgg.h +++ b/include/wx/generic/filedlgg.h @@ -45,7 +45,7 @@ class WXDLLEXPORT wxTextCtrl; class WXDLLEXPORT wxGenericFileDialog: public wxFileDialogBase { public: - wxGenericFileDialog(); + wxGenericFileDialog() { } wxGenericFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr, @@ -115,7 +115,7 @@ class WXDLLEXPORT wxFileDialog: public wxGenericFileDialog DECLARE_DYNAMIC_CLASS(wxFileDialog) public: - wxFileDialog(); + wxFileDialog() {} wxFileDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr, @@ -123,7 +123,10 @@ public: const wxString& defaultFile = _T(""), const wxString& wildCard = wxFileSelectorDefaultWildcardStr, long style = 0, - const wxPoint& pos = wxDefaultPosition); + const wxPoint& pos = wxDefaultPosition) + :wxGenericFileDialog(parent, message, defaultDir, defaultFile, wildCard, style, pos) + { + } }; #endif // USE_GENERIC_FILEDIALOG diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h index 597d781093..b07e824277 100644 --- a/include/wx/generic/listctrl.h +++ b/include/wx/generic/listctrl.h @@ -72,7 +72,10 @@ public: const wxSize &size = wxDefaultSize, long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, - const wxString &name = wxT("listctrl") ); + const wxString &name = wxT("listctrl") ) + { + Create(parent, winid, pos, size, style, validator, name); + } ~wxGenericListCtrl(); bool Create( wxWindow *parent, @@ -248,14 +251,17 @@ class WXDLLEXPORT wxListCtrl: public wxGenericListCtrl DECLARE_DYNAMIC_CLASS(wxListCtrl) public: - wxListCtrl(); + wxListCtrl() {} wxListCtrl(wxWindow *parent, wxWindowID winid = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxLC_ICON, const wxValidator &validator = wxDefaultValidator, - const wxString &name = wxT("listctrl") ); + const wxString &name = wxT("listctrl") ) + : wxGenericListCtrl(parent, winid, pos, size, style, validator, name) + { + } }; #endif // !__WXMSW__ || __WIN16__ || __WXUNIVERSAL__ diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h index c56f571f4b..62760707af 100644 --- a/include/wx/generic/mdig.h +++ b/include/wx/generic/mdig.h @@ -274,7 +274,7 @@ class wxMDIChildFrame ; class WXDLLEXPORT wxMDIParentFrame: public wxGenericMDIParentFrame { public: - wxMDIParentFrame(); + wxMDIParentFrame() {} wxMDIParentFrame(wxWindow *parent, wxWindowID winid, const wxString& title, @@ -297,7 +297,8 @@ private: class WXDLLEXPORT wxMDIChildFrame: public wxGenericMDIChildFrame { public: - wxMDIChildFrame(); + wxMDIChildFrame() {} + wxMDIChildFrame( wxGenericMDIParentFrame *parent, wxWindowID winid, const wxString& title, @@ -316,8 +317,12 @@ private: class WXDLLEXPORT wxMDIClientWindow: public wxGenericMDIClientWindow { public: - wxMDIClientWindow(); - wxMDIClientWindow( wxGenericMDIParentFrame *parent, long style = 0 ); + wxMDIClientWindow() {} + + wxMDIClientWindow( wxGenericMDIParentFrame *parent, long style = 0 ) + :wxGenericMDIClientWindow(parent, style) + { + } private: DECLARE_DYNAMIC_CLASS(wxMDIClientWindow) diff --git a/include/wx/generic/scrolwin.h b/include/wx/generic/scrolwin.h index 9ff4daa828..faf66d635a 100644 --- a/include/wx/generic/scrolwin.h +++ b/include/wx/generic/scrolwin.h @@ -43,13 +43,17 @@ class WXDLLEXPORT wxGenericScrolledWindow : public wxPanel, public wxScrollHelper { public: - wxGenericScrolledWindow(); + wxGenericScrolledWindow() : wxScrollHelper(this) { } wxGenericScrolledWindow(wxWindow *parent, wxWindowID winid = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxScrolledWindowStyle, - const wxString& name = wxPanelNameStr); + const wxString& name = wxPanelNameStr) + : wxScrollHelper(this) + { + Create(parent, winid, pos, size, style, name); + } virtual ~wxGenericScrolledWindow(); diff --git a/include/wx/listbox.h b/include/wx/listbox.h index 95e071fe18..66f39ed4bf 100644 --- a/include/wx/listbox.h +++ b/include/wx/listbox.h @@ -43,7 +43,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxListBoxNameStr; class WXDLLEXPORT wxListBoxBase : public wxControlWithItems { public: - wxListBoxBase(); + wxListBoxBase() { } virtual ~wxListBoxBase(); // all generic methods are in wxControlWithItems, except for the following diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h index f5a1b325e0..86f7d56b01 100644 --- a/include/wx/listctrl.h +++ b/include/wx/listctrl.h @@ -37,14 +37,17 @@ class WXDLLEXPORT wxListView : public wxListCtrl { public: - wxListView(); + wxListView() { } wxListView( wxWindow *parent, wxWindowID winid = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxLC_REPORT, const wxValidator& validator = wxDefaultValidator, - const wxString &name = wxT("listctrl") ); + const wxString &name = wxT("listctrl") ) + { + Create(parent, winid, pos, size, style, validator, name); + } // focus/selection stuff // --------------------- diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h index 2842800767..d31371c891 100644 --- a/include/wx/msw/bitmap.h +++ b/include/wx/msw/bitmap.h @@ -43,17 +43,17 @@ class WXDLLEXPORT wxBitmap : public wxGDIImage { public: // default ctor creates an invalid bitmap, you must Create() it later - wxBitmap(); + wxBitmap() { Init(); } // Copy constructors - wxBitmap(const wxBitmap& bitmap); + wxBitmap(const wxBitmap& bitmap) { Init(); Ref(bitmap); } // Initialize with raw data wxBitmap(const char bits[], int width, int height, int depth = 1); // Initialize with XPM data - wxBitmap(const char **data); - wxBitmap(char **data); + wxBitmap(const char **data) { CreateFromXpm(data); } + wxBitmap(char **data) { CreateFromXpm((const char **)data); } // Load a file or resource wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_BMP_RESOURCE); @@ -72,18 +72,18 @@ public: wxBitmap(int width, int height, const wxDC& dc); #if wxUSE_IMAGE - // Convert from wxImage - wxBitmap(const wxImage& image, int depth = -1); + wxBitmap(const wxImage& image, int depth = -1) + { (void)CreateFromImage(image, depth); } // Create a DDB compatible with the given DC from wxImage - wxBitmap(const wxImage& image, const wxDC& dc); - + wxBitmap(const wxImage& image, const wxDC& dc) + { (void)CreateFromImage(image, dc); } #endif // wxUSE_IMAGE // we must have this, otherwise icons are silently copied into bitmaps using // the copy ctor but the resulting bitmap is invalid! - wxBitmap(const wxIcon& icon); + wxBitmap(const wxIcon& icon) { Init(); CopyFromIcon(icon); } wxBitmap& operator=(const wxBitmap& bitmap) { diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h index 72d813afc2..c2b47f69c5 100644 --- a/include/wx/msw/choice.h +++ b/include/wx/msw/choice.h @@ -24,7 +24,7 @@ class WXDLLEXPORT wxChoice : public wxChoiceBase { public: // ctors - wxChoice(); + wxChoice() { } virtual ~wxChoice(); wxChoice(wxWindow *parent, @@ -34,7 +34,10 @@ public: int n = 0, const wxString choices[] = NULL, long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr); + const wxString& name = wxChoiceNameStr) + { + Create(parent, id, pos, size, n, choices, style, validator, name); + } bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h index 22793a67c8..a369165d75 100644 --- a/include/wx/msw/combobox.h +++ b/include/wx/msw/combobox.h @@ -27,7 +27,7 @@ class WXDLLEXPORT wxComboBox: public wxChoice { public: - wxComboBox(); + wxComboBox() { } wxComboBox(wxWindow *parent, wxWindowID id, const wxString& value = wxEmptyString, @@ -36,7 +36,10 @@ public: int n = 0, const wxString choices[] = NULL, long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr); + const wxString& name = wxComboBoxNameStr) + { + Create(parent, id, value, pos, size, n, choices, style, validator, name); + } bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/msw/gdiobj.h b/include/wx/msw/gdiobj.h index 494552d0d5..4b085fce52 100644 --- a/include/wx/msw/gdiobj.h +++ b/include/wx/msw/gdiobj.h @@ -36,7 +36,7 @@ class WXDLLEXPORT wxGDIRefData : public wxObjectRefData class WXDLLEXPORT wxGDIObject : public wxObject { public: - wxGDIObject(); + wxGDIObject() { m_visible = FALSE; }; // Creates the resource virtual bool RealizeResource() { return FALSE; }; diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h index 657c2c344a..9574e73e9f 100644 --- a/include/wx/msw/listbox.h +++ b/include/wx/msw/listbox.h @@ -49,7 +49,10 @@ public: int n = 0, const wxString choices[] = NULL, long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); + const wxString& name = wxListBoxNameStr) + { + Create(parent, id, pos, size, n, choices, style, validator, name); + } bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h index df725e0940..0cab158a27 100644 --- a/include/wx/msw/radiobox.h +++ b/include/wx/msw/radiobox.h @@ -36,7 +36,11 @@ public: int majorDim = 0, long style = wxRA_HORIZONTAL, const wxValidator& val = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr); + const wxString& name = wxRadioBoxNameStr) + { + (void)Create(parent, id, title, pos, size, n, choices, majorDim, + style, val, name); + } ~wxRadioBox(); diff --git a/include/wx/msw/radiobut.h b/include/wx/msw/radiobut.h index 9eb4c81e90..b47ee2e241 100644 --- a/include/wx/msw/radiobut.h +++ b/include/wx/msw/radiobut.h @@ -20,7 +20,7 @@ class WXDLLEXPORT wxRadioButton: public wxControl { public: // ctors and creation functions - wxRadioButton(); + wxRadioButton() { Init(); } wxRadioButton(wxWindow *parent, wxWindowID id, @@ -29,7 +29,12 @@ public: const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRadioButtonNameStr); + const wxString& name = wxRadioButtonNameStr) + { + Init(); + + Create(parent, id, label, pos, size, style, validator, name); + } bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h index 1fb8f26792..213538d3c1 100644 --- a/include/wx/msw/toplevel.h +++ b/include/wx/msw/toplevel.h @@ -24,7 +24,7 @@ class WXDLLEXPORT wxTopLevelWindowMSW : public wxTopLevelWindowBase { public: // constructors and such - wxTopLevelWindowMSW(); + wxTopLevelWindowMSW() { Init(); } wxTopLevelWindowMSW(wxWindow *parent, wxWindowID id, @@ -32,7 +32,12 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); + const wxString& name = wxFrameNameStr) + { + Init(); + + (void)Create(parent, id, title, pos, size, style, name); + } bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h index 74f5ec8e5b..d936b7a8d6 100644 --- a/include/wx/msw/window.h +++ b/include/wx/msw/window.h @@ -53,14 +53,18 @@ enum class WXDLLEXPORT wxWindowMSW : public wxWindowBase { public: - wxWindowMSW(); + wxWindowMSW() { Init(); } wxWindowMSW(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxPanelNameStr); + const wxString& name = wxPanelNameStr) + { + Init(); + Create(parent, id, pos, size, style, name); + } virtual ~wxWindowMSW(); diff --git a/include/wx/notebook.h b/include/wx/notebook.h index f5bab344d7..657912d8a0 100644 --- a/include/wx/notebook.h +++ b/include/wx/notebook.h @@ -53,7 +53,7 @@ public: // ctors // ----- - wxNotebookBase(); + wxNotebookBase() { } wxNotebookBase(wxWindow *parent, wxWindowID winid, diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h index b4a54a747c..9ebdc14f1b 100644 --- a/include/wx/scrolwin.h +++ b/include/wx/scrolwin.h @@ -217,13 +217,16 @@ protected: class WXDLLEXPORT wxScrolledWindow : public wxGenericScrolledWindow { public: - wxScrolledWindow(); + wxScrolledWindow() { } wxScrolledWindow(wxWindow *parent, wxWindowID winid = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxScrolledWindowStyle, - const wxString& name = wxPanelNameStr); + const wxString& name = wxPanelNameStr) + : wxGenericScrolledWindow(parent, winid, pos, size, style, name) + { + } private: DECLARE_DYNAMIC_CLASS_NO_COPY(wxScrolledWindow) diff --git a/include/wx/univ/bmpbuttn.h b/include/wx/univ/bmpbuttn.h index 4199b5038f..34c09b3e3e 100644 --- a/include/wx/univ/bmpbuttn.h +++ b/include/wx/univ/bmpbuttn.h @@ -19,7 +19,7 @@ class WXDLLEXPORT wxBitmapButton : public wxBitmapButtonBase { public: - wxBitmapButton(); + wxBitmapButton() { } wxBitmapButton(wxWindow *parent, wxWindowID id, @@ -28,7 +28,10 @@ public: const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); + const wxString& name = wxButtonNameStr) + { + Create(parent, id, bitmap, pos, size, style, validator, name); + } bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/univ/button.h b/include/wx/univ/button.h index fcc95e74b6..e6bb4f0355 100644 --- a/include/wx/univ/button.h +++ b/include/wx/univ/button.h @@ -36,7 +36,7 @@ class WXDLLEXPORT wxInputHandler; class WXDLLEXPORT wxButton : public wxButtonBase { public: - wxButton(); + wxButton() { Init(); } wxButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, @@ -45,7 +45,12 @@ public: const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); + const wxString& name = wxButtonNameStr) + { + Init(); + + Create(parent, id, bitmap, label, pos, size, style, validator, name); + } wxButton(wxWindow *parent, wxWindowID id, @@ -54,7 +59,12 @@ public: const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); + const wxString& name = wxButtonNameStr) + { + Init(); + + Create(parent, id, label, pos, size, style, validator, name); + } bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/univ/checkbox.h b/include/wx/univ/checkbox.h index 4bca3be985..b37ff5b637 100644 --- a/include/wx/univ/checkbox.h +++ b/include/wx/univ/checkbox.h @@ -59,7 +59,7 @@ public: }; // constructors - wxCheckBox(); + wxCheckBox() { Init(); } wxCheckBox(wxWindow *parent, wxWindowID id, @@ -68,7 +68,12 @@ public: const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr); + const wxString& name = wxCheckBoxNameStr) + { + Init(); + + Create(parent, id, label, pos, size, style, validator, name); + } bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/univ/checklst.h b/include/wx/univ/checklst.h index 7d7da30cc1..ee62327925 100644 --- a/include/wx/univ/checklst.h +++ b/include/wx/univ/checklst.h @@ -30,7 +30,7 @@ class WXDLLEXPORT wxCheckListBox : public wxCheckListBoxBase { public: // ctors - wxCheckListBox(); + wxCheckListBox() { Init(); } wxCheckListBox(wxWindow *parent, wxWindowID id, @@ -40,7 +40,12 @@ public: const wxString *choices = NULL, long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); + const wxString& name = wxListBoxNameStr) + { + Init(); + + Create(parent, id, pos, size, nStrings, choices, style, validator, name); + } bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/univ/choice.h b/include/wx/univ/choice.h index 3fff15eb4f..a96d443d02 100644 --- a/include/wx/univ/choice.h +++ b/include/wx/univ/choice.h @@ -23,14 +23,17 @@ class WXDLLEXPORT wxChoice : public wxComboBox { public: - wxChoice(); + wxChoice() {} wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n = 0, const wxString choices[] = (const wxString *) NULL, long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr); + const wxString& name = wxChoiceNameStr) + { + Create(parent, id, pos, size, n, choices, style, validator, name); + } bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h index 44323ba9ee..28be5a0a2e 100644 --- a/include/wx/univ/combobox.h +++ b/include/wx/univ/combobox.h @@ -99,7 +99,10 @@ class WXDLLEXPORT wxComboControl : public wxControl { public: // construction - wxComboControl(); + wxComboControl() + { + Init(); + } wxComboControl(wxWindow *parent, wxWindowID id, @@ -108,7 +111,12 @@ public: const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr); + const wxString& name = wxComboBoxNameStr) + { + Init(); + + (void)Create(parent, id, value, pos, size, style, validator, name); + } bool Create(wxWindow *parent, wxWindowID id, @@ -205,7 +213,7 @@ class WXDLLEXPORT wxComboBox : public wxComboControl, public wxComboBoxBase { public: // ctors and such - wxComboBox(); + wxComboBox() { Init(); } wxComboBox(wxWindow *parent, wxWindowID id, @@ -216,7 +224,13 @@ public: const wxString *choices = (const wxString *) NULL, long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr); + const wxString& name = wxComboBoxNameStr) + { + Init(); + + (void)Create(parent, id, value, pos, size, n, choices, + style, validator, name); + } bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/univ/control.h b/include/wx/univ/control.h index 2a903039ac..710e6307fd 100644 --- a/include/wx/univ/control.h +++ b/include/wx/univ/control.h @@ -45,14 +45,19 @@ typedef wxString wxControlAction; class WXDLLEXPORT wxControl : public wxControlBase, public wxInputConsumer { public: - wxControl(); + wxControl() { Init(); } wxControl(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxControlNameStr); + const wxString& name = wxControlNameStr) + { + Init(); + + Create(parent, id, pos, size, style, validator, name); + } bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/univ/dialog.h b/include/wx/univ/dialog.h index 7bf987c18e..fe7dfe7003 100644 --- a/include/wx/univ/dialog.h +++ b/include/wx/univ/dialog.h @@ -23,7 +23,7 @@ class WXDLLEXPORT wxEventLoop; class WXDLLEXPORT wxDialog : public wxDialogBase { public: - wxDialog(); + wxDialog() { Init(); } // Constructor with no modal flag - the new convention. wxDialog(wxWindow *parent, wxWindowID id, @@ -31,7 +31,11 @@ public: const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, - const wxString& name = wxDialogNameStr); + const wxString& name = wxDialogNameStr) + { + Init(); + Create(parent, id, title, pos, size, style, name); + } bool Create(wxWindow *parent, wxWindowID id, const wxString& title, diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h index 94f7b090b1..e30d470a49 100644 --- a/include/wx/univ/frame.h +++ b/include/wx/univ/frame.h @@ -23,14 +23,17 @@ class WXDLLEXPORT 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); + } bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/univ/inpcons.h b/include/wx/univ/inpcons.h index 60aa12c749..e370a4f6f6 100644 --- a/include/wx/univ/inpcons.h +++ b/include/wx/univ/inpcons.h @@ -42,7 +42,7 @@ typedef wxString wxControlAction; class WXDLLEXPORT wxInputConsumer { public: - wxInputConsumer(); + wxInputConsumer() { m_inputHandler = NULL; } // get the input handler wxInputHandler *GetInputHandler() const { return m_inputHandler; } diff --git a/include/wx/univ/listbox.h b/include/wx/univ/listbox.h index 06df165a01..b5c6cc2c21 100644 --- a/include/wx/univ/listbox.h +++ b/include/wx/univ/listbox.h @@ -56,7 +56,7 @@ class WXDLLEXPORT wxListBox : public wxListBoxBase, public wxScrollHelper { public: // ctors and such - wxListBox(); + wxListBox() { Init(); } wxListBox(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, @@ -64,7 +64,12 @@ public: int n = 0, const wxString choices[] = (const wxString *) NULL, long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr ); + const wxString& name = wxListBoxNameStr ) + { + Init(); + + Create(parent, id, pos, size, n, choices, style, validator, name); + } virtual ~wxListBox(); diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h index 907af319da..4c82009c99 100644 --- a/include/wx/univ/notebook.h +++ b/include/wx/univ/notebook.h @@ -39,14 +39,19 @@ public: // ctors and such // -------------- - wxNotebook(); + wxNotebook() { Init(); } wxNotebook(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxNOTEBOOK_NAME); + const wxString& name = wxNOTEBOOK_NAME) + { + Init(); + + (void)Create(parent, id, pos, size, style, name); + } // quasi ctor bool Create(wxWindow *parent, diff --git a/include/wx/univ/radiobox.h b/include/wx/univ/radiobox.h index d74e0f3f5b..409d647d15 100644 --- a/include/wx/univ/radiobox.h +++ b/include/wx/univ/radiobox.h @@ -32,7 +32,7 @@ class WXDLLEXPORT wxRadioBox : public wxStaticBox, { public: // wxRadioBox construction - wxRadioBox(); + wxRadioBox() { Init(); } wxRadioBox(wxWindow *parent, wxWindowID id, @@ -43,7 +43,13 @@ public: int majorDim = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& val = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr); + const wxString& name = wxRadioBoxNameStr) + { + Init(); + + (void)Create(parent, id, title, pos, size, n, choices, + majorDim, style, val, name); + } bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/univ/radiobut.h b/include/wx/univ/radiobut.h index 43f2ee7678..5d78b3e9a3 100644 --- a/include/wx/univ/radiobut.h +++ b/include/wx/univ/radiobut.h @@ -26,7 +26,7 @@ class WXDLLEXPORT wxRadioButton : public wxCheckBox { public: // constructors - wxRadioButton(); + wxRadioButton() { Init(); } wxRadioButton(wxWindow *parent, wxWindowID id, @@ -35,7 +35,12 @@ public: const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRadioButtonNameStr); + const wxString& name = wxRadioButtonNameStr) + { + Init(); + + Create(parent, id, label, pos, size, style, validator, name); + } bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h index f2539578ed..444962d382 100644 --- a/include/wx/univ/textctrl.h +++ b/include/wx/univ/textctrl.h @@ -101,7 +101,7 @@ public: // creation // -------- - wxTextCtrl(); + wxTextCtrl() { Init(); } wxTextCtrl(wxWindow *parent, wxWindowID id, @@ -110,7 +110,12 @@ public: const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxTextCtrlNameStr); + const wxString& name = wxTextCtrlNameStr) + { + Init(); + + Create(parent, id, value, pos, size, style, validator, name); + } bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/univ/toolbar.h b/include/wx/univ/toolbar.h index c4770ccf66..73b35cb0a6 100644 --- a/include/wx/univ/toolbar.h +++ b/include/wx/univ/toolbar.h @@ -39,13 +39,18 @@ class WXDLLEXPORT wxToolBar : public wxToolBarBase { public: // construction/destruction - wxToolBar(); + wxToolBar() { Init(); } wxToolBar(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxToolBarNameStr); + const wxString& name = wxToolBarNameStr) + { + Init(); + + Create(parent, id, pos, size, style, name); + } bool Create( wxWindow *parent, wxWindowID id, diff --git a/include/wx/univ/toplevel.h b/include/wx/univ/toplevel.h index 7941417b4e..9790eb6ca9 100644 --- a/include/wx/univ/toplevel.h +++ b/include/wx/univ/toplevel.h @@ -97,14 +97,19 @@ class WXDLLEXPORT wxTopLevelWindow : public wxTopLevelWindowNative, { public: // construction - wxTopLevelWindow(); + wxTopLevelWindow() { Init(); } wxTopLevelWindow(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) + { + Init(); + + Create(parent, id, title, pos, size, style, name); + } bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h index dafa83279d..01115c15f3 100644 --- a/include/wx/univ/window.h +++ b/include/wx/univ/window.h @@ -55,14 +55,16 @@ public: // ctors and create functions // --------------------------- - wxWindow(); + wxWindow() { Init(); } wxWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxPanelNameStr); + const wxString& name = wxPanelNameStr) + : wxWindowNative(parent, id, pos, size, style | wxCLIP_CHILDREN, name) + { Init(); } bool Create(wxWindow *parent, wxWindowID id, diff --git a/include/wx/window.h b/include/wx/window.h index fae09c7ec0..f1eed002ac 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -104,7 +104,7 @@ public: // default ctor, initializes everything which can be initialized before // Create() - wxWindowBase(); + wxWindowBase() ; // pseudo ctor (can't be virtual, called from ctor) bool CreateBase(wxWindowBase *parent, diff --git a/src/cocoa/bmpbuttn.mm b/src/cocoa/bmpbuttn.mm index 3b12f4224f..61a0193676 100644 --- a/src/cocoa/bmpbuttn.mm +++ b/src/cocoa/bmpbuttn.mm @@ -26,16 +26,6 @@ BEGIN_EVENT_TABLE(wxBitmapButton, wxBitmapButtonBase) END_EVENT_TABLE() WX_IMPLEMENT_COCOA_OWNER(wxBitmapButton,NSButton,NSControl,NSView) -wxBitmapButtonBase::wxBitmapButtonBase() - : m_bmpNormal(), - m_bmpSelected(), - m_bmpFocus(), - m_bmpDisabled(), - m_marginX(0), - m_marginY(0) -{ -} - bool wxBitmapButton::Create(wxWindow *parent, wxWindowID winid, const wxBitmap& bitmap, const wxPoint& pos, const wxSize& size, long style, diff --git a/src/cocoa/button.mm b/src/cocoa/button.mm index 5bf61552c3..7b93013217 100644 --- a/src/cocoa/button.mm +++ b/src/cocoa/button.mm @@ -21,10 +21,6 @@ #import #include "wx/cocoa/string.h" -wxButtonBase::wxButtonBase() -{ -} - IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) BEGIN_EVENT_TABLE(wxButton, wxButtonBase) END_EVENT_TABLE() diff --git a/src/common/bookctrl.cpp b/src/common/bookctrl.cpp index 25d28d865d..b04136183e 100644 --- a/src/common/bookctrl.cpp +++ b/src/common/bookctrl.cpp @@ -42,23 +42,6 @@ // constructors and destructors // ---------------------------------------------------------------------------- -wxBookCtrl::wxBookCtrl() -{ - Init(); -} - -wxBookCtrl::wxBookCtrl(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - Init(); - - (void)Create(parent, id, pos, size, style, name); -} - void wxBookCtrl::Init() { m_imageList = NULL; diff --git a/src/common/choiccmn.cpp b/src/common/choiccmn.cpp index 0e81ac87f4..9fc8861528 100644 --- a/src/common/choiccmn.cpp +++ b/src/common/choiccmn.cpp @@ -38,10 +38,6 @@ // implementation // ============================================================================ -wxChoiceBase::wxChoiceBase() -{ -} - wxChoiceBase::~wxChoiceBase() { // this destructor is required for Darwin diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp index 4bddbffcea..ec97111188 100644 --- a/src/common/ctrlcmn.cpp +++ b/src/common/ctrlcmn.cpp @@ -45,10 +45,6 @@ // implementation // ============================================================================ -wxControlBase::wxControlBase() -{ -} - wxControlBase::~wxControlBase() { // this destructor is required for Darwin diff --git a/src/common/ctrlsub.cpp b/src/common/ctrlsub.cpp index c4debc5e7c..03be03f3dc 100644 --- a/src/common/ctrlsub.cpp +++ b/src/common/ctrlsub.cpp @@ -39,11 +39,6 @@ // implementation // ============================================================================ -wxItemContainer::wxItemContainer() -{ - m_clientDataItemsType = wxClientData_None; -} - wxItemContainer::~wxItemContainer() { // this destructor is required for Darwin @@ -156,10 +151,6 @@ void *wxItemContainer::GetClientData(int n) const return DoGetItemClientData(n); } -wxControlWithItems::wxControlWithItems() -{ -} - wxControlWithItems::~wxControlWithItems() { // this destructor is required for Darwin diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp index 8b6e4f619c..e53b1640ab 100644 --- a/src/common/dlgcmn.cpp +++ b/src/common/dlgcmn.cpp @@ -53,11 +53,6 @@ END_EVENT_TABLE() WX_DELEGATE_TO_CONTROL_CONTAINER(wxDialogBase) #endif -wxDialogBase::wxDialogBase() -{ - Init(); -} - void wxDialogBase::Init() { m_returnCode = 0; diff --git a/src/common/fldlgcmn.cpp b/src/common/fldlgcmn.cpp index a93e631aeb..3f08486a1a 100644 --- a/src/common/fldlgcmn.cpp +++ b/src/common/fldlgcmn.cpp @@ -36,10 +36,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileDialogBase, wxDialog) -wxFileDialogBase::wxFileDialogBase () -{ -} - wxFileDialogBase::wxFileDialogBase(wxWindow *parent, const wxString& message, const wxString& defaultDir, diff --git a/src/common/lboxcmn.cpp b/src/common/lboxcmn.cpp index 01c58ffce5..292bec8130 100644 --- a/src/common/lboxcmn.cpp +++ b/src/common/lboxcmn.cpp @@ -40,10 +40,6 @@ // implementation // ============================================================================ -wxListBoxBase::wxListBoxBase() -{ -} - wxListBoxBase::~wxListBoxBase() { // this destructor is required for Darwin diff --git a/src/common/nbkbase.cpp b/src/common/nbkbase.cpp index 8746f2729d..6beaa057ec 100644 --- a/src/common/nbkbase.cpp +++ b/src/common/nbkbase.cpp @@ -39,20 +39,6 @@ // implementation // ============================================================================ -wxNotebookBase::wxNotebookBase() -{ -} - -wxNotebookBase::wxNotebookBase(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) - : wxBookCtrl(parent, id, pos, size, style, name) -{ -} - // ---------------------------------------------------------------------------- // geometry // ---------------------------------------------------------------------------- diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp index 960619d893..629284a4ba 100644 --- a/src/generic/choicdgg.cpp +++ b/src/generic/choicdgg.cpp @@ -238,22 +238,6 @@ size_t wxGetMultipleChoices(wxArrayInt& selections, // wxAnyChoiceDialog // ---------------------------------------------------------------------------- -wxAnyChoiceDialog::wxAnyChoiceDialog() -{ -} - -wxAnyChoiceDialog::wxAnyChoiceDialog(wxWindow *parent, - const wxString& message, - const wxString& caption, - int n, - const wxString *choices, - long styleDlg, - const wxPoint& pos, - long styleLbox) -{ - (void)Create(parent, message, caption, n, choices, styleDlg, pos, styleLbox); -} - bool wxAnyChoiceDialog::Create(wxWindow *parent, const wxString& message, const wxString& caption, @@ -312,11 +296,6 @@ END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxSingleChoiceDialog, wxDialog) -wxSingleChoiceDialog::wxSingleChoiceDialog() -{ - m_selection = -1; -} - wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent, const wxString& message, const wxString& caption, @@ -387,21 +366,6 @@ void wxSingleChoiceDialog::OnListBoxDClick(wxCommandEvent& WXUNUSED(event)) IMPLEMENT_DYNAMIC_CLASS(wxMultiChoiceDialog, wxDialog) -wxMultiChoiceDialog::wxMultiChoiceDialog() -{ -} - -wxMultiChoiceDialog::wxMultiChoiceDialog(wxWindow *parent, - const wxString& message, - const wxString& caption, - int n, - const wxString *choices, - long style, - const wxPoint& pos) -{ - (void)Create(parent, message, caption, n, choices, style, pos); -} - bool wxMultiChoiceDialog::Create( wxWindow *parent, const wxString& message, const wxString& caption, diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index 3d08cd0945..660128edf2 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -1146,11 +1146,7 @@ bool wxGenericDirCtrl::ExtractWildcard(const wxString& filterStr, int n, wxStrin int wxGenericDirCtrl::ParseFilter(const wxString& filterStr, wxArrayString& filters, wxArrayString& descriptions) { -#if wxUSE_FILEDLG return wxFileDialogBase::ParseWildcard(filterStr, descriptions, filters ); -#else - return 0; -#endif } void wxGenericDirCtrl::DoResize() diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index b336cabd6c..6f301a8f23 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -835,10 +835,6 @@ END_EVENT_TABLE() long wxGenericFileDialog::ms_lastViewStyle = wxLC_LIST; bool wxGenericFileDialog::ms_lastShowHidden = FALSE; -wxGenericFileDialog::wxGenericFileDialog() -{ -} - wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, const wxString& message, const wxString& defaultDir, @@ -1368,21 +1364,6 @@ void wxGenericFileDialog::UpdateControls() IMPLEMENT_DYNAMIC_CLASS(wxFileDialog, wxGenericFileDialog); -wxFileDialog::wxFileDialog() -{ -} - -wxFileDialog::wxFileDialog(wxWindow *parent, - const wxString& message, - const wxString& defaultDir, - const wxString& defaultFile, - const wxString& wildCard, - long style, - const wxPoint& pos) - :wxGenericFileDialog(parent, message, defaultDir, defaultFile, wildCard, style, pos) -{ -} - #endif // USE_GENERIC_FILEDIALOG #endif // wxUSE_FILEDLG diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index bdb8733169..394e27505c 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -4533,17 +4533,6 @@ wxGenericListCtrl::wxGenericListCtrl() m_headerHeight = 0; } -wxGenericListCtrl::wxGenericListCtrl(wxWindow *parent, - wxWindowID winid, - const wxPoint &pos, - const wxSize &size, - long style, - const wxValidator& validator, - const wxString &name) -{ - Create(parent, winid, pos, size, style, validator, name); -} - wxGenericListCtrl::~wxGenericListCtrl() { if (m_ownsImageListNormal) @@ -5393,39 +5382,5 @@ void wxGenericListCtrl::Thaw() m_mainWin->Thaw(); } -#if !defined(__WXMSW__) || defined(__WIN16__) || defined(__WXUNIVERSAL__) - -wxListCtrl::wxListCtrl() -{ -} - -wxListCtrl::wxListCtrl(wxWindow *parent, - wxWindowID winid, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator &validator, - const wxString &name) - : wxGenericListCtrl(parent, winid, pos, size, style, validator, name) -{ -} - -#endif // !__WXMSW__ || __WIN16__ || __WXUNIVERSAL__ - -wxListView::wxListView() -{ -} - -wxListView::wxListView(wxWindow *parent, - wxWindowID winid, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString &name) -{ - Create(parent, winid, pos, size, style, validator, name); -} - #endif // wxUSE_LISTCTRL diff --git a/src/generic/mdig.cpp b/src/generic/mdig.cpp index bfa1b92b8b..e0b951be0e 100644 --- a/src/generic/mdig.cpp +++ b/src/generic/mdig.cpp @@ -797,46 +797,6 @@ void wxGenericMDIClientWindow::OnSize(wxSizeEvent& event) #if wxUSE_GENERIC_MDI_AS_NATIVE -wxMDIParentFrame::wxMDIParentFrame() -{ -} - -wxMDIParentFrame::wxMDIParentFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) - :wxGenericMDIParentFrame(parent, id, title, pos, size, style, name) -{ -} - -wxMDIChildFrame::wxMDIChildFrame() -{ -} - -wxMDIClientWindow::wxMDIClientWindow() -{ -} - -wxMDIClientWindow::wxMDIClientWindow(wxGenericMDIParentFrame *parent, - long style) - :wxGenericMDIClientWindow(parent, style) -{ -} - -wxMDIChildFrame::wxMDIChildFrame(wxGenericMDIParentFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) - :wxGenericMDIChildFrame(parent, id, title, pos, size, style, name) -{ -} - wxMDIChildFrame * wxMDIParentFrame::GetActiveChild() const { wxGenericMDIChildFrame *pGFrame = wxGenericMDIParentFrame::GetActiveChild(); diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp index 6613985976..19d2d2800c 100644 --- a/src/generic/prntdlgg.cpp +++ b/src/generic/prntdlgg.cpp @@ -261,7 +261,6 @@ void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event)) // and the standard print dialog. The global printing 'mode' // is determined by whether the user checks Print to file // or not. -#if wxUSE_FILEDLG if (m_printDialogData.GetPrintToFile()) { m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_FILE); @@ -275,7 +274,6 @@ void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event)) m_printDialogData.GetPrintData().SetFilename( dialog.GetPath() ); } else -#endif { m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_PRINTER); } diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp index f2c4ba0af7..deea726fb6 100644 --- a/src/generic/scrlwing.cpp +++ b/src/generic/scrlwing.cpp @@ -1202,21 +1202,6 @@ BEGIN_EVENT_TABLE(wxGenericScrolledWindow, wxPanel) EVT_PAINT(wxGenericScrolledWindow::OnPaint) END_EVENT_TABLE() -wxGenericScrolledWindow::wxGenericScrolledWindow() : wxScrollHelper(this) -{ -} - -wxGenericScrolledWindow::wxGenericScrolledWindow(wxWindow *parent, - wxWindowID winid, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) - : wxScrollHelper(this) -{ - Create(parent, winid, pos, size, style, name); -} - bool wxGenericScrolledWindow::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, @@ -1292,24 +1277,6 @@ wxGenericScrolledWindow::MSWWindowProc(WXUINT nMsg, #endif // __WXMSW__ -// ---------------------------------------------------------------------------- -// wxScrolledWindow implementation -// ---------------------------------------------------------------------------- - -wxScrolledWindow::wxScrolledWindow() -{ -} - -wxScrolledWindow::wxScrolledWindow(wxWindow *parent, - wxWindowID winid, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) - : wxGenericScrolledWindow(parent, winid, pos, size, style, name) -{ -} - #endif // !wxGTK // vi:sts=4:sw=4:et diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp index eeb89d7163..6d463b364b 100644 --- a/src/gtk/bmpbuttn.cpp +++ b/src/gtk/bmpbuttn.cpp @@ -112,16 +112,6 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton) -wxBitmapButtonBase::wxBitmapButtonBase() - : m_bmpNormal(), - m_bmpSelected(), - m_bmpFocus(), - m_bmpDisabled(), - m_marginX(0), - m_marginY(0) -{ -} - void wxBitmapButton::Init() { m_hasFocus = diff --git a/src/gtk/checkbox.cpp b/src/gtk/checkbox.cpp index db7aa6e4f7..2a7d0437bf 100644 --- a/src/gtk/checkbox.cpp +++ b/src/gtk/checkbox.cpp @@ -62,10 +62,6 @@ static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckB // wxCheckBox //----------------------------------------------------------------------------- -wxCheckBoxBase::wxCheckBoxBase() -{ -} - IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl) wxCheckBox::wxCheckBox() diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp index 0f754b7d52..fc1aa4602a 100644 --- a/src/gtk/checklst.cpp +++ b/src/gtk/checklst.cpp @@ -24,14 +24,6 @@ #include #include -//----------------------------------------------------------------------------- -// wxCheckListBoxBase -//----------------------------------------------------------------------------- - -wxCheckListBoxBase::wxCheckListBoxBase() -{ -} - //----------------------------------------------------------------------------- // wxCheckListBox //----------------------------------------------------------------------------- diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp index eeb89d7163..6d463b364b 100644 --- a/src/gtk1/bmpbuttn.cpp +++ b/src/gtk1/bmpbuttn.cpp @@ -112,16 +112,6 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton) -wxBitmapButtonBase::wxBitmapButtonBase() - : m_bmpNormal(), - m_bmpSelected(), - m_bmpFocus(), - m_bmpDisabled(), - m_marginX(0), - m_marginY(0) -{ -} - void wxBitmapButton::Init() { m_hasFocus = diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp index db7aa6e4f7..2a7d0437bf 100644 --- a/src/gtk1/checkbox.cpp +++ b/src/gtk1/checkbox.cpp @@ -62,10 +62,6 @@ static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckB // wxCheckBox //----------------------------------------------------------------------------- -wxCheckBoxBase::wxCheckBoxBase() -{ -} - IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl) wxCheckBox::wxCheckBox() diff --git a/src/gtk1/checklst.cpp b/src/gtk1/checklst.cpp index 0f754b7d52..fc1aa4602a 100644 --- a/src/gtk1/checklst.cpp +++ b/src/gtk1/checklst.cpp @@ -24,14 +24,6 @@ #include #include -//----------------------------------------------------------------------------- -// wxCheckListBoxBase -//----------------------------------------------------------------------------- - -wxCheckListBoxBase::wxCheckListBoxBase() -{ -} - //----------------------------------------------------------------------------- // wxCheckListBox //----------------------------------------------------------------------------- diff --git a/src/mac/bmpbuttn.cpp b/src/mac/bmpbuttn.cpp index 9d66f2da51..4f06731513 100644 --- a/src/mac/bmpbuttn.cpp +++ b/src/mac/bmpbuttn.cpp @@ -23,16 +23,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) #include "wx/mac/uma.h" #include "wx/bitmap.h" -wxBitmapButtonBase::wxBitmapButtonBase() - : m_bmpNormal(), - m_bmpSelected(), - m_bmpFocus(), - m_bmpDisabled(), - m_marginX(0), - m_marginY(0) -{ -} - bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos, const wxSize& size, long style, diff --git a/src/mac/button.cpp b/src/mac/button.cpp index 52bd329993..82e4e34c5f 100644 --- a/src/mac/button.cpp +++ b/src/mac/button.cpp @@ -28,10 +28,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) static const int kMacOSXHorizontalBorder = 2 ; static const int kMacOSXVerticalBorder = 4 ; -wxButtonBase::wxButtonBase() -{ -} - bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos, const wxSize& size, long style, diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp index 9d66f2da51..4f06731513 100644 --- a/src/mac/carbon/bmpbuttn.cpp +++ b/src/mac/carbon/bmpbuttn.cpp @@ -23,16 +23,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) #include "wx/mac/uma.h" #include "wx/bitmap.h" -wxBitmapButtonBase::wxBitmapButtonBase() - : m_bmpNormal(), - m_bmpSelected(), - m_bmpFocus(), - m_bmpDisabled(), - m_marginX(0), - m_marginY(0) -{ -} - bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos, const wxSize& size, long style, diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp index 52bd329993..82e4e34c5f 100644 --- a/src/mac/carbon/button.cpp +++ b/src/mac/carbon/button.cpp @@ -28,10 +28,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) static const int kMacOSXHorizontalBorder = 2 ; static const int kMacOSXVerticalBorder = 4 ; -wxButtonBase::wxButtonBase() -{ -} - bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos, const wxSize& size, long style, diff --git a/src/mac/carbon/checkbox.cpp b/src/mac/carbon/checkbox.cpp index e9248b9993..6e6aa299b2 100644 --- a/src/mac/carbon/checkbox.cpp +++ b/src/mac/carbon/checkbox.cpp @@ -24,10 +24,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox) #include "wx/mac/uma.h" -wxCheckBoxBase::wxCheckBoxBase() -{ -} - // Single check box item bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos, diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp index 677dc00163..1e88ce34f6 100644 --- a/src/mac/carbon/checklst.cpp +++ b/src/mac/carbon/checklst.cpp @@ -26,14 +26,6 @@ #include "wx/mac/uma.h" #include "Appearance.h" -// ============================================================================ -// implementation of wxCheckListBoxBase -// ============================================================================ - -wxCheckListBoxBase::wxCheckListBoxBase() -{ -} - // ============================================================================ // implementation of wxCheckListBox // ============================================================================ diff --git a/src/mac/checkbox.cpp b/src/mac/checkbox.cpp index e9248b9993..6e6aa299b2 100644 --- a/src/mac/checkbox.cpp +++ b/src/mac/checkbox.cpp @@ -24,10 +24,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox) #include "wx/mac/uma.h" -wxCheckBoxBase::wxCheckBoxBase() -{ -} - // Single check box item bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos, diff --git a/src/mac/checklst.cpp b/src/mac/checklst.cpp index 677dc00163..1e88ce34f6 100644 --- a/src/mac/checklst.cpp +++ b/src/mac/checklst.cpp @@ -26,14 +26,6 @@ #include "wx/mac/uma.h" #include "Appearance.h" -// ============================================================================ -// implementation of wxCheckListBoxBase -// ============================================================================ - -wxCheckListBoxBase::wxCheckListBoxBase() -{ -} - // ============================================================================ // implementation of wxCheckListBox // ============================================================================ diff --git a/src/motif/bmpbuttn.cpp b/src/motif/bmpbuttn.cpp index 6816a08456..00da6290fa 100644 --- a/src/motif/bmpbuttn.cpp +++ b/src/motif/bmpbuttn.cpp @@ -39,16 +39,6 @@ void wxButtonCallback (Widget w, XtPointer clientData, XtPointer ptr); IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) -wxBitmapButtonBase::wxBitmapButtonBase() - : m_bmpNormal(), - m_bmpSelected(), - m_bmpFocus(), - m_bmpDisabled(), - m_marginX(0), - m_marginY(0) -{ -} - wxBitmapButton::wxBitmapButton() { m_marginX = m_marginY = wxDEFAULT_BUTTON_MARGIN; diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp index 99587b1713..927b508123 100644 --- a/src/motif/checkbox.cpp +++ b/src/motif/checkbox.cpp @@ -41,10 +41,6 @@ void wxCheckBoxCallback (Widget w, XtPointer clientData, IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) -wxCheckBoxBase::wxCheckBoxBase() -{ -} - // Single check box item bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos, diff --git a/src/motif/checklst.cpp b/src/motif/checklst.cpp index 32b4ee6f08..ef51031515 100644 --- a/src/motif/checklst.cpp +++ b/src/motif/checklst.cpp @@ -23,15 +23,7 @@ #include "wx/arrstr.h" // ============================================================================ -// implementation of wxCheckListBoxBase -// ============================================================================ - -wxCheckListBoxBase::wxCheckListBoxBase() -{ -} - -// ============================================================================ -// implementation of wxCheckListBox +// implementation // ============================================================================ IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp index 12294cdc71..3a3798dce3 100644 --- a/src/msw/bitmap.cpp +++ b/src/msw/bitmap.cpp @@ -362,47 +362,6 @@ wxBitmap::~wxBitmap() { } -wxBitmap::wxBitmap() -{ - Init(); -} - -wxBitmap::wxBitmap(const wxBitmap& bitmap) -{ - Init(); - Ref(bitmap); -} - -wxBitmap::wxBitmap(const char **data) -{ - CreateFromXpm(data); -} - -wxBitmap::wxBitmap(char **data) -{ - CreateFromXpm((const char **)data); -} - -#if wxUSE_IMAGE - -wxBitmap::wxBitmap(const wxImage& image, int depth) -{ - (void)CreateFromImage(image, depth); -} - -wxBitmap::wxBitmap(const wxImage& image, const wxDC& dc) -{ - (void)CreateFromImage(image, dc); -} - -#endif // wxUSE_IMAGE - -wxBitmap::wxBitmap(const wxIcon& icon) -{ - Init(); - CopyFromIcon(icon); -} - wxBitmap::wxBitmap(const char bits[], int width, int height, int depth) { Init(); diff --git a/src/msw/bmpbuttn.cpp b/src/msw/bmpbuttn.cpp index 080081a63a..a91de899b4 100644 --- a/src/msw/bmpbuttn.cpp +++ b/src/msw/bmpbuttn.cpp @@ -100,16 +100,6 @@ bitmap "disabled" , #define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1) -wxBitmapButtonBase::wxBitmapButtonBase() - : m_bmpNormal(), - m_bmpSelected(), - m_bmpFocus(), - m_bmpDisabled(), - m_marginX(0), - m_marginY(0) -{ -} - bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos, const wxSize& size, long style, diff --git a/src/msw/button.cpp b/src/msw/button.cpp index 2f9b8b58db..7d2a84f198 100644 --- a/src/msw/button.cpp +++ b/src/msw/button.cpp @@ -119,10 +119,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) // creation/destruction // ---------------------------------------------------------------------------- -wxButtonBase::wxButtonBase() -{ -} - bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, diff --git a/src/msw/checkbox.cpp b/src/msw/checkbox.cpp index 4c6927632a..494819949d 100644 --- a/src/msw/checkbox.cpp +++ b/src/msw/checkbox.cpp @@ -112,10 +112,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) // wxCheckBox // ---------------------------------------------------------------------------- -wxCheckBoxBase::wxCheckBoxBase() -{ -} - bool wxCheckBox::MSWCommand(WXUINT WXUNUSED(param), WXWORD WXUNUSED(id)) { wxCommandEvent event(wxEVT_COMMAND_CHECKBOX_CLICKED, m_windowId); diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp index 1eed9804f9..7f4c77711a 100644 --- a/src/msw/checklst.cpp +++ b/src/msw/checklst.cpp @@ -64,15 +64,7 @@ #define GetItem(n) ((wxCheckListBoxItem *)(GetItem(n))) // ============================================================================ -// implementation of wxCheckListBoxBase -// ============================================================================ - -wxCheckListBoxBase::wxCheckListBoxBase() -{ -} - -// ============================================================================ -// implementation of wxCheckListBox +// implementation // ============================================================================ diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp index 39aacbf81b..3a5919592b 100644 --- a/src/msw/choice.cpp +++ b/src/msw/choice.cpp @@ -106,23 +106,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl) // creation // ---------------------------------------------------------------------------- -wxChoice::wxChoice() -{ -} - -wxChoice::wxChoice(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - int n, - const wxString choices[], - long style, - const wxValidator& validator, - const wxString& name) -{ - Create(parent, id, pos, size, n, choices, style, validator, name); -} - bool wxChoice::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 2e18557cba..f71cb41a3f 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -237,24 +237,6 @@ WXHBRUSH wxComboBox::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSE // wxComboBox // ---------------------------------------------------------------------------- -wxComboBox::wxComboBox() -{ -} - -wxComboBox::wxComboBox(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - int n, - const wxString choices[], - long style, - const wxValidator& validator, - const wxString& name) -{ - Create(parent, id, value, pos, size, n, choices, style, validator, name); -} - bool wxComboBox::MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam) { switch ( msg ) diff --git a/src/msw/gdiobj.cpp b/src/msw/gdiobj.cpp index 30919e2c12..de94cd9d54 100644 --- a/src/msw/gdiobj.cpp +++ b/src/msw/gdiobj.cpp @@ -33,11 +33,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) -wxGDIObject::wxGDIObject() -{ - m_visible = FALSE; -} - /* void wxGDIObject::IncrementResourceUsage(void) { diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp index 80b2bb0f6f..90cfac1779 100644 --- a/src/msw/listbox.cpp +++ b/src/msw/listbox.cpp @@ -155,19 +155,6 @@ wxListBox::wxListBox() m_selected = 0; } -wxListBox::wxListBox(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - int n, - const wxString choices[], - long style, - const wxValidator& validator, - const wxString& name) -{ - Create(parent, id, pos, size, n, choices, style, validator, name); -} - bool wxListBox::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp index afee0618c9..3e9b5966cb 100644 --- a/src/msw/listctrl.cpp +++ b/src/msw/listctrl.cpp @@ -2778,20 +2778,5 @@ static void wxConvertToMSWListCol(int WXUNUSED(col), const wxListItem& item, #endif // _WIN32_IE >= 0x0300 } -wxListView::wxListView() -{ -} - -wxListView::wxListView(wxWindow *parent, - wxWindowID winid, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString &name) -{ - Create(parent, winid, pos, size, style, validator, name); -} - #endif // wxUSE_LISTCTRL diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp index b5ccacd1e3..58d056fa61 100644 --- a/src/msw/radiobox.cpp +++ b/src/msw/radiobox.cpp @@ -251,22 +251,6 @@ wxRadioBox::wxRadioBox() m_radioHeight = NULL; } -wxRadioBox::wxRadioBox(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - int n, - const wxString choices[], - int majorDim, - long style, - const wxValidator& val, - const wxString& name) -{ - (void)Create(parent, id, title, pos, size, n, choices, majorDim, - style, val, name); -} - bool wxRadioBox::Create(wxWindow *parent, wxWindowID id, const wxString& title, diff --git a/src/msw/radiobut.cpp b/src/msw/radiobut.cpp index 7ad7e7316e..96f4803110 100644 --- a/src/msw/radiobut.cpp +++ b/src/msw/radiobut.cpp @@ -102,25 +102,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) #endif -wxRadioButton::wxRadioButton() -{ - Init(); -} - -wxRadioButton::wxRadioButton(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - Init(); - - Create(parent, id, label, pos, size, style, validator, name); -} - void wxRadioButton::Init() { m_isChecked = false; diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index 760362ee3d..2376e815e6 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -134,24 +134,6 @@ END_EVENT_TABLE() // wxTopLevelWindowMSW creation // ---------------------------------------------------------------------------- -wxTopLevelWindowMSW::wxTopLevelWindowMSW() -{ - Init(); -} - -wxTopLevelWindowMSW::wxTopLevelWindowMSW(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - Init(); - - (void)Create(parent, id, title, pos, size, style, name); -} - void wxTopLevelWindowMSW::Init() { m_iconized = diff --git a/src/msw/window.cpp b/src/msw/window.cpp index f09ad40549..081a98761b 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -380,22 +380,6 @@ END_EVENT_TABLE() // implementation // =========================================================================== -wxWindowMSW::wxWindowMSW() -{ - Init(); -} - -wxWindowMSW::wxWindowMSW(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - Init(); - Create(parent, id, pos, size, style, name); -} - // --------------------------------------------------------------------------- // wxWindow utility functions // --------------------------------------------------------------------------- diff --git a/src/os2/bmpbuttn.cpp b/src/os2/bmpbuttn.cpp index 40ebab45f2..6697e119b7 100644 --- a/src/os2/bmpbuttn.cpp +++ b/src/os2/bmpbuttn.cpp @@ -25,16 +25,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) #define BUTTON_HEIGHT_FACTOR (EDIT_CONTROL_FACTOR * 1.1) -wxBitmapButtonBase::wxBitmapButtonBase() - : m_bmpNormal(), - m_bmpSelected(), - m_bmpFocus(), - m_bmpDisabled(), - m_marginX(0), - m_marginY(0) -{ -} - bool wxBitmapButton::Create( wxWindow* pParent , wxWindowID vId diff --git a/src/os2/checkbox.cpp b/src/os2/checkbox.cpp index 165e1da2b9..83480a8ef2 100644 --- a/src/os2/checkbox.cpp +++ b/src/os2/checkbox.cpp @@ -41,10 +41,6 @@ extern void wxAssociateWinWithHandle( HWND hWnd // wxCheckBox // ---------------------------------------------------------------------------- -wxCheckBoxBase::wxCheckBoxBase() -{ -} - bool wxCheckBox::OS2Command( WXUINT WXUNUSED(uParam) , WXWORD WXUNUSED(wId) diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp index c0b1ac0ca0..ec5776444d 100644 --- a/src/os2/checklst.cpp +++ b/src/os2/checklst.cpp @@ -42,15 +42,7 @@ #define GetItem(n) ((wxCheckListBoxItem *)(GetItem(n))) // ============================================================================ -// implementation of wxCheckListBoxBase -// ============================================================================ - -wxCheckListBoxBase::wxCheckListBoxBase() -{ -} - -// ============================================================================ -// implementation of wxCheckListBox +// implementation // ============================================================================ IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) diff --git a/src/os2/listctrl.cpp b/src/os2/listctrl.cpp index 01dd9d86f0..1cf40a8c99 100644 --- a/src/os2/listctrl.cpp +++ b/src/os2/listctrl.cpp @@ -2896,19 +2896,4 @@ MRESULT wxListCtrl::OS2WindowProc( return lRc; } // end of wxListCtrl::WindowProc -wxListView::wxListView() -{ -} - -wxListView::wxListView(wxWindow *parent, - wxWindowID winid, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString &name) -{ - Create(parent, winid, pos, size, style, validator, name); -} - #endif // wxUSE_LISTCTRL diff --git a/src/univ/bmpbuttn.cpp b/src/univ/bmpbuttn.cpp index 5efb9f76a3..396dc3040a 100644 --- a/src/univ/bmpbuttn.cpp +++ b/src/univ/bmpbuttn.cpp @@ -52,32 +52,6 @@ END_EVENT_TABLE() // wxBitmapButton // ---------------------------------------------------------------------------- -wxBitmapButtonBase::wxBitmapButtonBase() - : m_bmpNormal(), - m_bmpSelected(), - m_bmpFocus(), - m_bmpDisabled(), - m_marginX(0), - m_marginY(0) -{ -} - -wxBitmapButton::wxBitmapButton() -{ -} - -wxBitmapButton::wxBitmapButton(wxWindow *parent, - wxWindowID id, - const wxBitmap& bitmap, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - Create(parent, id, bitmap, pos, size, style, validator, name); -} - bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, diff --git a/src/univ/button.cpp b/src/univ/button.cpp index 1e925d9af1..fb7914d2a1 100644 --- a/src/univ/button.cpp +++ b/src/univ/button.cpp @@ -60,44 +60,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) // creation // ---------------------------------------------------------------------------- -wxButtonBase::wxButtonBase() -{ -} - -wxButton::wxButton() -{ - Init(); -} - -wxButton::wxButton(wxWindow *parent, - wxWindowID id, - const wxBitmap& bitmap, - const wxString& label, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - Init(); - - Create(parent, id, bitmap, label, pos, size, style, validator, name); -} - -wxButton::wxButton(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - Init(); - - Create(parent, id, label, pos, size, style, validator, name); -} - void wxButton::Init() { m_isPressed = diff --git a/src/univ/checkbox.cpp b/src/univ/checkbox.cpp index 966e9f580d..e80d036343 100644 --- a/src/univ/checkbox.cpp +++ b/src/univ/checkbox.cpp @@ -52,29 +52,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl) // wxCheckBox // ---------------------------------------------------------------------------- -wxCheckBoxBase::wxCheckBoxBase() -{ -} - -wxCheckBox::wxCheckBox() -{ - Init(); -} - -wxCheckBox::wxCheckBox(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - Init(); - - Create(parent, id, label, pos, size, style, validator, name); -} - void wxCheckBox::Init() { m_isPressed = FALSE; diff --git a/src/univ/checklst.cpp b/src/univ/checklst.cpp index e4f4547272..8f3981f8c4 100644 --- a/src/univ/checklst.cpp +++ b/src/univ/checklst.cpp @@ -41,14 +41,6 @@ #include "wx/univ/inphand.h" #include "wx/univ/theme.h" -// ============================================================================ -// implementation of wxCheckListBoxBase -// ============================================================================ - -wxCheckListBoxBase::wxCheckListBoxBase() -{ -} - // ============================================================================ // implementation of wxCheckListBox // ============================================================================ @@ -59,26 +51,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) // creation // ---------------------------------------------------------------------------- -wxCheckListBox::wxCheckListBox() -{ - Init(); -} - -wxCheckListBox::wxCheckListBox(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - int nStrings, - const wxString *choices, - long style, - const wxValidator& validator, - const wxString& name) -{ - Init(); - - Create(parent, id, pos, size, nStrings, choices, style, validator, name); -} - void wxCheckListBox::Init() { } diff --git a/src/univ/choice.cpp b/src/univ/choice.cpp index 35567aca1b..81925542a1 100644 --- a/src/univ/choice.cpp +++ b/src/univ/choice.cpp @@ -39,23 +39,6 @@ BEGIN_EVENT_TABLE(wxChoice, wxComboBox) EVT_COMBOBOX(-1, wxChoice::OnComboBox) END_EVENT_TABLE() -wxChoice::wxChoice() -{ -} - -wxChoice::wxChoice(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - int n, - const wxString choices[], - long style, - const wxValidator& validator, - const wxString& name) -{ - Create(parent, id, pos, size, n, choices, style, validator, name); -} - bool wxChoice::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp index 53d2c180fc..a61d580100 100644 --- a/src/univ/combobox.cpp +++ b/src/univ/combobox.cpp @@ -213,25 +213,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) // wxComboControl creation // ---------------------------------------------------------------------------- -wxComboControl::wxComboControl() -{ - Init(); -} - -wxComboControl::wxComboControl(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - Init(); - - (void)Create(parent, id, value, pos, size, style, validator, name); -} - void wxComboControl::Init() { m_popup = (wxComboPopup *)NULL; @@ -671,28 +652,6 @@ wxSize wxComboListBox::DoGetBestClientSize() const // wxComboBox // ---------------------------------------------------------------------------- -wxComboBox::wxComboBox() -{ - Init(); -} - -wxComboBox::wxComboBox(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - int n, - const wxString *choices, - long style, - const wxValidator& validator, - const wxString& name) -{ - Init(); - - (void)Create(parent, id, value, pos, size, n, choices, - style, validator, name); -} - void wxComboBox::Init() { m_lbox = (wxListBox *)NULL; diff --git a/src/univ/control.cpp b/src/univ/control.cpp index 9c7c0c7bfc..a719d491fa 100644 --- a/src/univ/control.cpp +++ b/src/univ/control.cpp @@ -55,24 +55,6 @@ WX_FORWARD_TO_INPUT_CONSUMER(wxControl) // creation // ---------------------------------------------------------------------------- -wxControl::wxControl() -{ - Init(); -} - -wxControl::wxControl(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - Init(); - - Create(parent, id, pos, size, style, validator, name); -} - void wxControl::Init() { m_indexAccel = -1; diff --git a/src/univ/dialog.cpp b/src/univ/dialog.cpp index d87d7ce8af..40b3f7efe8 100644 --- a/src/univ/dialog.cpp +++ b/src/univ/dialog.cpp @@ -46,23 +46,6 @@ END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow) -wxDialog::wxDialog() -{ - Init(); -} - -wxDialog::wxDialog(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - Init(); - Create(parent, id, title, pos, size, style, name); -} - void wxDialog::Init() { m_returnCode = 0; diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp index f246bd9f7b..1fa17e7a06 100644 --- a/src/univ/framuniv.cpp +++ b/src/univ/framuniv.cpp @@ -49,21 +49,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) // ctors // ---------------------------------------------------------------------------- -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); -} - bool wxFrame::Create(wxWindow *parent, wxWindowID id, const wxString& title, diff --git a/src/univ/inpcons.cpp b/src/univ/inpcons.cpp index 1dd3897c0b..af38f0c8eb 100644 --- a/src/univ/inpcons.cpp +++ b/src/univ/inpcons.cpp @@ -35,11 +35,6 @@ // implementation // ============================================================================ -wxInputConsumer::wxInputConsumer() -{ - m_inputHandler = NULL; -} - // ---------------------------------------------------------------------------- // focus/activation handling // ---------------------------------------------------------------------------- diff --git a/src/univ/listbox.cpp b/src/univ/listbox.cpp index d845c548cf..099d70f8e3 100644 --- a/src/univ/listbox.cpp +++ b/src/univ/listbox.cpp @@ -55,26 +55,6 @@ END_EVENT_TABLE() // construction // ---------------------------------------------------------------------------- -wxListBox::wxListBox() -{ - Init(); -} - -wxListBox::wxListBox(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - int n, - const wxString choices[], - long style, - const wxValidator& validator, - const wxString& name) -{ - Init(); - - Create(parent, id, pos, size, n, choices, style, validator, name); -} - void wxListBox::Init() { // will be calculated later when needed diff --git a/src/univ/notebook.cpp b/src/univ/notebook.cpp index 5de122ecf1..68e2ec2e23 100644 --- a/src/univ/notebook.cpp +++ b/src/univ/notebook.cpp @@ -102,23 +102,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent) // wxNotebook creation // ---------------------------------------------------------------------------- -wxNotebook::wxNotebook() -{ - Init(); -} - -wxNotebook::wxNotebook(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - Init(); - - (void)Create(parent, id, pos, size, style, name); -} - void wxNotebook::Init() { m_sel = INVALID_PAGE; diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp index 47b7c1a399..c758abf74b 100644 --- a/src/univ/radiobox.cpp +++ b/src/univ/radiobox.cpp @@ -95,28 +95,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl) // wxRadioBox creation // ---------------------------------------------------------------------------- -wxRadioBox::wxRadioBox() -{ - Init(); -} - -wxRadioBox::wxRadioBox(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - int n, - const wxString *choices, - int majorDim, - long style, - const wxValidator& val, - const wxString& name) -{ - Init(); - - (void)Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name); -} - void wxRadioBox::Init() { m_selection = -1; diff --git a/src/univ/radiobut.cpp b/src/univ/radiobut.cpp index 56676fe82c..6ba669f940 100644 --- a/src/univ/radiobut.cpp +++ b/src/univ/radiobut.cpp @@ -50,25 +50,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl) // wxRadioButton // ---------------------------------------------------------------------------- -wxRadioButton::wxRadioButton() -{ - Init(); -} - -wxRadioButton::wxRadioButton(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - Init(); - - Create(parent, id, label, pos, size, style, validator, name); -} - bool wxRadioButton::Create(wxWindow *parent, wxWindowID id, const wxString &label, diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp index 0765852720..3111cdf4bd 100644 --- a/src/univ/textctrl.cpp +++ b/src/univ/textctrl.cpp @@ -622,25 +622,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl) // creation // ---------------------------------------------------------------------------- -wxTextCtrl::wxTextCtrl() -{ - Init(); -} - -wxTextCtrl::wxTextCtrl(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - Init(); - - Create(parent, id, value, pos, size, style, validator, name); -} - void wxTextCtrl::Init() { m_selAnchor = diff --git a/src/univ/toolbar.cpp b/src/univ/toolbar.cpp index 45879f6613..c0eea0ba8b 100644 --- a/src/univ/toolbar.cpp +++ b/src/univ/toolbar.cpp @@ -138,23 +138,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxControl); // wxToolBar creation // ---------------------------------------------------------------------------- -wxToolBar::wxToolBar() -{ - Init(); -} - -wxToolBar::wxToolBar(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - Init(); - - Create(parent, id, pos, size, style, name); -} - void wxToolBar::Init() { // no tools yet diff --git a/src/univ/topluniv.cpp b/src/univ/topluniv.cpp index 834c7e516c..0ac5717db0 100644 --- a/src/univ/topluniv.cpp +++ b/src/univ/topluniv.cpp @@ -59,24 +59,6 @@ WX_FORWARD_TO_INPUT_CONSUMER(wxTopLevelWindow) int wxTopLevelWindow::ms_drawDecorations = -1; int wxTopLevelWindow::ms_canIconize = -1; -wxTopLevelWindow::wxTopLevelWindow() -{ - Init(); -} - -wxTopLevelWindow::wxTopLevelWindow(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - Init(); - - Create(parent, id, title, pos, size, style, name); -} - void wxTopLevelWindow::Init() { m_isActive = FALSE; diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp index ab3d6514b8..4de62140fc 100644 --- a/src/univ/winuniv.cpp +++ b/src/univ/winuniv.cpp @@ -101,22 +101,6 @@ END_EVENT_TABLE() // creation // ---------------------------------------------------------------------------- -wxWindow::wxWindow() -{ - Init(); -} - -wxWindow::wxWindow(wxWindow *parent, - wxWindowID id, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) - : wxWindowNative(parent, id, pos, size, style | wxCLIP_CHILDREN, name) -{ - Init(); -} - void wxWindow::Init() { m_scrollbarVert = -- 2.45.2