removed calls to wxWindowBase::InitBase(), it is called from the ctor anyhow (and so was called twice)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-10-30 23:08:39 +00:00
parent 8ccff7d211
commit 727953356d
13 changed files with 3 additions and 52 deletions

View File

@@ -39,7 +39,8 @@
class WXDLLEXPORT wxSpinButtonBase : public wxControl class WXDLLEXPORT wxSpinButtonBase : public wxControl
{ {
public: public:
wxSpinButtonBase() { InitBase(); } // ctor intiializes the range with the default (0..100) values
wxSpinButtonBase() { m_min = 0; m_max = 100; }
// accessors // accessors
virtual int GetValue() const = 0; virtual int GetValue() const = 0;
@@ -60,13 +61,6 @@ public:
bool IsVertical() const { return (m_windowStyle & wxSP_VERTICAL) != 0; } bool IsVertical() const { return (m_windowStyle & wxSP_VERTICAL) != 0; }
protected: protected:
// init the base part of the control
void InitBase()
{
m_min = 0;
m_max = 100;
}
// the range value // the range value
int m_min; int m_min;
int m_max; int m_max;

View File

@@ -109,7 +109,7 @@ END_EVENT_TABLE()
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// the default initialization // the default initialization
void wxWindowBase::InitBase() wxWindowBase::wxWindowBase()
{ {
// no window yet, no parent nor children // no window yet, no parent nor children
m_parent = (wxWindow *)NULL; m_parent = (wxWindow *)NULL;

View File

@@ -2446,9 +2446,6 @@ wxWindow *wxGetActiveWindow()
void wxWindowGTK::Init() void wxWindowGTK::Init()
{ {
// common init
InitBase();
// GTK specific // GTK specific
m_widget = (GtkWidget *) NULL; m_widget = (GtkWidget *) NULL;
m_wxwindow = (GtkWidget *) NULL; m_wxwindow = (GtkWidget *) NULL;

View File

@@ -2446,9 +2446,6 @@ wxWindow *wxGetActiveWindow()
void wxWindowGTK::Init() void wxWindowGTK::Init()
{ {
// common init
InitBase();
// GTK specific // GTK specific
m_widget = (GtkWidget *) NULL; m_widget = (GtkWidget *) NULL;
m_wxwindow = (GtkWidget *) NULL; m_wxwindow = (GtkWidget *) NULL;

View File

@@ -100,10 +100,6 @@ END_EVENT_TABLE()
void wxWindowMac::Init() void wxWindowMac::Init()
{ {
// generic
InitBase();
m_isBeingDeleted = FALSE;
m_backgroundTransparent = FALSE; m_backgroundTransparent = FALSE;
// as all windows are created with WS_VISIBLE style... // as all windows are created with WS_VISIBLE style...
@@ -116,8 +112,6 @@ void wxWindowMac::Init()
m_hScrollBar = NULL ; m_hScrollBar = NULL ;
m_vScrollBar = NULL ; m_vScrollBar = NULL ;
m_label = wxEmptyString;
} }
// Destructor // Destructor

View File

@@ -100,10 +100,6 @@ END_EVENT_TABLE()
void wxWindowMac::Init() void wxWindowMac::Init()
{ {
// generic
InitBase();
m_isBeingDeleted = FALSE;
m_backgroundTransparent = FALSE; m_backgroundTransparent = FALSE;
// as all windows are created with WS_VISIBLE style... // as all windows are created with WS_VISIBLE style...
@@ -116,8 +112,6 @@ void wxWindowMac::Init()
m_hScrollBar = NULL ; m_hScrollBar = NULL ;
m_vScrollBar = NULL ; m_vScrollBar = NULL ;
m_label = wxEmptyString;
} }
// Destructor // Destructor

View File

@@ -546,14 +546,9 @@ void wxWindowMGL::Init()
wxLogFatalError(_("Cannot initialize display.")); wxLogFatalError(_("Cannot initialize display."));
} }
// generic:
InitBase();
// mgl specific: // mgl specific:
m_wnd = NULL; m_wnd = NULL;
m_isShown = TRUE; m_isShown = TRUE;
m_isBeingDeleted = FALSE;
m_isEnabled = TRUE;
m_frozen = FALSE; m_frozen = FALSE;
m_paintMGLDC = NULL; m_paintMGLDC = NULL;
m_eraseBackground = -1; m_eraseBackground = -1;

View File

@@ -52,8 +52,6 @@ wxChoice::wxChoice()
void wxChoice::Init() void wxChoice::Init()
{ {
InitBase();
m_noStrings = 0; m_noStrings = 0;
m_buttonWidget = (WXWidget) 0; m_buttonWidget = (WXWidget) 0;
m_menuWidget = (WXWidget) 0; m_menuWidget = (WXWidget) 0;

View File

@@ -274,8 +274,6 @@ bool wxSpinButton::Create( wxWindow *parent, wxWindowID id,
SetName(name); SetName(name);
InitBase();
m_windowId = ( id == -1 ) ? NewControlId() : id; m_windowId = ( id == -1 ) ? NewControlId() : id;
bool isVert = IsVertical(); bool isVert = IsVertical();

View File

@@ -200,9 +200,6 @@ bool wxWindow::MapOrUnmap(WXWidget widget, bool domap)
void wxWindow::Init() void wxWindow::Init()
{ {
// generic initializations first
InitBase();
// Motif-specific // Motif-specific
m_needsRefresh = TRUE; m_needsRefresh = TRUE;
m_mainWidget = (WXWidget) 0; m_mainWidget = (WXWidget) 0;
@@ -210,7 +207,6 @@ void wxWindow::Init()
m_winCaptured = FALSE; m_winCaptured = FALSE;
m_isShown = TRUE; m_isShown = TRUE;
m_isBeingDeleted = FALSE;
m_hScrollBar = m_hScrollBar =
m_vScrollBar = m_vScrollBar =

View File

@@ -127,8 +127,6 @@ bool wxSpinButton::Create(wxWindow *parent,
const wxString& name) const wxString& name)
{ {
// basic initialization // basic initialization
InitBase();
m_windowId = (id == -1) ? NewControlId() : id; m_windowId = (id == -1) ? NewControlId() : id;
m_backgroundColour = parent->GetBackgroundColour() ; m_backgroundColour = parent->GetBackgroundColour() ;

View File

@@ -294,17 +294,11 @@ bool wxWindowOS2::OS2Command(
void wxWindowOS2::Init() void wxWindowOS2::Init()
{ {
//
// Generic
//
InitBase();
// //
// PM specific // PM specific
// //
m_bWinCaptured = FALSE; m_bWinCaptured = FALSE;
m_isBeingDeleted = FALSE;
m_fnOldWndProc = NULL; m_fnOldWndProc = NULL;
m_bUseCtl3D = FALSE; m_bUseCtl3D = FALSE;
m_bMouseInWindow = FALSE; m_bMouseInWindow = FALSE;

View File

@@ -99,9 +99,6 @@ END_EVENT_TABLE()
void wxWindowX11::Init() void wxWindowX11::Init()
{ {
// generic initializations first
InitBase();
// X11-specific // X11-specific
m_mainWindow = (WXWindow) 0; m_mainWindow = (WXWindow) 0;
m_clientWindow = (WXWindow) 0; m_clientWindow = (WXWindow) 0;
@@ -111,7 +108,6 @@ void wxWindowX11::Init()
m_winCaptured = FALSE; m_winCaptured = FALSE;
m_needsInputFocus = FALSE; m_needsInputFocus = FALSE;
m_isShown = TRUE; m_isShown = TRUE;
m_isBeingDeleted = FALSE;
m_lastTS = 0; m_lastTS = 0;
m_lastButton = 0; m_lastButton = 0;
} }