check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/palmos/control.cpp b/src/palmos/control.cpp
index 5f60d345ca7cd78d5216660c50dd8f2e8c190296..89c50c48acf93a98173f85d233cdb687c4d51f91 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,21 +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 "wx/slider.h"
+
+#include <Control.h>
+#include <Form.h>
+#include <StatusBar.h>

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


@@ -78,7 +79,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,13 +108,13 @@ 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;
 


@@ -123,12 +124,19 @@ bool wxControl::PalmCreateControl(ControlStyleType style,
             w = size.x == wxDefaultCoord ? 1 : size.x,
             h = size.y == wxDefaultCoord ? 1 : size.y;
 
             w = size.x == wxDefaultCoord ? 1 : size.x,
             h = size.y == wxDefaultCoord ? 1 : size.y;
 

-    AdjustForParentClientOrigin(x, 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,
                                x,
                                y,
                                wxEmptyString,
                                x,
                                y,


@@ -144,7 +152,7 @@ bool wxControl::PalmCreateControl(ControlStyleType style,
 
     m_palmControl = true;
 
 
     m_palmControl = true;
 

-    SetInitialBestSize(size);
+    SetInitialSize(size);

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


@@ -155,9 +163,9 @@ 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;
 
     if(form==NULL)
         return false;
 


@@ -183,7 +191,7 @@ bool wxControl::PalmCreateField(const wxString& label,
                            underlined,
                            false,
                            false,
                            underlined,
                            false,
                            false,

-                           justification,
+                           (JustificationType)justification,

                            false,
                            false,
                            false
                            false,
                            false,
                            false


@@ -194,7 +202,7 @@ bool wxControl::PalmCreateField(const wxString& label,
 
     m_palmField = true;
 
 
     m_palmField = true;
 

-    SetInitialBestSize(size);
+    SetInitialSize(size);

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


@@ -204,7 +212,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() )


@@ -217,9 +225,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


@@ -230,7 +238,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);
 }


@@ -245,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());


@@ -261,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());


@@ -275,42 +283,51 @@ 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( RectangleType &rect )
+void wxControl::DoSetBounds( WXRECTANGLEPTR rect )

 {
 {

-    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;

-    FrmSetObjectBounds(form,index,&rect);
+    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)
     if(width)
         *width = rect.extent.x;
     if(height)


@@ -325,14 +342,14 @@ void wxControl::DoMoveWindow(int x, int y, int width, int height)
     rect.topLeft.y = y;
     rect.extent.x = width;
     rect.extent.y = height;
     rect.topLeft.y = y;
     rect.extent.x = width;
     rect.extent.y = height;

-    DoSetBounds(rect);
+    DoSetBounds(&rect);

     GetParent()->Refresh(true, &area);
 }
 
 bool wxControl::Enable(bool enable)
 {
     ControlType *control = (ControlType *)GetObjectPtr();
     GetParent()->Refresh(true, &area);
 }
 
 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;


@@ -343,7 +360,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);
 }


@@ -355,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());


@@ -374,7 +391,7 @@ void wxControl::SetFieldLabel(const wxString& label)
     if(field==NULL)
         return;
 
     if(field==NULL)
         return;
 

-    uint16_t newSize = label.Length() + 1;
+    uint16_t newSize = label.length() + 1;

     MemHandle strHandle = FldGetTextHandle(field);
     FldSetTextHandle(field, NULL );
     if (strHandle)
     MemHandle strHandle = FldGetTextHandle(field);
     FldSetTextHandle(field, NULL );
     if (strHandle)


@@ -484,7 +501,7 @@ wxControl::GetCompositeControlsDefaultAttributes(wxWindowVariant WXUNUSED(varian
 
 bool wxControl::ProcessCommand(wxCommandEvent& event)
 {
 
 bool wxControl::ProcessCommand(wxCommandEvent& event)
 {

-    return GetEventHandler()->ProcessEvent(event);
+    return HandleWindowEvent(event);

 }
 
 void wxControl::OnEraseBackground(wxEraseEvent& event)
 }
 
 void wxControl::OnEraseBackground(wxEraseEvent& event)