X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f1e01716310cb6e3bfcf5894b442d277bc32789a..d2e66707deb10dea6f92e3e4092f8a43ef942a5d:/src/palmos/control.cpp

diff --git a/src/palmos/control.cpp b/src/palmos/control.cpp
index fea796246a..66dd535de7 100644
--- a/src/palmos/control.cpp
+++ b/src/palmos/control.cpp
@@ -26,6 +26,8 @@
 
 #if wxUSE_CONTROLS
 
+#include "wx/control.h"
+
 #ifndef WX_PRECOMP
     #include "wx/event.h"
     #include "wx/app.h"
@@ -33,18 +35,21 @@
     #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/checkbox.h"
 #include "wx/tglbtn.h"
-#include "wx/radiobut.h"
-#include "wx/slider.h"
 
 #include <Control.h>
 #include <Form.h>
-#include <StatusBar.h>
+#ifdef __WXPALMOS6__
+    #include <StatusBar.h>
+#else
+    #include <PenInputMgr.h>
+#endif // __WXPALMOS6__
 
 // ----------------------------------------------------------------------------
 // wxWin macros
@@ -72,8 +77,9 @@ void wxControl::Init()
 
 wxControl::~wxControl()
 {
+    SendDestroyEvent();
+
     SetLabel(wxEmptyString);
-    m_isBeingDeleted = true;
 
     DestroyChildren();
 
@@ -136,7 +142,7 @@ bool wxControl::PalmCreateControl(int style,
                                (void **)&form,
                                GetId(),
                                (ControlStyleType)style,
-                               wxEmptyString,
+                               NULL,
                                x,
                                y,
                                w,
@@ -151,7 +157,7 @@ bool wxControl::PalmCreateControl(int style,
 
     m_palmControl = true;
 
-    SetInitialBestSize(size);
+    SetInitialSize(size);
     SetLabel(label);
     Show();
     return true;
@@ -201,7 +207,7 @@ bool wxControl::PalmCreateField(const wxString& label,
 
     m_palmField = true;
 
-    SetInitialBestSize(size);
+    SetInitialSize(size);
     SetLabel(label);
     Show();
     return true;
@@ -420,7 +426,7 @@ void wxControl::SetControlLabel(const wxString& label)
     ControlType* control = (ControlType*)GetObjectPtr();
     if(control==NULL)
         return;
-    CtlSetLabel(control,wxEmptyString);
+    CtlSetLabel(control, "");
     m_label = label;
     if(!m_label.empty())
         CtlSetLabel(control,m_label.c_str());
@@ -451,7 +457,7 @@ wxString wxControl::GetControlLabel()
         return wxEmptyString;
     return CtlGetLabel(control);
 }
-
+#if 0
 wxString wxControl::GetLabel()
 {
     if(IsPalmField())
@@ -463,7 +469,7 @@ wxString wxControl::GetLabel()
 
     return wxEmptyString;
 }
-
+#endif
 /* static */ wxVisualAttributes
 wxControl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
@@ -500,7 +506,7 @@ wxControl::GetCompositeControlsDefaultAttributes(wxWindowVariant WXUNUSED(varian
 
 bool wxControl::ProcessCommand(wxCommandEvent& event)
 {
-    return GetEventHandler()->ProcessEvent(event);
+    return HandleWindowEvent(event);
 }
 
 void wxControl::OnEraseBackground(wxEraseEvent& event)