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

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,