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

Reverted patch [ 832096 ] Final separation for GUI and console for Open Watcom

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-01-15 13:49:22 +00:00
parent d896a793a0
commit 6463b9f539
119 changed files with 267 additions and 1088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cocoa/bmpbuttn.mm
View File

@@ -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,

4
src/cocoa/button.mm
View File

@@ -21,10 +21,6 @@
#import <AppKit/NSButton.h>
#include "wx/cocoa/string.h"
wxButtonBase::wxButtonBase()
{
}
IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
BEGIN_EVENT_TABLE(wxButton, wxButtonBase)
END_EVENT_TABLE()

17
src/common/bookctrl.cpp
View File

@@ -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;

4
src/common/choiccmn.cpp
View File

@@ -38,10 +38,6 @@
// implementation
// ============================================================================
wxChoiceBase::wxChoiceBase()
{
}
wxChoiceBase::~wxChoiceBase()
{
// this destructor is required for Darwin

4
src/common/ctrlcmn.cpp
View File

@@ -45,10 +45,6 @@
// implementation
// ============================================================================
wxControlBase::wxControlBase()
{
}
wxControlBase::~wxControlBase()
{
// this destructor is required for Darwin

9
src/common/ctrlsub.cpp
View File

@@ -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

5
src/common/dlgcmn.cpp
View File

@@ -53,11 +53,6 @@ END_EVENT_TABLE()
WX_DELEGATE_TO_CONTROL_CONTAINER(wxDialogBase)
#endif
wxDialogBase::wxDialogBase()
{
Init();
}
void wxDialogBase::Init()
{
m_returnCode = 0;

4
src/common/fldlgcmn.cpp
View File

@@ -36,10 +36,6 @@
IMPLEMENT_DYNAMIC_CLASS(wxFileDialogBase, wxDialog)
wxFileDialogBase::wxFileDialogBase ()
{
}
wxFileDialogBase::wxFileDialogBase(wxWindow *parent,
const wxString& message,
const wxString& defaultDir,

4
src/common/lboxcmn.cpp
View File

@@ -40,10 +40,6 @@
// implementation
// ============================================================================
wxListBoxBase::wxListBoxBase()
{
}
wxListBoxBase::~wxListBoxBase()
{
// this destructor is required for Darwin

14
src/common/nbkbase.cpp
View File

@@ -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
// ----------------------------------------------------------------------------

36
src/generic/choicdgg.cpp
View File

@@ -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,

4
src/generic/dirctrlg.cpp
View File

@@ -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()

19
src/generic/filedlgg.cpp
View File

@@ -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

45
src/generic/listctrl.cpp
View File

@@ -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

40
src/generic/mdig.cpp
View File

@@ -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();

2
src/generic/prntdlgg.cpp
View File

@@ -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);
}

33
src/generic/scrlwing.cpp
View File

@@ -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

10
src/gtk/bmpbuttn.cpp
View File

@@ -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 =

4
src/gtk/checkbox.cpp
View File

@@ -62,10 +62,6 @@ static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckB
// wxCheckBox
//-----------------------------------------------------------------------------
wxCheckBoxBase::wxCheckBoxBase()
{
}
IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl)
wxCheckBox::wxCheckBox()

8
src/gtk/checklst.cpp
View File

@@ -24,14 +24,6 @@
#include <gdk/gdk.h>
#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
// wxCheckListBoxBase
//-----------------------------------------------------------------------------
wxCheckListBoxBase::wxCheckListBoxBase()
{
}
//-----------------------------------------------------------------------------
// wxCheckListBox
//-----------------------------------------------------------------------------

10
src/gtk1/bmpbuttn.cpp
View File

@@ -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 =

4
src/gtk1/checkbox.cpp
View File

@@ -62,10 +62,6 @@ static void gtk_checkbox_clicked_callback( GtkWidget *WXUNUSED(widget), wxCheckB
// wxCheckBox
//-----------------------------------------------------------------------------
wxCheckBoxBase::wxCheckBoxBase()
{
}
IMPLEMENT_DYNAMIC_CLASS(wxCheckBox,wxControl)
wxCheckBox::wxCheckBox()

8
src/gtk1/checklst.cpp
View File

@@ -24,14 +24,6 @@
#include <gdk/gdk.h>
#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
// wxCheckListBoxBase
//-----------------------------------------------------------------------------
wxCheckListBoxBase::wxCheckListBoxBase()
{
}
//-----------------------------------------------------------------------------
// wxCheckListBox
//-----------------------------------------------------------------------------

10
src/mac/bmpbuttn.cpp
View File

@@ -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,

4
src/mac/button.cpp
View File

@@ -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,

10
src/mac/carbon/bmpbuttn.cpp
View File

@@ -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,

4
src/mac/carbon/button.cpp
View File

@@ -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,

4
src/mac/carbon/checkbox.cpp
View File

@@ -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,

8
src/mac/carbon/checklst.cpp
View File

@@ -26,14 +26,6 @@
#include "wx/mac/uma.h"
#include "Appearance.h"
// ============================================================================
// implementation of wxCheckListBoxBase
// ============================================================================
wxCheckListBoxBase::wxCheckListBoxBase()
{
}
// ============================================================================
// implementation of wxCheckListBox
// ============================================================================

4
src/mac/checkbox.cpp
View File

@@ -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,

8
src/mac/checklst.cpp
View File

@@ -26,14 +26,6 @@
#include "wx/mac/uma.h"
#include "Appearance.h"
// ============================================================================
// implementation of wxCheckListBoxBase
// ============================================================================
wxCheckListBoxBase::wxCheckListBoxBase()
{
}
// ============================================================================
// implementation of wxCheckListBox
// ============================================================================

10
src/motif/bmpbuttn.cpp
View File

@@ -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;

4
src/motif/checkbox.cpp
View File

@@ -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,

10
src/motif/checklst.cpp
View File

@@ -23,15 +23,7 @@
#include "wx/arrstr.h"
// ============================================================================
// implementation of wxCheckListBoxBase
// ============================================================================
wxCheckListBoxBase::wxCheckListBoxBase()
{
}
// ============================================================================
// implementation of wxCheckListBox
// implementation
// ============================================================================
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)

41
src/msw/bitmap.cpp
View File

@@ -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();

10
src/msw/bmpbuttn.cpp
View File

@@ -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,

4
src/msw/button.cpp
View File

@@ -119,10 +119,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
// creation/destruction
// ----------------------------------------------------------------------------
wxButtonBase::wxButtonBase()
{
}
bool wxButton::Create(wxWindow *parent,
wxWindowID id,
const wxString& label,

4
src/msw/checkbox.cpp
View File

@@ -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);

10
src/msw/checklst.cpp
View File

@@ -64,15 +64,7 @@
#define GetItem(n) ((wxCheckListBoxItem *)(GetItem(n)))
// ============================================================================
// implementation of wxCheckListBoxBase
// ============================================================================
wxCheckListBoxBase::wxCheckListBoxBase()
{
}
// ============================================================================
// implementation of wxCheckListBox
// implementation
// ============================================================================

17
src/msw/choice.cpp
View File

@@ -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,

18
src/msw/combobox.cpp
View File

@@ -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 )

5
src/msw/gdiobj.cpp
View File

@@ -33,11 +33,6 @@
IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
wxGDIObject::wxGDIObject()
{
m_visible = FALSE;
}
/*
void wxGDIObject::IncrementResourceUsage(void)
{

13
src/msw/listbox.cpp
View File

@@ -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,

15
src/msw/listctrl.cpp
View File

@@ -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

16
src/msw/radiobox.cpp
View File

@@ -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,

19
src/msw/radiobut.cpp
View File

@@ -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;

18
src/msw/toplevel.cpp
View File

@@ -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 =

16
src/msw/window.cpp
View File

@@ -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
// ---------------------------------------------------------------------------

10
src/os2/bmpbuttn.cpp
View File

@@ -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

4
src/os2/checkbox.cpp
View File

@@ -41,10 +41,6 @@ extern void wxAssociateWinWithHandle( HWND hWnd
// wxCheckBox
// ----------------------------------------------------------------------------
wxCheckBoxBase::wxCheckBoxBase()
{
}
bool wxCheckBox::OS2Command(
WXUINT WXUNUSED(uParam)
, WXWORD WXUNUSED(wId)

10
src/os2/checklst.cpp
View File

@@ -42,15 +42,7 @@
#define GetItem(n) ((wxCheckListBoxItem *)(GetItem(n)))
// ============================================================================
// implementation of wxCheckListBoxBase
// ============================================================================
wxCheckListBoxBase::wxCheckListBoxBase()
{
}
// ============================================================================
// implementation of wxCheckListBox
// implementation
// ============================================================================
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)

15
src/os2/listctrl.cpp
View File

@@ -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

26
src/univ/bmpbuttn.cpp
View File

@@ -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,

38
src/univ/button.cpp
View File

@@ -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 =

23
src/univ/checkbox.cpp
View File

@@ -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;

28
src/univ/checklst.cpp
View File

@@ -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()
{
}

17
src/univ/choice.cpp
View File

@@ -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,

41
src/univ/combobox.cpp
View File

@@ -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;

18
src/univ/control.cpp
View File

@@ -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;

17
src/univ/dialog.cpp
View File

@@ -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;

15
src/univ/framuniv.cpp
View File

@@ -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,

5
src/univ/inpcons.cpp
View File

@@ -35,11 +35,6 @@
// implementation
// ============================================================================
wxInputConsumer::wxInputConsumer()
{
m_inputHandler = NULL;
}
// ----------------------------------------------------------------------------
// focus/activation handling
// ----------------------------------------------------------------------------

20
src/univ/listbox.cpp
View File

@@ -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

17
src/univ/notebook.cpp
View File

@@ -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;

22
src/univ/radiobox.cpp
View File

@@ -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;

19
src/univ/radiobut.cpp
View File

@@ -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,

19
src/univ/textctrl.cpp
View File

@@ -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 =

17
src/univ/toolbar.cpp
View File

@@ -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

18
src/univ/topluniv.cpp
View File

@@ -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;

16
src/univ/winuniv.cpp
View File

@@ -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 =