Applied [ 1867939 ] fixes for wxTreeCtrl crashes when exiting from label editing...

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

diff --git a/src/palmos/toplevel.cpp b/src/palmos/toplevel.cpp
index 2ff38362b723ee55f16176ebc8a138f170aedaef..2863573c9e41294cd2c902ca078a8403600363fd 100644 (file)
--- a/src/palmos/toplevel.cpp
+++ b/src/palmos/toplevel.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "toplevel.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"
 


@@ -28,26 +24,31 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/toplevel.h"
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"

-    #include "wx/toplevel.h"

     #include "wx/dialog.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/frame.h"
     #include "wx/containr.h"        // wxSetFocusToChild()
     #include "wx/dialog.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/frame.h"
     #include "wx/containr.h"        // wxSetFocusToChild()

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

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include "wx/module.h"

 #include "wx/display.h"
 
 // controls for sending select event
 #include "wx/display.h"
 
 // controls for sending select event

-#include "wx/button.h"
-#include "wx/checkbox.h"
-#include "wx/radiobut.h"

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

-#include "wx/slider.h"
+#include "wx/datectrl.h"
+
+#include <Window.h>
+#include <Form.h>

 
 // ----------------------------------------------------------------------------
 // globals
 
 // ----------------------------------------------------------------------------
 // globals


@@ -59,6 +60,8 @@ extern const wxChar *wxCanvasClassName;
 // Pointer to the currently active frame for the form event handler.
 wxTopLevelWindowPalm* ActiveParentFrame;
 
 // Pointer to the currently active frame for the form event handler.
 wxTopLevelWindowPalm* ActiveParentFrame;
 

+static Boolean FrameFormHandleEvent(EventType *event);
+

 // ============================================================================
 // wxTopLevelWindowPalm implementation
 // ============================================================================
 // ============================================================================
 // wxTopLevelWindowPalm implementation
 // ============================================================================


@@ -80,11 +83,6 @@ WXDWORD wxTopLevelWindowPalm::PalmGetStyle(long style, WXDWORD *exflags) const
     return 0;
 }
 
     return 0;
 }
 

-WXHWND wxTopLevelWindowPalm::PalmGetParent() const
-{
-    return NULL;
-}
-

 bool wxTopLevelWindowPalm::Create(wxWindow *parent,
                                   wxWindowID id,
                                   const wxString& title,
 bool wxTopLevelWindowPalm::Create(wxWindow *parent,
                                   wxWindowID id,
                                   const wxString& title,


@@ -134,9 +132,9 @@ bool wxTopLevelWindowPalm::Create(wxWindow *parent,
     if(FrameForm==NULL)
         return false;
 
     if(FrameForm==NULL)
         return false;
 

-    FrmSetEventHandler(FrameForm,FrameFormHandleEvent);
+    FrmSetEventHandler((FormType *)FrameForm,FrameFormHandleEvent);

 
 

-    FrmSetActiveForm(FrameForm);
+    FrmSetActiveForm((FormType *)FrameForm);

 
     ActiveParentFrame=this;
 
 
     ActiveParentFrame=this;
 


@@ -147,6 +145,18 @@ wxTopLevelWindowPalm::~wxTopLevelWindowPalm()
 {
 }
 
 {
 }
 

+// ---------------------------------------------------------------------------
+// implementation
+// ---------------------------------------------------------------------------
+
+WXWINHANDLE wxTopLevelWindowPalm::GetWinHandle() const
+{
+    FormType *form = (FormType *)GetForm();
+    if(form)
+        return FrmGetWindowHandle(form);
+    return NULL;
+}
+

 // ----------------------------------------------------------------------------
 // wxTopLevelWindowPalm showing
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowPalm showing
 // ----------------------------------------------------------------------------


@@ -157,11 +167,14 @@ void wxTopLevelWindowPalm::DoShowWindow(int nShowCmd)
 
 bool wxTopLevelWindowPalm::Show(bool show)
 {
 
 bool wxTopLevelWindowPalm::Show(bool show)
 {

-    FrmDrawForm(FrameForm);
+    if (true != show) {
+           return true;
+    }
+    FrmDrawForm((FormType *)FrameForm);

 
     wxPaintEvent event(m_windowId);
     event.SetEventObject(this);
 
     wxPaintEvent event(m_windowId);
     event.SetEventObject(this);

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

 
     return true;
 }
 
     return true;
 }


@@ -195,7 +208,7 @@ void wxTopLevelWindowPalm::Restore()
 void wxTopLevelWindowPalm::DoGetSize( int *width, int *height ) const
 {
     RectangleType rect;
 void wxTopLevelWindowPalm::DoGetSize( int *width, int *height ) const
 {
     RectangleType rect;

-    FrmGetFormBounds( GetForm() , &rect );
+    FrmGetFormBounds( (FormType *)GetForm() , &rect );

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


@@ -215,10 +228,15 @@ bool wxTopLevelWindowPalm::ShowFullScreen(bool show, long style)
 // wxTopLevelWindowPalm misc
 // ----------------------------------------------------------------------------
 
 // wxTopLevelWindowPalm misc
 // ----------------------------------------------------------------------------
 

-void wxTopLevelWindowPalm::SetIcon(const wxIcon& icon)
+void wxTopLevelWindowPalm::SetTitle( const wxString& WXUNUSED(title))

 {
 }
 
 {
 }
 

+wxString wxTopLevelWindowPalm::GetTitle() const
+{
+    return wxEmptyString;
+}
+

 void wxTopLevelWindowPalm::SetIcons(const wxIconBundle& icons)
 {
 }
 void wxTopLevelWindowPalm::SetIcons(const wxIconBundle& icons)
 {
 }


@@ -228,54 +246,96 @@ bool wxTopLevelWindowPalm::EnableCloseButton(bool enable)
     return false;
 }
 
     return false;
 }
 

-FormType *wxTopLevelWindowPalm::GetForm() const
+WXFORMPTR wxTopLevelWindowPalm::GetForm() const

 {
     return FrmGetActiveForm();
 }
 
 {
     return FrmGetActiveForm();
 }
 

-#ifndef __WXWINCE__
-

 bool wxTopLevelWindowPalm::SetShape(const wxRegion& region)
 {
     return false;
 }
 
 bool wxTopLevelWindowPalm::SetShape(const wxRegion& region)
 {
     return false;
 }
 

-#endif // !__WXWINCE__
-

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// wxTopLevelWindow event handling
+// wxTopLevelWindow native event handling

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-bool wxTopLevelWindowPalm::HandleControlSelect(EventType* event)
+bool wxTopLevelWindowPalm::HandleControlSelect(WXEVENTPTR event)

 {
 {

-    int id = event->data.ctlSelect.controlID;
+    const EventType *palmEvent = (EventType *)event;
+    const int id = palmEvent->data.ctlSelect.controlID;
+

     wxWindow* win = FindWindowById(id,this);
     if(win==NULL)
         return false;
 
     wxWindow* win = FindWindowById(id,this);
     if(win==NULL)
         return false;
 

+#if wxUSE_BUTTON

     wxButton* button = wxDynamicCast(win,wxButton);
     if(button)
         return button->SendClickEvent();
     wxButton* button = wxDynamicCast(win,wxButton);
     if(button)
         return button->SendClickEvent();

+#endif // wxUSE_BUTTON

 
 

+#if wxUSE_CHECKBOX

     wxCheckBox* checkbox = wxDynamicCast(win,wxCheckBox);
     if(checkbox)
         return checkbox->SendClickEvent();
     wxCheckBox* checkbox = wxDynamicCast(win,wxCheckBox);
     if(checkbox)
         return checkbox->SendClickEvent();

+#endif // wxUSE_CHECKBOX

 
 

+#if wxUSE_TOGGLEBTN

     wxToggleButton* toggle = wxDynamicCast(win,wxToggleButton);
     if(toggle)
         return toggle->SendClickEvent();
     wxToggleButton* toggle = wxDynamicCast(win,wxToggleButton);
     if(toggle)
         return toggle->SendClickEvent();

+#endif // wxUSE_TOGGLEBTN

 
 

+#if wxUSE_RADIOBTN

     wxRadioButton* radio = wxDynamicCast(win,wxRadioButton);
     if(radio)
         return radio->SendClickEvent();
     wxRadioButton* radio = wxDynamicCast(win,wxRadioButton);
     if(radio)
         return radio->SendClickEvent();

+#endif // wxUSE_RADIOBTN
+
+#if wxUSE_DATEPICKCTRL
+    wxDatePickerCtrl* datepicker = wxDynamicCast(win,wxDatePickerCtrl);
+    if(datepicker)
+        return datepicker->SendClickEvent();
+#endif // wxUSE_DATEPICKCTRL

 
 

+#if wxUSE_SLIDER

     wxSlider* slider = wxDynamicCast(win,wxSlider);
     if(slider)
         return slider->SendUpdatedEvent();
     wxSlider* slider = wxDynamicCast(win,wxSlider);
     if(slider)
         return slider->SendUpdatedEvent();

+#endif // wxUSE_SLIDER

 
     return false;
 }
 
 
     return false;
 }
 

+bool wxTopLevelWindowPalm::HandleControlRepeat(WXEVENTPTR event)
+{
+    const EventType *palmEvent = (EventType *)event;
+    const int id = palmEvent->data.ctlRepeat.controlID;
+
+    wxWindow* win = FindWindowById(id, this);
+    if(win==NULL)
+        return false;
+
+#if wxUSE_SLIDER
+    wxSlider* slider = wxDynamicCast(win,wxSlider);
+    if(slider)
+        return slider->SendScrollEvent(event);
+#endif // wxUSE_SLIDER
+
+    return false;
+}
+
+bool wxTopLevelWindowPalm::HandleSize(WXEVENTPTR event)
+{
+    const EventType *palmEvent = (EventType *)event;
+    wxSize newSize(palmEvent->data.winResized.newBounds.extent.x,
+                   palmEvent->data.winResized.newBounds.extent.y);
+    wxSizeEvent eventWx(newSize,GetId());
+    eventWx.SetEventObject(this);
+    return HandleWindowEvent(eventWx);
+}
+

 void wxTopLevelWindowPalm::OnActivate(wxActivateEvent& event)
 {
 }
 void wxTopLevelWindowPalm::OnActivate(wxActivateEvent& event)
 {
 }


@@ -294,14 +354,23 @@ void wxTopLevelWindowPalm::OnActivate(wxActivateEvent& event)
  * finds a better solution, please let me know.  My email address is
  * wbo@freeshell.org
  */
  * finds a better solution, please let me know.  My email address is
  * wbo@freeshell.org
  */

-static Boolean FrameFormHandleEvent(EventType* event)
+static Boolean FrameFormHandleEvent(EventType *event)

 {
 {

-    wxFrame*    frame = wxDynamicCast(ActiveParentFrame,wxFrame);
+    // frame and tlw point to the same object but they are for convenience
+    // of calling proper structure withiout later dynamic typcasting
+    wxFrame* frame = wxDynamicCast(ActiveParentFrame,wxFrame);
+    wxTopLevelWindowPalm* tlw = ActiveParentFrame;

     Boolean     handled = false;
 
     switch (event->eType) {
         case ctlSelectEvent:
     Boolean     handled = false;
 
     switch (event->eType) {
         case ctlSelectEvent:

-            handled = frame->HandleControlSelect(event);
+            handled = tlw->HandleControlSelect(event);
+            break;
+        case ctlRepeatEvent:
+            handled = tlw->HandleControlRepeat(event);
+            break;
+        case winResizedEvent:
+            handled = tlw->HandleSize(event);

             break;
 #if wxUSE_MENUS_NATIVE
         case menuOpenEvent:
             break;
 #if wxUSE_MENUS_NATIVE
         case menuOpenEvent: