fix for bug 1371386, with some minor mods and cleanup

[wxWidgets.git] / src / palmos / control.cpp

diff --git a/src/palmos/control.cpp b/src/palmos/control.cpp
index 0d68b270555a3a6bb20718bc9c0b236b00d00597..4cda57075f4fb553bf2a1ae2cff244802bc9c509 100644 (file)
--- a/src/palmos/control.cpp
+++ b/src/palmos/control.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "control.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -46,6 +42,10 @@
 #include "wx/radiobut.h"
 #include "wx/slider.h"
 
 #include "wx/radiobut.h"
 #include "wx/slider.h"
 

+#include <Control.h>
+#include <Form.h>
+#include <StatusBar.h>
+

 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------


@@ -78,7 +78,7 @@ wxControl::~wxControl()
     DestroyChildren();
 
     uint16_t index;
     DestroyChildren();
 
     uint16_t index;

-    FormType* form = GetObjectFormIndex(index);
+    FormType* form = (FormType*)GetObjectFormIndex(index);

     if(form!=NULL && index!=frmInvalidObjectId)
     {
         FrmRemoveObject((FormType **)&form,index);
     if(form!=NULL && index!=frmInvalidObjectId)
     {
         FrmRemoveObject((FormType **)&form,index);


@@ -107,25 +107,40 @@ bool wxControl::Create(wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

-bool wxControl::PalmCreateControl(ControlStyleType style,
+bool wxControl::PalmCreateControl(int style,

                                   const wxString& label,
                                   const wxPoint& pos,
                                   const wxSize& size,
                                   uint8_t groupID)
 {
                                   const wxString& label,
                                   const wxPoint& pos,
                                   const wxSize& size,
                                   uint8_t groupID)
 {

-    FormType* form = GetParentForm();
+    FormType* form = (FormType*)GetParentForm();

     if(form==NULL)
         return false;
 
     if(form==NULL)
         return false;
 

+
+    wxCoord x = pos.x == wxDefaultCoord ? 0 : pos.x,
+            y = pos.y == wxDefaultCoord ? 0 : pos.y,
+            w = size.x == wxDefaultCoord ? 1 : size.x,
+            h = size.y == wxDefaultCoord ? 1 : size.y;
+
+    wxWindow *win = this;
+    while(win->GetParent())
+    {
+        win = win->GetParent();
+        wxPoint pt(win->GetClientAreaOrigin());
+        x += pt.x;
+        y += pt.y;
+    }
+

     ControlType *control = CtlNewControl(
                                (void **)&form,
                                GetId(),
     ControlType *control = CtlNewControl(
                                (void **)&form,
                                GetId(),

-                               style,
+                               (ControlStyleType)style,

                                wxEmptyString,
                                wxEmptyString,

-                               ( pos.x == wxDefaultCoord ) ? winUndefConstraint : pos.x,
-                               ( pos.y == wxDefaultCoord ) ? winUndefConstraint : pos.y,
-                               ( size.x == wxDefaultCoord ) ? winUndefConstraint : size.x,
-                               ( size.y == wxDefaultCoord ) ? winUndefConstraint : size.y,
+                               x,
+                               y,
+                               w,
+                               h,

                                stdFont,
                                groupID,
                                true
                                stdFont,
                                groupID,
                                true


@@ -136,6 +151,7 @@ bool wxControl::PalmCreateControl(ControlStyleType style,
 
     m_palmControl = true;
 
 
     m_palmControl = true;
 

+    SetInitialBestSize(size);

     SetLabel(label);
     Show();
     return true;
     SetLabel(label);
     Show();
     return true;


@@ -146,28 +162,35 @@ bool wxControl::PalmCreateField(const wxString& label,
                                 const wxSize& size,
                                 bool editable,
                                 bool underlined,
                                 const wxSize& size,
                                 bool editable,
                                 bool underlined,

-                                JustificationType justification)
+                                int justification)

 {
 {

-    FormType* form = GetParentForm();
+    FormType* form = (FormType*)GetParentForm();

     if(form==NULL)
         return false;
 
     m_label = label;
 
     if(form==NULL)
         return false;
 
     m_label = label;
 

+    wxCoord x = pos.x == wxDefaultCoord ? 0 : pos.x,
+            y = pos.y == wxDefaultCoord ? 0 : pos.y,
+            w = size.x == wxDefaultCoord ? 1 : size.x,
+            h = size.y == wxDefaultCoord ? 1 : size.y;
+
+    AdjustForParentClientOrigin(x, y);
+

     FieldType *field = FldNewField(
                            (void **)&form,
                            GetId(),
     FieldType *field = FldNewField(
                            (void **)&form,
                            GetId(),

-                           ( pos.x == wxDefaultCoord ) ? winUndefConstraint : pos.x,
-                           ( pos.y == wxDefaultCoord ) ? winUndefConstraint : pos.y,
-                           ( size.x == wxDefaultCoord ) ? winUndefConstraint : size.x,
-                           ( size.y == wxDefaultCoord ) ? winUndefConstraint : size.y,
+                           x,
+                           y,
+                           w,
+                           h,

                            stdFont,
                            10,
                            editable,
                            underlined,
                            false,
                            false,
                            stdFont,
                            10,
                            editable,
                            underlined,
                            false,
                            false,

-                           justification,
+                           (JustificationType)justification,

                            false,
                            false,
                            false
                            false,
                            false,
                            false


@@ -178,8 +201,9 @@ bool wxControl::PalmCreateField(const wxString& label,
 
     m_palmField = true;
 
 
     m_palmField = true;
 

-    Show();
+    SetInitialBestSize(size);

     SetLabel(label);
     SetLabel(label);

+    Show();

     return true;
 }
 
     return true;
 }
 


@@ -187,7 +211,7 @@ bool wxControl::PalmCreateField(const wxString& label,
 // various accessors
 // ----------------------------------------------------------------------------
 
 // various accessors
 // ----------------------------------------------------------------------------
 

-FormType* wxControl::GetParentForm() const
+WXFORMPTR wxControl::GetParentForm() const

 {
     wxWindow* parentTLW = GetParent();
     while ( parentTLW && !parentTLW->IsTopLevel() )
 {
     wxWindow* parentTLW = GetParent();
     while ( parentTLW && !parentTLW->IsTopLevel() )


@@ -200,9 +224,9 @@ FormType* wxControl::GetParentForm() const
     return tlw->GetForm();
 }
 
     return tlw->GetForm();
 }
 

-FormType* wxControl::GetObjectFormIndex(uint16_t& index) const
+WXFORMPTR wxControl::GetObjectFormIndex(uint16_t& index) const

 {
 {

-    FormType* form = GetParentForm();
+    FormType* form = (FormType* )GetParentForm();

     if(form!=NULL)
         index = FrmGetObjectIndex(form, GetId());
     else
     if(form!=NULL)
         index = FrmGetObjectIndex(form, GetId());
     else


@@ -213,7 +237,7 @@ FormType* wxControl::GetObjectFormIndex(uint16_t& index) const
 void* wxControl::GetObjectPtr() const
 {
     uint16_t index;
 void* wxControl::GetObjectPtr() const
 {
     uint16_t index;

-    FormType* form = GetObjectFormIndex(index);
+    FormType* form = (FormType*)GetObjectFormIndex(index);

     if(form==NULL || index==frmInvalidObjectId)return NULL;
     return FrmGetObjectPtr(form,index);
 }
     if(form==NULL || index==frmInvalidObjectId)return NULL;
     return FrmGetObjectPtr(form,index);
 }


@@ -228,7 +252,7 @@ wxBorder wxControl::GetDefaultBorder() const
 
 void wxControl::SetIntValue(int val)
 {
 
 void wxControl::SetIntValue(int val)
 {

-    FormType* form = GetParentForm();
+    FormType* form = (FormType*)GetParentForm();

     if(form==NULL)
         return;
     uint16_t index = FrmGetObjectIndex(form, GetId());
     if(form==NULL)
         return;
     uint16_t index = FrmGetObjectIndex(form, GetId());


@@ -244,7 +268,7 @@ void wxControl::SetBoolValue(bool val)
 
 bool wxControl::GetBoolValue() const
 {
 
 bool wxControl::GetBoolValue() const
 {

-    FormType* form = GetParentForm();
+    FormType* form = (FormType*)GetParentForm();

     if(form==NULL)
         return false;
     uint16_t index = FrmGetObjectIndex(form, GetId());
     if(form==NULL)
         return false;
     uint16_t index = FrmGetObjectIndex(form, GetId());


@@ -258,41 +282,73 @@ wxSize wxControl::DoGetBestSize() const
     return wxSize(16, 16);
 }
 
     return wxSize(16, 16);
 }
 

-void wxControl::DoGetBounds( RectangleType &rect ) const
+void wxControl::DoGetBounds( WXRECTANGLEPTR rect ) const

 {
 {

-    FormType* form = GetParentForm();
+    if(rect==NULL)
+        return;
+    FormType* form = (FormType*)GetParentForm();

     if(form==NULL)
         return;
     uint16_t index = FrmGetObjectIndex(form,GetId());
     if(index==frmInvalidObjectId)
         return;
     if(form==NULL)
         return;
     uint16_t index = FrmGetObjectIndex(form,GetId());
     if(index==frmInvalidObjectId)
         return;

-    FrmGetObjectBounds(form,index,&rect);
+    FrmGetObjectBounds(form,index,(RectangleType*)rect);
+}
+
+void wxControl::DoSetBounds( WXRECTANGLEPTR rect )
+{
+    if(rect==NULL)
+        return;
+    FormType* form = (FormType*)GetParentForm();
+    if(form==NULL)
+        return;
+    uint16_t index = FrmGetObjectIndex(form,GetId());
+    if(index==frmInvalidObjectId)
+        return;
+    FrmSetObjectBounds(form,index,(RectangleType*)rect);

 }
 
 void wxControl::DoGetPosition( int *x, int *y ) const
 {
 }
 
 void wxControl::DoGetPosition( int *x, int *y ) const
 {

+    int ox = 0, oy = 0;
+    AdjustForParentClientOrigin(ox, oy);
+

     RectangleType rect;
     RectangleType rect;

-    DoGetBounds(rect);
+    DoGetBounds(&rect);
+

     if(x)
     if(x)

-        *x = rect.topLeft.x;
+        *x = rect.topLeft.x - ox;

     if(y)
     if(y)

-        *y = rect.topLeft.y;
+        *y = rect.topLeft.y - oy;

 }
 
 void wxControl::DoGetSize( int *width, int *height ) const
 {
     RectangleType rect;
 }
 
 void wxControl::DoGetSize( int *width, int *height ) const
 {
     RectangleType rect;

-    DoGetBounds(rect);
+    DoGetBounds(&rect);
+

     if(width)
         *width = rect.extent.x;
     if(height)
         *height = rect.extent.y;
 }
 
     if(width)
         *width = rect.extent.x;
     if(height)
         *height = rect.extent.y;
 }
 

+void wxControl::DoMoveWindow(int x, int y, int width, int height)
+{
+    wxRect area = GetRect();
+    RectangleType rect;
+    rect.topLeft.x = x;
+    rect.topLeft.y = y;
+    rect.extent.x = width;
+    rect.extent.y = height;
+    DoSetBounds(&rect);
+    GetParent()->Refresh(true, &area);
+}
+

 bool wxControl::Enable(bool enable)
 {
     ControlType *control = (ControlType *)GetObjectPtr();
 bool wxControl::Enable(bool enable)
 {
     ControlType *control = (ControlType *)GetObjectPtr();

-    if( (IsPalmControl()) || (control == NULL))
+    if( !IsPalmControl() || (control == NULL))

         return false;
     if( CtlEnabled(control) == enable)
         return false;
         return false;
     if( CtlEnabled(control) == enable)
         return false;


@@ -303,7 +359,7 @@ bool wxControl::Enable(bool enable)
 bool wxControl::IsEnabled() const
 {
     ControlType *control = (ControlType *)GetObjectPtr();
 bool wxControl::IsEnabled() const
 {
     ControlType *control = (ControlType *)GetObjectPtr();

-    if( (IsPalmControl()) || (control == NULL))
+    if( !IsPalmControl() || (control == NULL))

         return false;
     return CtlEnabled(control);
 }
         return false;
     return CtlEnabled(control);
 }


@@ -315,7 +371,7 @@ bool wxControl::IsShown() const
 
 bool wxControl::Show( bool show )
 {
 
 bool wxControl::Show( bool show )
 {

-    FormType* form = GetParentForm();
+    FormType* form = (FormType*)GetParentForm();

     if(form==NULL)
         return false;
     uint16_t index = FrmGetObjectIndex(form,GetId());
     if(form==NULL)
         return false;
     uint16_t index = FrmGetObjectIndex(form,GetId());


@@ -451,17 +507,4 @@ void wxControl::OnEraseBackground(wxEraseEvent& event)
 {
 }
 
 {
 }
 

-WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor),
-                               WXUINT WXUNUSED(message),
-                               WXWPARAM WXUNUSED(wParam),
-                               WXLPARAM WXUNUSED(lParam)
-    )
-{
-    return (WXHBRUSH)0;
-}
-
-// ---------------------------------------------------------------------------
-// global functions
-// ---------------------------------------------------------------------------
-

 #endif // wxUSE_CONTROLS
 #endif // wxUSE_CONTROLS