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

diff --git a/include/wx/motif/control.h b/include/wx/motif/control.h
index d96d569a46dc26982f736da61354796a8e99ff64..9662c06ad157b89c5038bccb2d085b7948631788 100644 (file)
--- a/include/wx/motif/control.h
+++ b/include/wx/motif/control.h
@@ -20,6 +20,8 @@
 #include "wx/list.h"
 #include "wx/validate.h"
 
 #include "wx/list.h"
 #include "wx/validate.h"
 

+#define wxControlNameStr _T("control")
+

 // General item class
 class WXDLLEXPORT wxControl: public wxWindow
 {
 // General item class
 class WXDLLEXPORT wxControl: public wxWindow
 {


@@ -27,6 +29,22 @@ class WXDLLEXPORT wxControl: public wxWindow
 
 public:
     wxControl();
 
 public:
     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();
 
     // simulates the event, returns TRUE if the event was processed
     ~wxControl();
 
     // simulates the event, returns TRUE if the event was processed

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 423c53e5804742cba120ccd3c55956570f3a8ee9..94f43a746bb0e7f74f4752b2594de2636a54f243 100644 (file)
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -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()
 {
     // If we delete an item, we should initialize the parent panel,
 wxControl::~wxControl()
 {
     // If we delete an item, we should initialize the parent panel,

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 8595126325a069b23ee78bed0ea9312baa1da0e2..204e0a0bff862a70bb2f2f4c632937559954bf08 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -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(),
-                  XmNx, xx,
-                  XmNy, yy,
+    XtVaSetValues((Widget)GetTopWidget(),
+                  XmNx, x,
+                  XmNy, y,

                   XmNwidth, width,
                   XmNheight, height,
                   NULL);
                   XmNwidth, width,
                   XmNheight, height,
                   NULL);