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

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

Browse Source 
(Watcom compiler doesn't like ctor implementation in headers)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-01-11 15:33:01 +00:00
parent 3ef37e7f4e
commit 1169a91932
115 changed files with 1086 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/bmpbuttn.h
View File

@@ -29,10 +29,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
class WXDLLEXPORT wxBitmapButtonBase : public wxButton
{
public:
wxBitmapButtonBase()
: m_bmpNormal(), m_bmpSelected(), m_bmpFocus(), m_bmpDisabled()
, m_marginX(0), m_marginY(0)
{ }
wxBitmapButtonBase();
// set the bitmaps
void SetBitmapLabel(const wxBitmap& bitmap)

12
include/wx/bookctrl.h
View File

@@ -41,22 +41,14 @@ public:
// construction
// ------------
wxBookCtrl()
{
Init();
}
wxBookCtrl();
wxBookCtrl(wxWindow *parent,
wxWindowID winid,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& name = wxEmptyString)
{
Init();
(void)Create(parent, winid, pos, size, style, name);
}
const wxString& name = wxEmptyString);
// 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() { m_clientDataItemsType = wxClientData_None; }
wxItemContainer();
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() { Init(); }
wxDialogBase();
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,11 +46,7 @@ public:
int n, const wxString *choices,
long styleDlg = wxCHOICEDLG_STYLE,
const wxPoint& pos = wxDefaultPosition,
long styleLbox = wxLB_ALWAYS_SB)
{
(void)Create(parent, message, caption, n, choices,
styleDlg, pos, styleLbox);
}
long styleLbox = wxLB_ALWAYS_SB);
bool Create(wxWindow *parent,
const wxString& message,
@@ -73,10 +69,7 @@ protected:
class WXDLLEXPORT wxSingleChoiceDialog : public wxAnyChoiceDialog
{
public:
wxSingleChoiceDialog()
{
m_selection = -1;
}
wxSingleChoiceDialog();
wxSingleChoiceDialog(wxWindow *parent,
const wxString& message,
@@ -123,7 +116,7 @@ private:
class WXDLLEXPORT wxMultiChoiceDialog : public wxAnyChoiceDialog
{
public:
wxMultiChoiceDialog() { }
wxMultiChoiceDialog();
wxMultiChoiceDialog(wxWindow *parent,
const wxString& message,
@@ -131,10 +124,7 @@ public:
int n,
const wxString *choices,
long style = wxCHOICEDLG_STYLE,
const wxPoint& pos = wxDefaultPosition)
{
(void)Create(parent, message, caption, n, choices, style, pos);
}
const wxPoint& pos = wxDefaultPosition);
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,10 +123,7 @@ public:
const wxString& defaultFile = _T(""),
const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
long style = 0,
const wxPoint& pos = wxDefaultPosition)
:wxGenericFileDialog(parent, message, defaultDir, defaultFile, wildCard, style, pos)
{
}
const wxPoint& pos = wxDefaultPosition);
};
#endif // USE_GENERIC_FILEDIALOG

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

@@ -72,10 +72,7 @@ public:
const wxSize &size = wxDefaultSize,
long style = wxLC_ICON,
const wxValidator& validator = wxDefaultValidator,
const wxString &name = wxT("listctrl") )
{
Create(parent, winid, pos, size, style, validator, name);
}
const wxString &name = wxT("listctrl") );
~wxGenericListCtrl();
bool Create( wxWindow *parent,
@@ -251,17 +248,14 @@ 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") )
: wxGenericListCtrl(parent, winid, pos, size, style, validator, name)
{
}
const wxString &name = wxT("listctrl") );
};
#endif // !__WXMSW__ || __WIN16__ || __WXUNIVERSAL__

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

@@ -274,17 +274,14 @@ class wxMDIChildFrame ;
class WXDLLEXPORT wxMDIParentFrame: public wxGenericMDIParentFrame
{
public:
wxMDIParentFrame() {}
wxMDIParentFrame();
wxMDIParentFrame(wxWindow *parent,
wxWindowID winid,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
const wxString& name = wxFrameNameStr)
:wxGenericMDIParentFrame(parent, winid, title, pos, size, style, name)
{
}
const wxString& name = wxFrameNameStr) ;
wxMDIChildFrame * GetActiveChild() const ;
@@ -300,19 +297,14 @@ private:
class WXDLLEXPORT wxMDIChildFrame: public wxGenericMDIChildFrame
{
public:
wxMDIChildFrame() {}
wxMDIChildFrame();
wxMDIChildFrame( wxGenericMDIParentFrame *parent,
wxWindowID winid,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr )
:wxGenericMDIChildFrame(parent, winid, title, pos, size, style, name)
{
}
const wxString& name = wxFrameNameStr ) ;
private:
DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
};
@@ -324,12 +316,8 @@ private:
class WXDLLEXPORT wxMDIClientWindow: public wxGenericMDIClientWindow
{
public:
wxMDIClientWindow() {}
wxMDIClientWindow( wxGenericMDIParentFrame *parent, long style = 0 )
:wxGenericMDIClientWindow(parent, style)
{
}
wxMDIClientWindow();
wxMDIClientWindow( wxGenericMDIParentFrame *parent, long style = 0 );
private:
DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)

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

@@ -43,17 +43,13 @@ class WXDLLEXPORT wxGenericScrolledWindow : public wxPanel,
public wxScrollHelper
{
public:
wxGenericScrolledWindow() : wxScrollHelper(this) { }
wxGenericScrolledWindow();
wxGenericScrolledWindow(wxWindow *parent,
wxWindowID winid = -1,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxScrolledWindowStyle,
const wxString& name = wxPanelNameStr)
: wxScrollHelper(this)
{
Create(parent, winid, pos, size, style, name);
}
const wxString& name = wxPanelNameStr);
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,17 +37,14 @@
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") )
{
Create(parent, winid, pos, size, style, validator, name);
}
const wxString &name = wxT("listctrl") );
// 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() { Init(); }
wxBitmap();
// Copy constructors
wxBitmap(const wxBitmap& bitmap) { Init(); Ref(bitmap); }
wxBitmap(const wxBitmap& bitmap);
// Initialize with raw data
wxBitmap(const char bits[], int width, int height, int depth = 1);
// Initialize with XPM data
wxBitmap(const char **data) { CreateFromXpm(data); }
wxBitmap(char **data) { CreateFromXpm((const char **)data); }
wxBitmap(const char **data);
wxBitmap(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)
{ (void)CreateFromImage(image, depth); }
wxBitmap(const wxImage& image, int depth = -1);
// Create a DDB compatible with the given DC from wxImage
wxBitmap(const wxImage& image, const wxDC& dc)
{ (void)CreateFromImage(image, dc); }
wxBitmap(const wxImage& image, const wxDC& 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) { Init(); CopyFromIcon(icon); }
wxBitmap(const wxIcon& 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,10 +34,7 @@ public:
int n = 0, const wxString choices[] = NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr)
{
Create(parent, id, pos, size, n, choices, style, validator, name);
}
const wxString& name = wxChoiceNameStr);
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,10 +36,7 @@ public:
int n = 0, const wxString choices[] = NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr)
{
Create(parent, id, value, pos, size, n, choices, style, validator, name);
}
const wxString& name = wxComboBoxNameStr);
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() { m_visible = FALSE; };
wxGDIObject();
// Creates the resource
virtual bool RealizeResource() { return FALSE; };

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

@@ -49,10 +49,7 @@ public:
int n = 0, const wxString choices[] = NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr)
{
Create(parent, id, pos, size, n, choices, style, validator, name);
}
const wxString& name = wxListBoxNameStr);
bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,

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

@@ -36,11 +36,7 @@ public:
int majorDim = 0,
long style = wxRA_HORIZONTAL,
const wxValidator& val = wxDefaultValidator,
const wxString& name = wxRadioBoxNameStr)
{
(void)Create(parent, id, title, pos, size, n, choices, majorDim,
style, val, name);
}
const wxString& name = wxRadioBoxNameStr);
~wxRadioBox();

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

@@ -20,7 +20,7 @@ class WXDLLEXPORT wxRadioButton: public wxControl
{
public:
// ctors and creation functions
wxRadioButton() { Init(); }
wxRadioButton();
wxRadioButton(wxWindow *parent,
wxWindowID id,
@@ -29,12 +29,7 @@ public:
const wxSize& size = wxDefaultSize,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxRadioButtonNameStr)
{
Init();
Create(parent, id, label, pos, size, style, validator, name);
}
const wxString& name = wxRadioButtonNameStr);
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() { Init(); }
wxTopLevelWindowMSW();
wxTopLevelWindowMSW(wxWindow *parent,
wxWindowID id,
@@ -32,12 +32,7 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr)
{
Init();
(void)Create(parent, id, title, pos, size, style, name);
}
const wxString& name = wxFrameNameStr);
bool Create(wxWindow *parent,
wxWindowID id,

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

@@ -53,18 +53,14 @@ enum
class WXDLLEXPORT wxWindowMSW : public wxWindowBase
{
public:
wxWindowMSW() { Init(); }
wxWindowMSW();
wxWindowMSW(wxWindow *parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& name = wxPanelNameStr)
{
Init();
Create(parent, id, pos, size, style, name);
}
const wxString& name = wxPanelNameStr);
virtual ~wxWindowMSW();

8
include/wx/notebook.h
View File

@@ -53,18 +53,14 @@ public:
// ctors
// -----
wxNotebookBase() { }
wxNotebookBase();
wxNotebookBase(wxWindow *parent,
wxWindowID winid,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& name = wxNOTEBOOK_NAME)
: wxBookCtrl(parent, winid, pos, size, style, name)
{
}
const wxString& name = wxNOTEBOOK_NAME) ;
// wxNotebook-specific additions to wxBookCtrl interface
// -----------------------------------------------------

7
include/wx/scrolwin.h
View File

@@ -217,16 +217,13 @@ 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)
: wxGenericScrolledWindow(parent, winid, pos, size, style, name)
{
}
const wxString& name = wxPanelNameStr);
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,10 +28,7 @@ public:
const wxSize& size = wxDefaultSize,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr)
{
Create(parent, id, bitmap, pos, size, style, validator, name);
}
const wxString& name = wxButtonNameStr);
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() { Init(); }
wxButton();
wxButton(wxWindow *parent,
wxWindowID id,
const wxBitmap& bitmap,
@@ -45,12 +45,7 @@ public:
const wxSize& size = wxDefaultSize,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr)
{
Init();
Create(parent, id, bitmap, label, pos, size, style, validator, name);
}
const wxString& name = wxButtonNameStr);
wxButton(wxWindow *parent,
wxWindowID id,
@@ -59,12 +54,7 @@ public:
const wxSize& size = wxDefaultSize,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr)
{
Init();
Create(parent, id, label, pos, size, style, validator, name);
}
const wxString& name = wxButtonNameStr);
bool Create(wxWindow *parent,
wxWindowID id,

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

@@ -59,7 +59,7 @@ public:
};
// constructors
wxCheckBox() { Init(); }
wxCheckBox();
wxCheckBox(wxWindow *parent,
wxWindowID id,
@@ -68,12 +68,7 @@ public:
const wxSize& size = wxDefaultSize,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxCheckBoxNameStr)
{
Init();
Create(parent, id, label, pos, size, style, validator, name);
}
const wxString& name = wxCheckBoxNameStr);
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() { Init(); }
wxCheckListBox();
wxCheckListBox(wxWindow *parent,
wxWindowID id,
@@ -40,12 +40,7 @@ public:
const wxString *choices = NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr)
{
Init();
Create(parent, id, pos, size, nStrings, choices, style, validator, name);
}
const wxString& name = wxListBoxNameStr);
bool Create(wxWindow *parent,
wxWindowID id,

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

@@ -23,17 +23,14 @@
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)
{
Create(parent, id, pos, size, n, choices, style, validator, name);
}
const wxString& name = wxChoiceNameStr);
bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,

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

@@ -99,10 +99,7 @@ class WXDLLEXPORT wxComboControl : public wxControl
{
public:
// construction
wxComboControl()
{
Init();
}
wxComboControl();
wxComboControl(wxWindow *parent,
wxWindowID id,
@@ -111,12 +108,7 @@ public:
const wxSize& size = wxDefaultSize,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr)
{
Init();
(void)Create(parent, id, value, pos, size, style, validator, name);
}
const wxString& name = wxComboBoxNameStr);
bool Create(wxWindow *parent,
wxWindowID id,
@@ -213,7 +205,7 @@ class WXDLLEXPORT wxComboBox : public wxComboControl, public wxComboBoxBase
{
public:
// ctors and such
wxComboBox() { Init(); }
wxComboBox();
wxComboBox(wxWindow *parent,
wxWindowID id,
@@ -224,13 +216,7 @@ public:
const wxString *choices = (const wxString *) NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr)
{
Init();
(void)Create(parent, id, value, pos, size, n, choices,
style, validator, name);
}
const wxString& name = wxComboBoxNameStr);
bool Create(wxWindow *parent,
wxWindowID id,

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

@@ -45,19 +45,14 @@ typedef wxString wxControlAction;
class WXDLLEXPORT wxControl : public wxControlBase, public wxInputConsumer
{
public:
wxControl() { Init(); }
wxControl();
wxControl(wxWindow *parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxControlNameStr)
{
Init();
Create(parent, id, pos, size, style, validator, name);
}
const wxString& name = wxControlNameStr);
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() { Init(); }
wxDialog();
// Constructor with no modal flag - the new convention.
wxDialog(wxWindow *parent, wxWindowID id,
@@ -31,11 +31,7 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr)
{
Init();
Create(parent, id, title, pos, size, style, name);
}
const wxString& name = wxDialogNameStr);
bool Create(wxWindow *parent, wxWindowID id,
const wxString& title,

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

@@ -23,17 +23,14 @@
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)
{
Create(parent, id, title, pos, size, style, name);
}
const wxString& name = wxFrameNameStr);
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() { m_inputHandler = NULL; }
wxInputConsumer();
// 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() { Init(); }
wxListBox();
wxListBox(wxWindow *parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
@@ -64,12 +64,7 @@ public:
int n = 0, const wxString choices[] = (const wxString *) NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr )
{
Init();
Create(parent, id, pos, size, n, choices, style, validator, name);
}
const wxString& name = wxListBoxNameStr );
virtual ~wxListBox();

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

@@ -39,19 +39,14 @@ public:
// ctors and such
// --------------
wxNotebook() { Init(); }
wxNotebook();
wxNotebook(wxWindow *parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& name = wxNOTEBOOK_NAME)
{
Init();
(void)Create(parent, id, pos, size, style, name);
}
const wxString& name = wxNOTEBOOK_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() { Init(); }
wxRadioBox();
wxRadioBox(wxWindow *parent,
wxWindowID id,
@@ -43,13 +43,7 @@ public:
int majorDim = 0,
long style = wxRA_SPECIFY_COLS,
const wxValidator& val = wxDefaultValidator,
const wxString& name = wxRadioBoxNameStr)
{
Init();
(void)Create(parent, id, title, pos, size, n, choices,
majorDim, style, val, name);
}
const wxString& name = wxRadioBoxNameStr);
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() { Init(); }
wxRadioButton();
wxRadioButton(wxWindow *parent,
wxWindowID id,
@@ -35,12 +35,7 @@ public:
const wxSize& size = wxDefaultSize,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxRadioButtonNameStr)
{
Init();
Create(parent, id, label, pos, size, style, validator, name);
}
const wxString& name = wxRadioButtonNameStr);
bool Create(wxWindow *parent,
wxWindowID id,

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

@@ -101,7 +101,7 @@ public:
// creation
// --------
wxTextCtrl() { Init(); }
wxTextCtrl();
wxTextCtrl(wxWindow *parent,
wxWindowID id,
@@ -110,12 +110,7 @@ public:
const wxSize& size = wxDefaultSize,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxTextCtrlNameStr)
{
Init();
Create(parent, id, value, pos, size, style, validator, name);
}
const wxString& name = wxTextCtrlNameStr);
bool Create(wxWindow *parent,
wxWindowID id,

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

@@ -39,18 +39,13 @@ class WXDLLEXPORT wxToolBar : public wxToolBarBase
{
public:
// construction/destruction
wxToolBar() { Init(); }
wxToolBar();
wxToolBar(wxWindow *parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& name = wxToolBarNameStr)
{
Init();
Create(parent, id, pos, size, style, name);
}
const wxString& name = wxToolBarNameStr);
bool Create( wxWindow *parent,
wxWindowID id,

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

@@ -97,19 +97,14 @@ class WXDLLEXPORT wxTopLevelWindow : public wxTopLevelWindowNative,
{
public:
// construction
wxTopLevelWindow() { Init(); }
wxTopLevelWindow();
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)
{
Init();
Create(parent, id, title, pos, size, style, name);
}
const wxString& name = wxFrameNameStr);
bool Create(wxWindow *parent,
wxWindowID id,

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

@@ -55,16 +55,14 @@ public:
// ctors and create functions
// ---------------------------
wxWindow() { Init(); }
wxWindow();
wxWindow(wxWindow *parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& name = wxPanelNameStr)
: wxWindowNative(parent, id, pos, size, style | wxCLIP_CHILDREN, name)
{ Init(); }
const wxString& name = wxPanelNameStr);
bool Create(wxWindow *parent,
wxWindowID id,

10
src/cocoa/bmpbuttn.mm
View File

@@ -26,6 +26,16 @@ 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,

17
src/common/bookctrl.cpp
View File

@@ -42,6 +42,23 @@
// 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,6 +38,10 @@
// implementation
// ============================================================================
wxChoiceBase::wxChoiceBase()
{
}
wxChoiceBase::~wxChoiceBase()
{
// this destructor is required for Darwin

4
src/common/ctrlcmn.cpp
View File

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

9
src/common/ctrlsub.cpp
View File

@@ -39,6 +39,11 @@
// implementation
// ============================================================================
wxItemContainer::wxItemContainer()
{
m_clientDataItemsType = wxClientData_None;
}
wxItemContainer::~wxItemContainer()
{
// this destructor is required for Darwin
@@ -151,6 +156,10 @@ 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,6 +53,11 @@ 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,6 +36,10 @@
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,6 +40,10 @@
// implementation
// ============================================================================
wxListBoxBase::wxListBoxBase()
{
}
wxListBoxBase::~wxListBoxBase()
{
// this destructor is required for Darwin

14
src/common/nbkbase.cpp
View File

@@ -39,6 +39,20 @@
// 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,6 +238,22 @@ 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,
@@ -296,6 +312,11 @@ END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxSingleChoiceDialog, wxDialog)
wxSingleChoiceDialog::wxSingleChoiceDialog()
{
m_selection = -1;
}
wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
const wxString& message,
const wxString& caption,
@@ -366,6 +387,21 @@ 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,7 +1146,11 @@ 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,6 +835,10 @@ 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,
@@ -1364,6 +1368,21 @@ 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,6 +4533,17 @@ 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)
@@ -5382,5 +5393,39 @@ 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,6 +797,46 @@ 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,6 +261,7 @@ 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);
@@ -274,6 +275,7 @@ 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,6 +1202,21 @@ 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,
@@ -1277,6 +1292,24 @@ 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,6 +112,16 @@ 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,6 +62,10 @@ 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,6 +24,14 @@
#include <gdk/gdk.h>
#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
// wxCheckListBoxBase
//-----------------------------------------------------------------------------
wxCheckListBoxBase::wxCheckListBoxBase()
{
}
//-----------------------------------------------------------------------------
// wxCheckListBox
//-----------------------------------------------------------------------------

10
src/gtk1/bmpbuttn.cpp
View File

@@ -112,6 +112,16 @@ 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,6 +62,10 @@ 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,6 +24,14 @@
#include <gdk/gdk.h>
#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
// wxCheckListBoxBase
//-----------------------------------------------------------------------------
wxCheckListBoxBase::wxCheckListBoxBase()
{
}
//-----------------------------------------------------------------------------
// wxCheckListBox
//-----------------------------------------------------------------------------

10
src/mac/bmpbuttn.cpp
View File

@@ -23,6 +23,16 @@ 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,6 +28,10 @@ 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,6 +23,16 @@ 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,6 +28,10 @@ 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,6 +24,10 @@ 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,6 +26,14 @@
#include "wx/mac/uma.h"
#include "Appearance.h"
// ============================================================================
// implementation of wxCheckListBoxBase
// ============================================================================
wxCheckListBoxBase::wxCheckListBoxBase()
{
}
// ============================================================================
// implementation of wxCheckListBox
// ============================================================================

4
src/mac/checkbox.cpp
View File

@@ -24,6 +24,10 @@ 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,6 +26,14 @@
#include "wx/mac/uma.h"
#include "Appearance.h"
// ============================================================================
// implementation of wxCheckListBoxBase
// ============================================================================
wxCheckListBoxBase::wxCheckListBoxBase()
{
}
// ============================================================================
// implementation of wxCheckListBox
// ============================================================================

10
src/motif/bmpbuttn.cpp
View File

@@ -39,6 +39,16 @@ 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,6 +41,10 @@ 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,7 +23,15 @@
#include "wx/arrstr.h"
// ============================================================================
// implementation
// implementation of wxCheckListBoxBase
// ============================================================================
wxCheckListBoxBase::wxCheckListBoxBase()
{
}
// ============================================================================
// implementation of wxCheckListBox
// ============================================================================
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)

41
src/msw/bitmap.cpp
View File

@@ -362,6 +362,47 @@ 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,6 +100,16 @@ 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,6 +119,10 @@ 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,6 +112,10 @@ 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,7 +64,15 @@
#define GetItem(n) ((wxCheckListBoxItem *)(GetItem(n)))
// ============================================================================
// implementation
// implementation of wxCheckListBoxBase
// ============================================================================
wxCheckListBoxBase::wxCheckListBoxBase()
{
}
// ============================================================================
// implementation of wxCheckListBox
// ============================================================================

17
src/msw/choice.cpp
View File

@@ -106,6 +106,23 @@ 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,6 +237,24 @@ 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,6 +33,11 @@
IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
wxGDIObject::wxGDIObject()
{
m_visible = FALSE;
}
/*
void wxGDIObject::IncrementResourceUsage(void)
{

13
src/msw/listbox.cpp
View File

@@ -155,6 +155,19 @@ 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,5 +2778,20 @@ 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,6 +251,22 @@ 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,6 +102,25 @@ 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,6 +134,24 @@ 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,6 +380,22 @@ 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,6 +25,16 @@ 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,6 +41,10 @@ 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,7 +42,15 @@
#define GetItem(n) ((wxCheckListBoxItem *)(GetItem(n)))
// ============================================================================
// implementation
// implementation of wxCheckListBoxBase
// ============================================================================
wxCheckListBoxBase::wxCheckListBoxBase()
{
}
// ============================================================================
// implementation of wxCheckListBox
// ============================================================================
IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)

15
src/os2/listctrl.cpp
View File

@@ -2896,4 +2896,19 @@ 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,6 +52,32 @@ 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,6 +60,44 @@ 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,6 +52,29 @@ 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;

Some files were not shown because too many files have changed in this diff Show More