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

General fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2000-01-05 14:07:15 +00:00
parent d455cb5f83
commit a5569657a0
2 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/wx/os2/control.h
View File

@@ -12,6 +12,8 @@
#ifndef _WX_CONTROL_H_
#define _WX_CONTROL_H_
WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
// General item class
class WXDLLEXPORT wxControl : public wxControlBase
{
@@ -19,7 +21,27 @@ class WXDLLEXPORT wxControl : public wxControlBase
public:
wxControl();
virtual ~wxControl();
wxControl(wxWindow *parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
#if wxUSE_VALIDATORS
const wxValidator& validator = wxDefaultValidator,
#endif
const wxString& name = wxControlNameStr)
{
Create(parent, id, pos, size, style, validator, name);
}
bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
#if wxUSE_VALIDATORS
const wxValidator& validator = wxDefaultValidator,
#endif
const wxString& name = wxControlNameStr);
virtual ~wxControl();
// Simulates an event
virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }
@@ -67,7 +89,11 @@ protected:
// create the control of the given class with the given style, returns FALSE
// if creation failed
bool OS2CreateControl(const wxChar *classname, WXDWORD style);
bool OS2CreateControl(const wxChar *classname, WXDWORD style,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
const wxString& label = wxEmptyString,
WXDWORD exstyle = (WXDWORD)-1);
// determine the extended styles combination for this window (may slightly
// modify styl parameter)