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 3b9b881995a1914e6f47fb3811597882f4537597..89c50c48acf93a98173f85d233cdb687c4d51f91 100644 (file)
--- a/src/palmos/control.cpp
+++ b/src/palmos/control.cpp
@@ -17,10 +17,6 @@
 // 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"
 
@@ -30,21 +26,26 @@
 
 #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"
+    #include "wx/button.h"
+    #include "wx/checkbox.h"
+    #include "wx/radiobut.h"
+    #include "wx/slider.h"
+    #include "wx/toplevel.h"
 #endif
 
-#include "wx/control.h"
-#include "wx/toplevel.h"
-#include "wx/button.h"
-#include "wx/checkbox.h"
 #include "wx/tglbtn.h"
-#include "wx/radiobut.h"
-#include "wx/slider.h"
+
+#include <Control.h>
+#include <Form.h>
+#include <StatusBar.h>
 
 // ----------------------------------------------------------------------------
 // wxWin macros
@@ -78,7 +79,7 @@ wxControl::~wxControl()
     DestroyChildren();
 
     uint16_t index;
-    FormType* form = GetObjectFormIndex(index);
+    FormType* form = (FormType*)GetObjectFormIndex(index);
     if(form!=NULL && index!=frmInvalidObjectId)
     {
         FrmRemoveObject((FormType **)&form,index);
@@ -107,13 +108,13 @@ bool wxControl::Create(wxWindow *parent,
     return true;
 }
 
-bool wxControl::PalmCreateControl(ControlStyleType style,
+bool wxControl::PalmCreateControl(int style,
                                   const wxString& label,
                                   const wxPoint& pos,
                                   const wxSize& size,
                                   uint8_t groupID)
 {
-    FormType* form = GetParentForm();
+    FormType* form = (FormType*)GetParentForm();
     if(form==NULL)
         return false;
 
@@ -135,7 +136,7 @@ bool wxControl::PalmCreateControl(ControlStyleType style,
     ControlType *control = CtlNewControl(
                                (void **)&form,
                                GetId(),
-                               style,
+                               (ControlStyleType)style,
                                wxEmptyString,
                                x,
                                y,
@@ -151,7 +152,7 @@ bool wxControl::PalmCreateControl(ControlStyleType style,
 
     m_palmControl = true;
 
-    SetInitialBestSize(size);
+    SetInitialSize(size);
     SetLabel(label);
     Show();
     return true;
@@ -162,9 +163,9 @@ bool wxControl::PalmCreateField(const wxString& label,
                                 const wxSize& size,
                                 bool editable,
                                 bool underlined,
-                                JustificationType justification)
+                                int justification)
 {
-    FormType* form = GetParentForm();
+    FormType* form = (FormType*)GetParentForm();
     if(form==NULL)
         return false;
 
@@ -190,7 +191,7 @@ bool wxControl::PalmCreateField(const wxString& label,
                            underlined,
                            false,
                            false,
-                           justification,
+                           (JustificationType)justification,
                            false,
                            false,
                            false
@@ -201,7 +202,7 @@ bool wxControl::PalmCreateField(const wxString& label,
 
     m_palmField = true;
 
-    SetInitialBestSize(size);
+    SetInitialSize(size);
     SetLabel(label);
     Show();
     return true;
@@ -211,7 +212,7 @@ bool wxControl::PalmCreateField(const wxString& label,
 // various accessors
 // ----------------------------------------------------------------------------
 
-FormType* wxControl::GetParentForm() const
+WXFORMPTR wxControl::GetParentForm() const
 {
     wxWindow* parentTLW = GetParent();
     while ( parentTLW && !parentTLW->IsTopLevel() )
@@ -224,9 +225,9 @@ FormType* wxControl::GetParentForm() const
     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
@@ -237,7 +238,7 @@ FormType* wxControl::GetObjectFormIndex(uint16_t& index) const
 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);
 }
@@ -252,7 +253,7 @@ wxBorder wxControl::GetDefaultBorder() const
 
 void wxControl::SetIntValue(int val)
 {
-    FormType* form = GetParentForm();
+    FormType* form = (FormType*)GetParentForm();
     if(form==NULL)
         return;
     uint16_t index = FrmGetObjectIndex(form, GetId());
@@ -268,7 +269,7 @@ void wxControl::SetBoolValue(bool val)
 
 bool wxControl::GetBoolValue() const
 {
-    FormType* form = GetParentForm();
+    FormType* form = (FormType*)GetParentForm();
     if(form==NULL)
         return false;
     uint16_t index = FrmGetObjectIndex(form, GetId());
@@ -282,26 +283,30 @@ wxSize wxControl::DoGetBestSize() const
     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;
-    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;
-    FrmSetObjectBounds(form,index,&rect);
+    FrmSetObjectBounds(form,index,(RectangleType*)rect);
 }
 
 void wxControl::DoGetPosition( int *x, int *y ) const
@@ -310,7 +315,7 @@ void wxControl::DoGetPosition( int *x, int *y ) const
     AdjustForParentClientOrigin(ox, oy);
 
     RectangleType rect;
-    DoGetBounds(rect);
+    DoGetBounds(&rect);
 
     if(x)
         *x = rect.topLeft.x - ox;
@@ -321,7 +326,7 @@ void wxControl::DoGetPosition( int *x, int *y ) const
 void wxControl::DoGetSize( int *width, int *height ) const
 {
     RectangleType rect;
-    DoGetBounds(rect);
+    DoGetBounds(&rect);
 
     if(width)
         *width = rect.extent.x;
@@ -337,7 +342,7 @@ void wxControl::DoMoveWindow(int x, int y, int width, int height)
     rect.topLeft.y = y;
     rect.extent.x = width;
     rect.extent.y = height;
-    DoSetBounds(rect);
+    DoSetBounds(&rect);
     GetParent()->Refresh(true, &area);
 }
 
@@ -367,7 +372,7 @@ bool wxControl::IsShown() const
 
 bool wxControl::Show( bool show )
 {
-    FormType* form = GetParentForm();
+    FormType* form = (FormType*)GetParentForm();
     if(form==NULL)
         return false;
     uint16_t index = FrmGetObjectIndex(form,GetId());
@@ -386,7 +391,7 @@ void wxControl::SetFieldLabel(const wxString& label)
     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)
@@ -496,7 +501,7 @@ wxControl::GetCompositeControlsDefaultAttributes(wxWindowVariant WXUNUSED(varian
 
 bool wxControl::ProcessCommand(wxCommandEvent& event)
 {
-    return GetEventHandler()->ProcessEvent(event);
+    return HandleWindowEvent(event);
 }
 
 void wxControl::OnEraseBackground(wxEraseEvent& event)