cleanup for 10.5

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

diff --git a/src/palmos/control.cpp b/src/palmos/control.cpp
index b5a89e89322ee148e63af6ca0108f616b3c7aae9..45f5e2a571c8ec89be8763979218ccaf25b560bd 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"
 


@@ -30,20 +26,26 @@
 
 #if wxUSE_CONTROLS
 
 
 #if wxUSE_CONTROLS
 

+#include "wx/control.h"
+

 #ifndef WX_PRECOMP
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/dcclient.h"
     #include "wx/log.h"
     #include "wx/settings.h"
 #ifndef WX_PRECOMP
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/dcclient.h"
     #include "wx/log.h"
     #include "wx/settings.h"

+    #include "wx/button.h"
+    #include "wx/checkbox.h"
+    #include "wx/radiobut.h"
+    #include "wx/slider.h"
+    #include "wx/toplevel.h"

 #endif
 
 #endif
 

-#include "wx/control.h"
-#include "wx/toplevel.h"
-#include "wx/button.h"
-#include "wx/checkbox.h"

 #include "wx/tglbtn.h"
 #include "wx/tglbtn.h"

-#include "wx/radiobut.h"
+
+#include <Control.h>
+#include <Form.h>
+#include <StatusBar.h>

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


@@ -63,9 +65,25 @@ END_EVENT_TABLE()
 // wxControl ctor/dtor
 // ----------------------------------------------------------------------------
 
 // wxControl ctor/dtor
 // ----------------------------------------------------------------------------
 

+void wxControl::Init()
+{
+    m_palmControl = false;
+    m_palmField = false;
+}
+

 wxControl::~wxControl()
 {
 wxControl::~wxControl()
 {

+    SetLabel(wxEmptyString);

     m_isBeingDeleted = true;
     m_isBeingDeleted = true;

+
+    DestroyChildren();
+
+    uint16_t index;
+    FormType* form = (FormType*)GetObjectFormIndex(index);
+    if(form!=NULL && index!=frmInvalidObjectId)
+    {
+        FrmRemoveObject((FormType **)&form,index);
+    }

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -90,38 +108,102 @@ bool wxControl::Create(wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

-bool wxControl::PalmCreateControl(ControlStyleType style,
-                                  wxWindow *parent,
-                                  wxWindowID id,
+bool wxControl::PalmCreateControl(int style,

                                   const wxString& label,
                                   const wxPoint& pos,
                                   const wxString& label,
                                   const wxPoint& pos,

-                                  const wxSize& size)
+                                  const wxSize& size,
+                                  uint8_t groupID)
+{
+    FormType* form = (FormType*)GetParentForm();
+    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(),
+                               (ControlStyleType)style,
+                               wxEmptyString,
+                               x,
+                               y,
+                               w,
+                               h,
+                               stdFont,
+                               groupID,
+                               true
+                           );
+
+    if(control==NULL)
+        return false;
+
+    m_palmControl = true;
+
+    SetInitialBestSize(size);
+    SetLabel(label);
+    Show();
+    return true;
+}
+
+bool wxControl::PalmCreateField(const wxString& label,
+                                const wxPoint& pos,
+                                const wxSize& size,
+                                bool editable,
+                                bool underlined,
+                                int justification)

 {
 {

-    SetParent(parent);
-    SetId( id == wxID_ANY ? NewControlId() : id );
-    FormType* form = GetParentForm();
+    FormType* form = (FormType*)GetParentForm();

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

-    m_control = CtlNewControl(
-                    (void **)&form,
-                    GetId(),
-                    style,
-                    m_label.c_str(),
-                    ( pos.x == wxDefaultCoord ) ? winUndefConstraint : pos.x,
-                    ( pos.y == wxDefaultCoord ) ? winUndefConstraint : pos.y,
-                    ( size.x == wxDefaultCoord ) ? winUndefConstraint : size.x,
-                    ( size.y == wxDefaultCoord ) ? winUndefConstraint : size.y,
-                    stdFont,
-                    0,
-                    false
-                );
-
-    if(m_control==NULL)
+    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(),
+                           x,
+                           y,
+                           w,
+                           h,
+                           stdFont,
+                           10,
+                           editable,
+                           underlined,
+                           false,
+                           false,
+                           (JustificationType)justification,
+                           false,
+                           false,
+                           false
+                       );
+
+    if(field==NULL)

         return false;
 
         return false;
 

+    m_palmField = true;
+
+    SetInitialBestSize(size);
+    SetLabel(label);

     Show();
     return true;
 }
     Show();
     return true;
 }


@@ -130,7 +212,7 @@ bool wxControl::PalmCreateControl(ControlStyleType style,
 // 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() )


@@ -143,6 +225,24 @@ FormType* wxControl::GetParentForm() const
     return tlw->GetForm();
 }
 
     return tlw->GetForm();
 }
 

+WXFORMPTR wxControl::GetObjectFormIndex(uint16_t& index) const
+{
+    FormType* form = (FormType* )GetParentForm();
+    if(form!=NULL)
+        index = FrmGetObjectIndex(form, GetId());
+    else
+        index = frmInvalidObjectId;
+    return form;
+}
+
+void* wxControl::GetObjectPtr() const
+{
+    uint16_t index;
+    FormType* form = (FormType*)GetObjectFormIndex(index);
+    if(form==NULL || index==frmInvalidObjectId)return NULL;
+    return FrmGetObjectPtr(form,index);
+}
+

 wxBorder wxControl::GetDefaultBorder() const
 {
     // we want to automatically give controls a sunken style (confusingly,
 wxBorder wxControl::GetDefaultBorder() const
 {
     // we want to automatically give controls a sunken style (confusingly,


@@ -153,7 +253,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());


@@ -169,7 +269,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());


@@ -183,52 +283,86 @@ 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)
 {
 bool wxControl::Enable(bool enable)
 {

-    if( m_control == NULL )
+    ControlType *control = (ControlType *)GetObjectPtr();
+    if( !IsPalmControl() || (control == NULL))

         return false;
         return false;

-    if( IsEnabled() == enable)
+    if( CtlEnabled(control) == enable)

         return false;
         return false;

-    CtlSetEnabled( m_control, enable);
+    CtlSetEnabled( control, enable);

     return true;
 }
 
 bool wxControl::IsEnabled() const
 {
     return true;
 }
 
 bool wxControl::IsEnabled() const
 {

-    if( m_control == NULL )
+    ControlType *control = (ControlType *)GetObjectPtr();
+    if( !IsPalmControl() || (control == NULL))

         return false;
         return false;

-    return CtlEnabled(m_control);
+    return CtlEnabled(control);

 }
 
 bool wxControl::IsShown() const
 }
 
 bool wxControl::IsShown() const


@@ -238,7 +372,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());


@@ -251,31 +385,82 @@ bool wxControl::Show( bool show )
     return true;
 }
 
     return true;
 }
 

-void wxControl::SetLabel(const wxString& label)
+void wxControl::SetFieldLabel(const wxString& label)

 {
 {

-    // setting in wrong control causes crash
-    if ( ( wxDynamicCast(this,wxButton) != NULL ) ||
-         ( wxDynamicCast(this,wxCheckBox) != NULL ) ||
-         ( wxDynamicCast(this,wxRadioButton) != NULL ) ||
-         ( wxDynamicCast(this,wxToggleButton) != NULL ) )
+    FieldType* field = (FieldType*)GetObjectPtr();
+    if(field==NULL)
+        return;
+
+    uint16_t newSize = label.length() + 1;
+    MemHandle strHandle = FldGetTextHandle(field);
+    FldSetTextHandle(field, NULL );
+    if (strHandle)
+    {
+        if(MemHandleResize(strHandle, newSize)!=errNone)
+            strHandle = 0;
+    }
+    else

     {
     {

-        m_label = label;
-        // TODO: as manual states, it crashes here
-        // needs own manipulation on used string pointers
-        // CtlSetLabel(m_control,m_label);
+        strHandle = MemHandleNew( newSize );

     }
     }

+    if(!strHandle)
+        return;
+
+    char* str = (char*) MemHandleLock( strHandle );
+    if(str==NULL)
+        return;
+
+    strcpy(str, label.c_str());
+    MemHandleUnlock(strHandle);
+    FldSetTextHandle(field, strHandle);
+    FldRecalculateField(field, true);
+}
+
+void wxControl::SetControlLabel(const wxString& label)
+{
+    ControlType* control = (ControlType*)GetObjectPtr();
+    if(control==NULL)
+        return;
+    CtlSetLabel(control,wxEmptyString);
+    m_label = label;
+    if(!m_label.empty())
+        CtlSetLabel(control,m_label.c_str());
+}
+
+void wxControl::SetLabel(const wxString& label)
+{
+    if(IsPalmField())
+        SetFieldLabel(label);
+
+    // unlike other native controls, slider has no label
+    if(IsPalmControl() && !wxDynamicCast(this,wxSlider))
+        SetControlLabel(label);
+}
+
+wxString wxControl::GetFieldLabel()
+{
+    FieldType* field = (FieldType*)GetObjectPtr();
+    if(field==NULL)
+        return wxEmptyString;
+    return FldGetTextPtr(field);
+}
+
+wxString wxControl::GetControlLabel()
+{
+    ControlType* control = (ControlType*)GetObjectPtr();
+    if(control==NULL)
+        return wxEmptyString;
+    return CtlGetLabel(control);

 }
 
 wxString wxControl::GetLabel()
 {
 }
 
 wxString wxControl::GetLabel()
 {

-    // setting in wrong control causes crash
-    if ( wxDynamicCast(this,wxButton) ||
-         wxDynamicCast(this,wxCheckBox) ||
-         wxDynamicCast(this,wxRadioButton) ||
-         wxDynamicCast(this,wxToggleButton) )
-    {
-        return m_label;
-    }
+    if(IsPalmField())
+        return GetFieldLabel();
+
+    // unlike other native controls, slider has no label
+    if(IsPalmControl() && !wxDynamicCast(this,wxSlider))
+        return GetControlLabel();

 
     return wxEmptyString;
 }
 
     return wxEmptyString;
 }


@@ -323,17 +508,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