wxMotif::wxControl() ctor added, now wxCalendarCtrl compiles ok
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -20,6 +20,8 @@
|
|||||||
#include "wx/list.h"
|
#include "wx/list.h"
|
||||||
#include "wx/validate.h"
|
#include "wx/validate.h"
|
||||||
|
|
||||||
|
#define wxControlNameStr _T("control")
|
||||||
|
|
||||||
// General item class
|
// General item class
|
||||||
class WXDLLEXPORT wxControl: public wxWindow
|
class WXDLLEXPORT wxControl: public wxWindow
|
||||||
{
|
{
|
||||||
@@ -27,6 +29,22 @@ class WXDLLEXPORT wxControl: public wxWindow
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
wxControl();
|
wxControl();
|
||||||
|
wxControl( wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxPoint &pos = wxDefaultPosition,
|
||||||
|
const wxSize &size = wxDefaultSize,
|
||||||
|
long style = 0,
|
||||||
|
const wxString &name = wxControlNameStr );
|
||||||
|
|
||||||
|
#if wxUSE_VALIDATORS
|
||||||
|
wxControl( wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxPoint &pos = wxDefaultPosition,
|
||||||
|
const wxSize &size = wxDefaultSize,
|
||||||
|
long style = 0,
|
||||||
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
|
const wxString &name = wxControlNameStr );
|
||||||
|
#endif
|
||||||
~wxControl();
|
~wxControl();
|
||||||
|
|
||||||
// simulates the event, returns TRUE if the event was processed
|
// simulates the event, returns TRUE if the event was processed
|
||||||
|
@@ -43,6 +43,30 @@ wxControl::wxControl()
|
|||||||
m_inSetValue = FALSE;
|
m_inSetValue = FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wxControl::wxControl( wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxPoint &pos,
|
||||||
|
const wxSize &size,
|
||||||
|
long style,
|
||||||
|
const wxString &name )
|
||||||
|
{
|
||||||
|
(void)Create(parent, id, pos, size, style, name);
|
||||||
|
}
|
||||||
|
|
||||||
|
#if wxUSE_VALIDATORS
|
||||||
|
wxControl::wxControl( wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxPoint &pos,
|
||||||
|
const wxSize &size,
|
||||||
|
long style,
|
||||||
|
const wxValidator& validator,
|
||||||
|
const wxString &name)
|
||||||
|
{
|
||||||
|
(void)Create(parent, id, pos, size, style, name);
|
||||||
|
SetValidator(validator);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
wxControl::~wxControl()
|
wxControl::~wxControl()
|
||||||
{
|
{
|
||||||
// If we delete an item, we should initialize the parent panel,
|
// If we delete an item, we should initialize the parent panel,
|
||||||
|
@@ -1378,9 +1378,9 @@ void wxWindow::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW, in
|
|||||||
|
|
||||||
void wxWindow::DoMoveWindow(int x, int y, int width, int height)
|
void wxWindow::DoMoveWindow(int x, int y, int width, int height)
|
||||||
{
|
{
|
||||||
XtVaSetValues(GetWidget(),
|
XtVaSetValues((Widget)GetTopWidget(),
|
||||||
XmNx, xx,
|
XmNx, x,
|
||||||
XmNy, yy,
|
XmNy, y,
|
||||||
XmNwidth, width,
|
XmNwidth, width,
|
||||||
XmNheight, height,
|
XmNheight, height,
|
||||||
NULL);
|
NULL);
|
||||||
|
Reference in New Issue
Block a user