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

5
include/wx/bmpbuttn.h
View File

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

12
include/wx/bookctrl.h
View File

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

2
include/wx/button.h
View File

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

2
include/wx/checkbox.h
View File

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

2
include/wx/checklst.h
View File

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

2
include/wx/choice.h
View File

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

2
include/wx/control.h
View File

@@ -35,7 +35,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
class WXDLLEXPORT wxControlBase : public wxWindow
{
public:
wxControlBase();
wxControlBase() { }
virtual ~wxControlBase();

4
include/wx/ctrlsub.h
View File

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

2
include/wx/dialog.h
View File

@@ -25,7 +25,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
class WXDLLEXPORT wxDialogBase : public wxTopLevelWindow
{
public:
wxDialogBase();
wxDialogBase() { Init(); }
virtual ~wxDialogBase() { }
void Init();

2
include/wx/filedlg.h
View File

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

20
include/wx/generic/choicdgg.h
View File

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

9
include/wx/generic/filedlgg.h
View File

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

12
include/wx/generic/listctrl.h
View File

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

13
include/wx/generic/mdig.h
View File

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

8
include/wx/generic/scrolwin.h
View File

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

2
include/wx/listbox.h
View File

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

7
include/wx/listctrl.h
View File

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

18
include/wx/msw/bitmap.h
View File

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

7
include/wx/msw/choice.h
View File

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

7
include/wx/msw/combobox.h
View File

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

2
include/wx/msw/gdiobj.h
View File

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

5
include/wx/msw/listbox.h
View File

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

6
include/wx/msw/radiobox.h
View File

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

9
include/wx/msw/radiobut.h
View File

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

9
include/wx/msw/toplevel.h
View File

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

8
include/wx/msw/window.h
View File

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

2
include/wx/notebook.h
View File

@@ -53,7 +53,7 @@ public:
// ctors
// -----
wxNotebookBase();
wxNotebookBase() { }
wxNotebookBase(wxWindow *parent,
wxWindowID winid,

7
include/wx/scrolwin.h
View File

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

7
include/wx/univ/bmpbuttn.h
View File

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

16
include/wx/univ/button.h
View File

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

9
include/wx/univ/checkbox.h
View File

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

9
include/wx/univ/checklst.h
View File

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

7
include/wx/univ/choice.h
View File

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

22
include/wx/univ/combobox.h
View File

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

9
include/wx/univ/control.h
View File

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

8
include/wx/univ/dialog.h
View File

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

7
include/wx/univ/frame.h
View File

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

2
include/wx/univ/inpcons.h
View File

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

9
include/wx/univ/listbox.h
View File

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

9
include/wx/univ/notebook.h
View File

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

10
include/wx/univ/radiobox.h
View File

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

9
include/wx/univ/radiobut.h
View File

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

9
include/wx/univ/textctrl.h
View File

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

9
include/wx/univ/toolbar.h
View File

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

9
include/wx/univ/toplevel.h
View File

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

6
include/wx/univ/window.h
View File

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

2
include/wx/window.h
View File

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