Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions 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

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