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

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